From 97c497ddc6963be17e72f5926e20059f0685d973 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 19 Feb 2023 10:55:14 +0800
Subject: [PATCH] =?UTF-8?q?pda=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/basic/UdiRlSupController.java    | 9 +++++++++
 .../com/glxp/api/controller/inout/IoOrderController.java | 1 +
 2 files changed, 10 insertions(+)

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 d4e816e0b..a94b1a9b9 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
@@ -9,6 +9,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.basic.BasicCorpEntity;
+import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.basic.UdiRlSupEntity;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
@@ -25,6 +26,7 @@ import com.glxp.api.service.basic.BasicCorpService;
 import com.glxp.api.service.basic.UdiRlSupService;
 import com.glxp.api.service.basic.CompanyProductsRelService;
 import com.glxp.api.service.basic.UdiRelevanceService;
+import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -64,6 +66,12 @@ public class UdiRlSupController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
+        if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUdiCode())) {
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(companyProductRelevanceRequest.getUdiCode());
+            if (udiEntity != null)
+                companyProductRelevanceRequest.setNameCode(udiEntity.getUdi());
+        }
+        //如果输入DI标识，精确找到不同层级对应的产品信息
         if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUnionCode())) {
             FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
             filterUdiInfoRequest.setNameCode(companyProductRelevanceRequest.getUnionCode());
@@ -74,6 +82,7 @@ public class UdiRlSupController {
                 companyProductRelevanceRequest.setUnionCode(null);
             }
         } else {
+            //只查找主标识产品信息
             companyProductRelevanceRequest.setDiType(1);
         }
         List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index 8e7717f33..93e0e8c5a 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -236,6 +236,7 @@ public class IoOrderController extends BaseController {
                 filterOrderDetailBizRequest.setOrderIdFk(orderResponse.getBillNo());
                 List<IoOrderDetailBizResponse> orderDetailBizEntities = orderDetailBizService.filterList(filterOrderDetailBizRequest);
                 pdaBusOrderResponse.setOrderDetailBizResponses(orderDetailBizEntities);
+                erpOrderResponses.add(pdaBusOrderResponse);
             }
         }
         PageInfo<IoOrderResponse> pageInfo;