From 8e077d72e5532c64ebf2c70a297800a04340f41e Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 2 Mar 2023 11:19:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=B8=89=E6=9C=9F=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E6=9C=AA=E5=A1=AB?=
 =?UTF-8?q?=E5=85=85=E5=88=B0=E5=8D=95=E6=8D=AE=E9=97=AE=E9=A2=98=202.?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=95=E5=85=A5=E4=BA=A7=E5=93=81=E6=97=B6?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8UDI=E7=A0=81=E6=9F=A5=E8=AF=A2=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/basic/UdiRlSupController.java     | 4 +++-
 .../java/com/glxp/api/service/inout/IoAddInoutService.java    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
index 54f60e64d..b00266c81 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
@@ -68,8 +68,10 @@ public class UdiRlSupController {
 
         if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUdiCode())) {
             UdiEntity udiEntity = FilterUdiUtils.getUdi(companyProductRelevanceRequest.getUdiCode());
-            if (udiEntity != null)
+            if (udiEntity != null) {
                 companyProductRelevanceRequest.setNameCode(udiEntity.getUdi());
+                companyProductRelevanceRequest.setUnionCode(udiEntity.getUdi());
+            }
         }
         //如果输入DI标识，精确找到不同层级对应的产品信息
         if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUnionCode())) {
diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
index a301cc605..50722ef92 100644
--- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
@@ -147,7 +147,7 @@ public class IoAddInoutService {
             //三期校验
             String checkOriginMsg = checkOriginCode(warehouseEntity);
             if (StrUtil.isNotEmpty(checkOriginMsg)) {
-                orderEntity.setErrMsg("checkOriginMsg");
+                orderEntity.setErrMsg(checkOriginMsg);
                 orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR);
                 orderEntity.setUpdateTime(new Date());
                 orderService.update(orderEntity);