From 5fb0afaeae8f7235e0a4c6e47a31123383dd5695 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 30 十月 2023 13:47:01 +0800
Subject: [PATCH] 前端增加码段类型枚举类，实现修改码段类型时提供是否清空码值对话框功能
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java | 2 ++
Source/UBCS-WEB/src/views/code/code.vue | 3 +--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 21 +++++++++++----------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 20 ++++++++------------
4 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index da43e4a..f397beb 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -2422,11 +2422,11 @@
.catch((error) => {
this.releadDisabled = false;
});
+ this.releadDisabled = false;
} else {
this.updateStatus(oid, update);
}
},
-
/** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
openCodeRuleDialog() {
if (!this.tipsMessage(this.selectionList)) {
@@ -2434,7 +2434,6 @@
}
this.cloneSettingBox = true;
},
-
/** 鎵撳紑浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�*/
openOtherCodeRuleDialog() {
if (!this.tipsMessage(this.selectionList)) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java
index a3c91a0..a7bd471 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java
@@ -10,6 +10,7 @@
import java.util.List;
public interface MdmProductCodeService {
+
/**
* 鐢熸垚缂栫爜--骞朵笖淇濆瓨鏁版嵁-鏂规硶鍔犻攣锛屽洜姝や笉鑳借繑鍥瀊atchCBO
* @param classifyFullInfoBO 鍒嗙被鐨勫叏閮ㄤ俊鎭�
@@ -28,4 +29,5 @@
* @return 鏄惁鏇存柊鎴愬姛
*/
Boolean recycleCode(String btmId, Collection<String> businessOidCollection);
+
}
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 3385b48..68a43ff 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
@@ -382,6 +382,7 @@
}
codeAllCodeService.updateBatchById(codeCbos);
}
+
/**
* 鐢宠鍗曚竴缂栫爜
*
@@ -390,7 +391,7 @@
*/
@Override
public String addSaveCode(CodeOrderDTO orderDTO) throws Exception {
- return addSaveCode(orderDTO,true);
+ return addSaveCode(orderDTO,true);
}
/***
@@ -403,6 +404,7 @@
public String addSaveCodeNotauthUser(CodeOrderDTO orderDTO, boolean authUser) throws Exception {
return addSaveCode(orderDTO,authUser);
}
+
/**
* 鐢宠鍗曚竴缂栫爜
*
@@ -434,8 +436,8 @@
//9.鐢熸垚缂栫爜鐨勪俊鎭�
// ClientBusinessObject cbo = boService.createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
BaseModel cbo = createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmTypeId());
-// //榛樿鐨勫睘鎬ч兘涓嶇敤浠庡墠绔嫹璐�
-// //璁剧疆缂栫爜闇�瑕佺殑榛樿灞炴�х殑鍐呭
+ //榛樿鐨勫睘鎬ч兘涓嶇敤浠庡墠绔嫹璐�
+ //璁剧疆缂栫爜闇�瑕佺殑榛樿灞炴�х殑鍐呭
copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, false);
cbo.setOid(VciBaseUtil.getPk());
cbo.setRevisionOid(VciBaseUtil.getPk());
@@ -455,9 +457,9 @@
if(StringUtils.isNotBlank(orderDTO.getLcStatus())||StringUtils.isNotBlank(orderDTO.getData().get("lcStatus"))){
cbo.setLcStatus(StringUtils.isNotBlank(orderDTO.getLcStatus())?orderDTO.getLcStatus():orderDTO.getData().get("lcStatus"));
}
-// //TODO:鍥犱负榛樿鐨勫睘鎬ч兘涓嶆嫹璐濓紝鐩墠闆嗗洟鐮佸彨name锛屽苟娌℃湁浠嶥TO鎷疯礉鍒癱bo閲屻�傚鍔犱竴涓崟鐙鐞嗭紝浠ュ悗鍐嶇湅瑕佷笉瑕佽皟鏁�
+ //TODO:鍥犱负榛樿鐨勫睘鎬ч兘涓嶆嫹璐濓紝鐩墠闆嗗洟鐮佸彨name锛屽苟娌℃湁浠嶥TO鎷疯礉鍒癱bo閲屻�傚鍔犱竴涓崟鐙鐞嗭紝浠ュ悗鍐嶇湅瑕佷笉瑕佽皟鏁�
cbo.setName(orderDTO.getName() == null ? "" : orderDTO.getName());
-// //end -- modify by lihang @20220407
+ //end -- modify by lihang @20220407
List<BaseModel> cboList = new ArrayList<>();
//澶囨敞
@@ -513,7 +515,6 @@
});
}
}
-
/**
* 鍒ゆ柇缂栫爜鐨勭爜娈垫槸鍚﹁緭鍏ユ垨鑰呴�夋嫨浜嗙爜鍊�
@@ -1018,22 +1019,22 @@
List<CodeClassifyTemplateAttrVO> selectAttrVOs = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getLibraryIdentification())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(selectAttrVOs)) {
-// SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
+ //SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
selectAttrVOs.parallelStream().forEach(attrVO -> {
List<String> valuesList = new ArrayList<>();
cboList.parallelStream().forEach(cbo -> {
-// String value = cbo.get.getAttributeValue(attrVO.getId());
+ //String value = cbo.get.getAttributeValue(attrVO.getId());
//灏哹ean杞负map,mybatis缁熶竴澶勭悊
Map<String, String> map = null;
-// baseModels.stream().forEach(model-> {
+ //baseModels.stream().forEach(model-> {
try {
map = VciBaseUtil.convertBean2Map(cbo,null);
} catch (Exception e) {
throw new VciBaseException("绫诲瀷杞崲閿欒锛�" + e.getMessage());
}
-// });
+ //});
String value = map.get(attrVO.getId());
if (StringUtils.isNotBlank(value)) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index 85d050f..d9e3b19 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -87,22 +87,20 @@
/*****
* 淇濊瘉骞跺彂鐨勬椂鍊欙紝鏈�澶ф祦姘村彿閮藉鐨勶紝浣嗘槸杩欑鍔犻攣鏈夊紛绔�
- *
*/
-
if(dataCBOList.stream().anyMatch(cbo-> StringUtils.isNotBlank(cbo.getId()))
-// && StringUtils.isNotBlank(cbo.getAttributeValue(CODE_SEC_LENGTH_FIELD))
- ){
+ // && StringUtils.isNotBlank(cbo.getAttributeValue(CODE_SEC_LENGTH_FIELD))
+ ){
//鏄巻鍙叉暟鎹鍏�
//鍘嗗彶鏁版嵁鎵ц鐨勬椂鍊欙紝杩欎釜绯荤粺浼氬緢鍗�
//涓昏鏄负浜嗗綍鍏ユ渶澶ф祦姘村彿鍜宎llcode
-// SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
+ //SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
List<CodeAllCode> allCodeDOList = new ArrayList<>();
Map<String/**娴佹按渚濇嵁**/, Map<String/**鐮佹鐨勪富閿�**/,Double/**鏈�澶ф祦姘村彿**/>> maxSerialMap = new HashMap<>();
// TODO 澶氱嚎绋嬫祦寮曞彂鐨勯棶棰樺凡淇敼
dataCBOList.parallelStream().forEach(cbo->{
log.info("code:----->"+cbo.getId());
-// VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
+ //VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
String code = cbo.getId();
List<String> serialUnitList = new ArrayList<>();
String seclenghStr=cbo.getData().get(CODE_SEC_LENGTH_FIELD);
@@ -421,10 +419,11 @@
// }
// });
}
-// WebUtil.setPersistence(true);
-// boService.persistenceBatch(batchCBO);
+ // WebUtil.setPersistence(true);
+ // boService.persistenceBatch(batchCBO);
return codeList;
}
+
/**
* 杞崲灞炴�х爜娈电殑鍊�
* @param attrSecVOList 灞炴�х爜娈电殑鏄剧ず瀵硅薄
@@ -468,7 +467,6 @@
});
}
}
-
/**
* 杞崲娴佹按鐮佹鐨勫��
@@ -713,9 +711,6 @@
allCodeDOList.add(allCodeDO);
}
-
-
-
/**
* 淇濆瓨娴佹按鐨勪俊鎭�
* @param ruleVO 瑙勫垯鐨勬樉绀哄璞�
@@ -879,4 +874,5 @@
// WebUtil.copyValueToMapFromCbos(cbo,dataMap);
return formulaService.getValueByFormula(map,rule);
}
+
}
--
Gitblit v1.9.3