fix: 订单明细补全问题修改

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())) {

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());