From 7918c0611f1cdf1cad82250225307e5185abac4c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 27 十月 2023 10:37:49 +0800
Subject: [PATCH] bug修改：148（历史数据导入报错，当前分类没有设置编码规则，未找父级的编码规则的bug）；150（主数据新增时未先找当前层级的编码规则，再向上查找的bug）
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..85d050f 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
@@ -285,7 +285,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 +293,7 @@
CodeAllCode next = iterator.next();
if(codeAllCode.getId().equals(next.getId())){
codeAllCode.setCreateCodeOid(next.getCreateCodeOid());
+ codeAllCode.setLcStatus(next.getLcStatus());
iterator.remove();
}
}
@@ -392,7 +392,6 @@
}
for (CodeAllCode codeAllCode : takeBack) {
- codeAllCode.setLcStatus("Released");
codeAllCode.setTs(new Date());
codeAllCode.setLastModifyTime(new Date());
codeAllCode.setLastModifier(AuthUtil.getUserId().toString());
@@ -401,6 +400,7 @@
CodeAllCode next = iterator.next();
if(codeAllCode.getId().equals(next.getId())){
codeAllCode.setCreateCodeOid(next.getCreateCodeOid());
+ codeAllCode.setLcStatus(next.getLcStatus());
iterator.remove();
}
}
--
Gitblit v1.9.3