Merge remote-tracking branch 'origin/master'

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

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