From 3cc2b58dcb169f147bc5bdccfd782514d736531d Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 30 一月 2024 11:23:09 +0800
Subject: [PATCH] 主题库定义编码规则 规则基础配置 业务类型
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 44 ++++++++++++--------------------------------
1 files changed, 12 insertions(+), 32 deletions(-)
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 929d37b..30c8413 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
@@ -93,10 +93,6 @@
@Autowired
private FormulaServiceImpl formulaService;
- // 娉ㄥ叆浜嬪姟绠＄悊鍣�
-// @Autowired
-// private TransactionTemplate transactionTemplate;
-
@Override
@Transactional(rollbackFor = Exception.class)
public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<BaseModel> dataCBOList,BladeUser user) throws Exception {
@@ -215,6 +211,7 @@
String unFillSerial =serialUnFileStringList.size()==1?serialUnFileStringList.get(0)+ SERIAL_VALUE_SPACE:serialUnFileStringList.stream().collect(Collectors.joining(SERIAL_VALUE_SPACE));
allCodeDO.setUnFillSerial(unFillSerial);
allCodeDO.setLcStatus(cbo.getLcStatus());
+ allCodeDO.setLctid("codeAllCodeLC");
allCodeDO.setCodeDelimit(codeValueList.stream().collect(Collectors.joining(SERIAL_VALUE_SPACE)));//娣诲姞閾炬帴绗�
allCodeDOList.add(allCodeDO);
});
@@ -302,10 +299,6 @@
if(!CollectionUtils.isEmpty(editCodeDOs)){
codeAllCodeService.updateBatchById(editCodeDOs);
}
- // 鑾峰彇浜嬪姟瀹氫箟
- //DefaultTransactionDefinition def = new DefaultTransactionDefinition();
- // 寮�濮嬩簨鍔�
- //TransactionStatus status = transactionTemplate.getTransactionManager().getTransaction(def);
if(!CollectionUtils.isEmpty(addCodeDOs)){
Map<String, String> statusMap = addCodeDOs.stream().collect(Collectors.toMap(s -> s.getOid(), s -> s.getLcStatus()));
addCodeDOs.stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmname())).forEach(s -> {
@@ -330,17 +323,24 @@
for (CodeAllCode codeAllCode : takeBack) {
codeAllCode.setTs(new Date());
codeAllCode.setLastModifyTime(new Date());
- codeAllCode.setLastModifier(AuthUtil.getUserId().toString());
- Iterator<CodeAllCode> iterator = addCodeDOs.iterator();
+ codeAllCode.setLastModifier(Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUserAccount());
+ for (int i = 0; i < addCodeDOs.size(); i++) {
+ if(codeAllCode.getId().equals(addCodeDOs.get(i).getId())){
+ codeAllCode.setCreateCodeOid(addCodeDOs.get(i).getCreateCodeOid());
+ codeAllCode.setLcStatus(addCodeDOs.get(i).getLcStatus());
+ addCodeDOs.remove(i);
+ }
+ }
+ /*Iterator<CodeAllCode> iterator = addCodeDOs.iterator();
while (iterator.hasNext()){
CodeAllCode next = iterator.next();
if(codeAllCode.getId().equals(next.getId())){
codeAllCode.setCreateCodeOid(next.getCreateCodeOid());
codeAllCode.setLcStatus(next.getLcStatus());
// TODO: 杩欏効鍏堟殏鏃舵敞閲婃帀锛屾病鐪嬫噦杩欏効涓轰粈涔堣杩欐牱鍋氾紝瀵艰嚧鎶ラ敊
- //iterator.remove();
+ iterator.remove();
}
- }
+ }*/
}
if(takeBack.size()>0){
codeAllCodeService.updateBatchById(takeBack);
@@ -348,16 +348,7 @@
codeAllCodeService.saveBatch(addCodeDOs);
}
-
-// try {
mdmEngineService.insertBatchByType(dataCBOList.get(0).getBtmname(),dataCBOList);
- // 鎻愪氦浜嬪姟
- //transactionTemplate.getTransactionManager().commit(status);
-// }catch (Exception e){
-// // 鍑虹幇寮傚父鏃跺洖婊氫簨鍔�
-// transactionTemplate.getTransactionManager().rollback(status);
-// }
-
}
return codeList;
}else {
@@ -462,19 +453,8 @@
codeAllCodeService.updateBatchById(takeBack);
}
codeAllCodeService.saveBatch(allCodeDOList);
-// iCodeWupinService.saveBatch(dataCBOList);
mdmEngineService.insertBatchByType(dataCBOList.get(0).getBtmname(),dataCBOList);
-// batchCBO.getCreateCbos().stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmName())).forEach(s -> {
-// s.setLcStatus(statusMap.get(s.getOid()));
-// try {
-// s.setAttributeValue("lcstatus",statusMap.get(s.getOid()));
-// } catch (VCIError e) {
-// e.printStackTrace();
-// }
-// });
}
- // WebUtil.setPersistence(true);
- // boService.persistenceBatch(batchCBO);
return codeList;
}
--
Gitblit v1.9.3