From 71927d489198518e2a9e4188340dfbdc35caa3a2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 29 十一月 2023 10:46:08 +0800
Subject: [PATCH] 1.标准变系列，系列变系列测试 2.业务数据数据更改，直接发布
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 8 +-
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/系列更为系列.json | 38 ++++++++++++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/系列流水申请大于1.json | 39 +++++++++++++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/标准更为系列.json | 38 ++++++++++++
4 files changed, 119 insertions(+), 4 deletions(-)
diff --git "a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206\346\233\264\344\270\272\347\263\273\345\210\227.json" "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206\346\233\264\344\270\272\347\263\273\345\210\227.json"
new file mode 100644
index 0000000..439c002
--- /dev/null
+++ "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\346\240\207\345\207\206\346\233\264\344\270\272\347\263\273\345\210\227.json"
@@ -0,0 +1,38 @@
+{
+ "operationType": "2",
+ "series": false,
+ "releaseTime": "2024-11-23",
+ "oldCode": "Q/3B1-2023",
+ "seriesFlow": "",
+ "isEditSeries": true,
+ "editInProcess": false,
+ "codeClassifyOid": "1722159168229609472",
+ "templateOid": "1722159635358650369",
+ "codeRuleOid": "1717377846655193088",
+ "editInProcess": "",
+ "secDTOList":[{
+ "secOid":"1717378065371369472",
+ "secValue": "Q/3B"
+ },{
+ "secOid":"1722497248551636992",
+ "secValue": "-"
+ },
+ {
+ "secOid":"1722497079235973120",
+ "secValue":"4"
+ },
+ {
+ "secOid":"1722497450259910656",
+ "secValue": "2023"
+ }
+ ],
+ "data":{"name":"绯诲垪鏍囧噯鍚嶇О",
+ "standardFileType":"鏂囦欢绫诲瀷",
+ "codeStandardEditType":"2",
+ "oldcode":"Q/3B1-2023",
+ "isSeries":"false",
+ "reviseSeries":"true",
+ "ImplementationDate":"2023-11-23 19:22:33",
+ "approveDate":"2023-11-23 19:22:33",
+ "releaseDate": "2024-11-23 19:22:33"}
+}
diff --git "a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\347\263\273\345\210\227\346\233\264\344\270\272\347\263\273\345\210\227.json" "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\347\263\273\345\210\227\346\233\264\344\270\272\347\263\273\345\210\227.json"
new file mode 100644
index 0000000..850fb26
--- /dev/null
+++ "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\347\263\273\345\210\227\346\233\264\344\270\272\347\263\273\345\210\227.json"
@@ -0,0 +1,38 @@
+ {
+ "operationType": "2",
+ "series": true,
+ "releaseTime": "2023-11-23",
+ "oldCode": "Q/3B7.1-2023,Q/3B7.1-2023II",
+ "seriesFlow": "",
+ "isEditSeries": true,
+ "editInProcess": false,
+ "codeClassifyOid": "1722159168229609472",
+ "templateOid": "1722159635358650369",
+ "codeRuleOid": "1717377846655193088",
+ "editInProcess": "",
+ "secDTOList":[{
+ "secOid":"1717378065371369472",
+ "secValue": "Q/3B"
+ },{
+ "secOid":"1722497248551636992",
+ "secValue": "-"
+ },
+ {
+ "secOid":"1722497079235973120",
+ "secValue":"4"
+ },
+ {
+ "secOid":"1722497450259910656",
+ "secValue": "2023"
+ }
+ ],
+ "data":{"name":"绯诲垪鏍囧噯鍚嶇О",
+ "standardFileType":"鏂囦欢绫诲瀷",
+ "codeStandardEditType":"2",
+ "oldcode":"Q/3B7.1-2023,Q/3B7.1-2023II",
+ "isSeries":"true",
+ "reviseSeries":"true",
+ "ImplementationDate":"2023-11-23 19:22:33",
+ "approveDate":"2023-11-23 19:22:33",
+ "releaseDate": "2023-11-23 19:22:33"}
+ }
diff --git "a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\347\263\273\345\210\227\346\265\201\346\260\264\347\224\263\350\257\267\345\244\247\344\272\2161.json" "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\347\263\273\345\210\227\346\265\201\346\260\264\347\224\263\350\257\267\345\244\247\344\272\2161.json"
new file mode 100644
index 0000000..f3a6ccd
--- /dev/null
+++ "b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/\347\263\273\345\210\227\346\265\201\346\260\264\347\224\263\350\257\267\345\244\247\344\272\2161.json"
@@ -0,0 +1,39 @@
+{
+ "operationType": "2",
+ "series": true,
+ "releaseTime": "2024-11-23",
+ "oldCode": "Q/3B7.1-2023",
+ "seriesFlow": "",
+ "isEditSeries": false,
+ "editInProcess": false,
+ "codeClassifyOid": "1722159168229609472",
+ "templateOid": "1722159635358650369",
+ "codeRuleOid": "1717377846655193088",
+ "editInProcess": "",
+ "secDTOList":[{
+ "secOid":"1717378065371369472",
+ "secValue": "Q/3B"
+ },{
+ "secOid":"1722497248551636992",
+ "secValue": "-"
+ },
+ {
+ "secOid":"1722497079235973120",
+ "secValue":"1"
+ },
+ {
+ "secOid":"1722497450259910656",
+ "secValue": "2023"
+ }
+
+ ],
+ "data":{"name":"绯诲垪鏍囧噯鍚嶇О",
+ "standardFileType":"鏂囦欢绫诲瀷",
+ "codeStandardEditType":"1",
+ "oldcode":"Q/3B7.1-2023",
+ "isSeries":"true",
+ "reviseSeries":"false",
+ "ImplementationDate":"2023-11-23 19:22:33",
+ "approveDate":"2023-11-23 19:22:33",
+ "releaseDate": "2024-11-23 19:22:33"}
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 76d26b5..f5e3785 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -972,10 +972,9 @@
orderDTO.setSecDTOList(newSecDTOList);
return createDataBZ(orderDTO,ruleVO,authUser);
}else{//鍙樻洿涓虹郴鍒�.鍒欐寜鐓ч�昏緫鍘诲鐞�
-
-
+ orderDTO.setSecDTOList(newSecDTOList);
+ return createDataBZ(orderDTO,ruleVO,authUser);
}
- return "";
}
private String createDataBZ(CodeOrderDTO orderDTO, CodeRuleVO ruleVO,boolean authUser) throws Exception {
CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
@@ -4520,7 +4519,8 @@
toBo.setVersionSeq(Integer.valueOf(nextRevision.get("VERSIONSEQ").toString()));
toBo.setVersionValue(nextRevision.get("VERSIONVAL").toString());
toBo.setLctid(fromBo.getLctid());
- toBo.setLcStatus("Editing");
+ //toBo.setLcStatus("Editing");
+ toBo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
toBo.setId(fromBo.getId());
toBo.setName(fromBo.getName());
toBo.setDescription(fromBo.getDescription());
--
Gitblit v1.9.3