From 7aed66b9f35713d8bf2d6085985548f45573ad68 Mon Sep 17 00:00:00 2001
From: liufeilong <liufeilong@ele-cloud.com>
Date: Thu, 13 Apr 2023 17:26:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E8=A1=A5=E5=85=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CommonInterfaceServiceImpl.java      | 21 +------------------
 .../consumer/utils/BeanTransitionUtils.java   |  2 +-
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java
index b9a74058..67c414fe 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java
@@ -595,26 +595,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
                         // 如果找到记录，进行赋值匹配
                         // 判断是否推送了物料的名称、单位、规格型号信息
                         //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全
-                        String spmc = item.getXmmc();
-                        StringBuilder stringBuilder = new StringBuilder();
-                        if (StringUtils.isBlank(spmc)) {
-                            spmc = stringBuilder.append("*").append(commodityCodeEntity.getSpjc()).append("*").append(commodityCodeEntity.getXmmc()).toString();
-                        } else if (StringUtil.checkStr(spmc, commodityCodeEntity.getSpjc())) {
-                            spmc = stringBuilder.append("*").append(commodityCodeEntity.getSpjc()).append("*").append(spmc).toString();
-                        }
-                        item.setXmmc(spmc);
-
-                        if (StringUtils.isEmpty(item.getXmdw())) {
-                            item.setXmdw(commodityCodeEntity.getXmdw());
-                        }
-
-                        if (StringUtils.isEmpty(item.getGgxh())) {
-                            item.setGgxh(commodityCodeEntity.getGgxh());
-                        }
-
-                        item.setTswl(StrUtil.isBlank(commodityCodeEntity.getTswl())?"0":commodityCodeEntity.getTswl());
-                        item.setSpbm(commodityCodeEntity.getSpbm());
-
+                        completeCommodityMessageBySpid(item,commodityCodeEntity);
                     }
 
                 } else if (StringUtils.isBlank(item.getSpbm())) {
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java
index 71bdae1d..bca62bb8 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java
@@ -3528,7 +3528,7 @@ public class BeanTransitionUtils {
                     ddmxxxBO.setSPSL("");
                     ddmxxxBO.setDJ("");
                 }else {
-                    ddmxxxBO.setGGXH(detail.getCHARG());
+                    ddmxxxBO.setGGXH("");
                     ddmxxxBO.setDW(detail.getZSLDW());
                     ddmxxxBO.setSPSL(detail.getZZSL());
                     ddmxxxBO.setDJ(detail.getZZDJ());