From 424159f81a5493838bae97aa572965797c35f343 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期四, 12 十月 2023 15:36:36 +0800 Subject: [PATCH] 历史导入编码最大流水值不正确问题修复 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 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 cf29925..33c8e01 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 @@ -150,13 +150,14 @@ OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(secVO.getCodeFillType())))); } Map<String, Double> thisUnitMaxMap = maxSerialMap.getOrDefault(serialUnitString, new HashMap<>()); + Double maxValue=serialDb; if(thisUnitMaxMap.containsKey(secOid)){ - Double maxValue= thisUnitMaxMap.getOrDefault(secOid,new Double(-1)); - if(maxValue>serialDb){ - serialDb=maxValue; + maxValue= thisUnitMaxMap.getOrDefault(secOid,new Double(-1)); + if(maxValue<serialDb){ + maxValue=serialDb; } } - thisUnitMaxMap.put(secOid,serialDb); + thisUnitMaxMap.put(secOid,maxValue); maxSerialMap.put(serialUnitString,thisUnitMaxMap); serialUnFileStringList.add(String.valueOf(serialDb)); }); @@ -170,7 +171,8 @@ allCodeDO.setCreateCodeBtm(cbo.getBtmname()); allCodeDO.setCreateCodeOid(cbo.getOid()); allCodeDO.setSerialUnit(serialUnitString); - allCodeDO.setUnFillSerial(serialUnFileStringList.stream().collect(Collectors.joining(SERIAL_VALUE_SPACE))); + 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()); allCodeDOList.add(allCodeDO); }); -- Gitblit v1.9.3