Merge branch 'release' into test

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("%", "");