From f8e0059fcb592d3a378cce74290cc601a3442864 Mon Sep 17 00:00:00 2001 From: gaorl Date: Sun, 25 Jun 2023 11:30:47 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=90=8C=E6=AD=A5=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderInfoServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 812ce2f3..08b7480b 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1917,8 +1917,18 @@ public class OrderInfoServiceImpl implements OrderInfoService { List items = new ArrayList<>(); StringBuffer sb = new StringBuffer(); - + Map repeatEnding = new HashMap(); for (OrderItemInfo itemInfo : orderItemInfo) { + //存在同一物料编码 + if(repeatEnding.get(itemInfo.getZxbm()) != null){ + OrderItemInfo item = new OrderItemInfo(); + item.setId(itemInfo.getId()); + item.setZnfm(ConfigureConstant.STRING_0); + item.setZxbm(StringUtils.isNotBlank(itemInfo.getZxbm())?itemInfo.getZxbm():baseService.getGenerateShotKey()); + items.add(item); + continue; + } + try { CommodityCodeEntity commodityCodeEntity = buildCommodity(itemInfo, param, spbmMap); //判断是否已存在 @@ -1949,7 +1959,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { } items.add(item); } - + repeatEnding.put(commodityCodeEntity.getZxbm(),commodityCodeEntity); } catch (Exception e) { log.error("更新公司库物料异常{}",e); sb.append(itemInfo.getSphxh()).append(",");