From 65e656734b7a701b70b1dc09ca00a8930116a25e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 31 十月 2023 23:03:56 +0800
Subject: [PATCH] 前端代码打包
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 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 f4dbaa3..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);
@@ -285,7 +283,6 @@
throw new ServiceException("鐢熸垚缂栫爜鏁版嵁ID宸叉湁鍘嗗彶璁板綍,璇风‘璁ゅ涓嬬敓鎴愮殑ID鏁版嵁锛�"+ addCodeDOs.stream().map(CodeAllCode::getId).collect(Collectors.toList()));
}
for (CodeAllCode codeAllCode : takeBack) {
- codeAllCode.setLcStatus("Released");
codeAllCode.setTs(new Date());
codeAllCode.setLastModifyTime(new Date());
codeAllCode.setLastModifier(AuthUtil.getUserId().toString());
@@ -294,6 +291,7 @@
CodeAllCode next = iterator.next();
if(codeAllCode.getId().equals(next.getId())){
codeAllCode.setCreateCodeOid(next.getCreateCodeOid());
+ codeAllCode.setLcStatus(next.getLcStatus());
iterator.remove();
}
}
@@ -392,7 +390,6 @@
}
for (CodeAllCode codeAllCode : takeBack) {
- codeAllCode.setLcStatus("Released");
codeAllCode.setTs(new Date());
codeAllCode.setLastModifyTime(new Date());
codeAllCode.setLastModifier(AuthUtil.getUserId().toString());
@@ -401,6 +398,7 @@
CodeAllCode next = iterator.next();
if(codeAllCode.getId().equals(next.getId())){
codeAllCode.setCreateCodeOid(next.getCreateCodeOid());
+ codeAllCode.setLcStatus(next.getLcStatus());
iterator.remove();
}
}
@@ -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