From 2f154d208958782af9037b458cac79491c28d0e2 Mon Sep 17 00:00:00 2001
From: gongquanlin <1025081659@qq.com>
Date: Tue, 28 Mar 2023 11:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=89=A9=E6=96=99=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=EF=BC=8C=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CommonInterfaceServiceImpl.java    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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 ba841a66..e9572cd0 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
@@ -587,7 +587,18 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
                                 .append("\r\n");
                     } else {
                         // 如果找到记录，进行赋值匹配
-                        
+                        // 判断是否推送了物料的名称、单位、规格型号信息
+                        if (StringUtils.isEmpty(item.getXmmc())) {
+                            item.setXmmc(commodityCodeEntity.getXmmc());
+                        }
+
+                        if (StringUtils.isEmpty(item.getXmdw())) {
+                            item.setXmdw(commodityCodeEntity.getXmdw());
+                        }
+
+                        if (StringUtils.isEmpty(item.getGgxh())) {
+                            item.setGgxh(commodityCodeEntity.getGgxh());
+                        }
 
                     }