From c80c1c6707b73aab095d750d464ce46bdcb2a39c Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Sun, 25 Jun 2023 14:21:58 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=90=8C=E6=AD=A5=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E8=87=B3=E5=85=AC=E5=8F=B8=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/service/impl/OrderInfoServiceImpl.java     | 5 +++--
 1 file changed, 3 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 08b7480b..43135e57 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
@@ -1920,6 +1920,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         Map repeatEnding = new HashMap();
         for (OrderItemInfo itemInfo : orderItemInfo) {
             //存在同一物料编码
+            itemInfo.setZxbm(StringUtils.isNotBlank(itemInfo.getZxbm())?itemInfo.getZxbm():baseService.getGenerateShotKey());
             if(repeatEnding.get(itemInfo.getZxbm()) != null){
                 OrderItemInfo item = new OrderItemInfo();
                 item.setId(itemInfo.getId());
@@ -1959,7 +1960,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                     }
                     items.add(item);
                 }
-                repeatEnding.put(commodityCodeEntity.getZxbm(),commodityCodeEntity);
+                repeatEnding.put(itemInfo.getZxbm(),commodityCodeEntity);
             } catch (Exception e) {
                 log.error("更新公司库物料异常{}",e);
                 sb.append(itemInfo.getSphxh()).append(",");
@@ -1986,7 +1987,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         String spjc = taxClassCodeEntity.getSpjc();
         String xmmc = itemInfo.getXmmc().replace("*" + spjc + "*", "");
         comm.setXmmc(xmmc);
-        comm.setZxbm(StringUtils.isNotBlank(itemInfo.getZxbm())?itemInfo.getZxbm():baseService.getGenerateShotKey());
+        comm.setZxbm(itemInfo.getZxbm());
         comm.setSpsm(taxClassCodeEntity.getSm());
         comm.setSpjm("");
         String sl = itemInfo.getSl().replace("%", "");