From 92592beb48ce749d93c8b871dc29ff29ff589ecf Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 10 Jul 2024 09:30:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E9=9D=96=E6=94=B6=E8=B4=B9=E9=80=80?=
 =?UTF-8?q?=E8=B4=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forthird/impl/ForThirdSysApiService.java  | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java b/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java
index 382b99f71..f3192ccb1 100644
--- a/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java
+++ b/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java
@@ -14,6 +14,7 @@ import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.forthird.ForInvOutScanCodeRequest;
 import com.glxp.api.req.forthird.IoOrderCodeRequest;
@@ -21,13 +22,17 @@ import com.glxp.api.req.forthird.IoOrderRequest;
 import com.glxp.api.req.inv.FilterInvProductRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
+import com.glxp.api.res.basic.UdiRlSupResponse;
 import com.glxp.api.res.forthird.ForInvOutScanCodeResponse;
 import com.glxp.api.res.inv.InvProductPageResponse;
 import com.glxp.api.res.inv.InvProductResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.basic.UdiRelevanceService;
+import com.glxp.api.service.basic.UdiRlSupService;
 import com.glxp.api.service.inout.IoAddInoutService;
 import com.glxp.api.service.inout.IoCheckInoutService;
+import com.glxp.api.service.inout.IoCodeTempService;
+import com.glxp.api.service.inout.IoOrderService;
 import com.glxp.api.service.inv.impl.InvProductService;
 import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.GennerOrderUtils;
@@ -59,6 +64,10 @@ public class ForThirdSysApiService {
     IoCheckInoutService ioCheckInoutService;
     @Resource
     IoAddInoutService addInoutService;
+    @Resource
+    IoOrderService orderService;
+    @Resource
+    IoCodeTempService codeTempService;
 
     public PageSimpleResponse<InvProductResponse> invProductsFilter(FilterInvProductRequest filterInvProductRequest) {
         buildForInvProductsFilter(filterInvProductRequest);
@@ -80,6 +89,8 @@ public class ForThirdSysApiService {
         return pageResponse;
     }
 
+    @Resource
+    UdiRlSupService udiRlSupService;
 
     public BaseResponse invOutScanCode(ForInvOutScanCodeRequest hisRequest) {
         IoOrderRequest orderRequest = hisRequest.getIoOrderRequest();
@@ -124,15 +135,22 @@ public class ForThirdSysApiService {
             codeEnttity.setSerialNo(udiEntity.getSerialNo());
             codeEnttity.setDeptCode(orderEntity.getDeptCode());
             codeEnttity.setInvCode(orderEntity.getInvCode());
-            List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(udiEntity.getUdi(), false);
-            if (udiRelevanceResponses.size() == 0) {
+            CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
+            companyProductRelevanceRequest.setNameCode(udiEntity.getUdi());
+            List<UdiRlSupResponse> udiRlSupResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);
+            if (udiRlSupResponses.size() == 0) {
                 return ResultVOUtils.error("收费项目未对照！");
             }
-            codeEnttity.setRelId(udiRelevanceResponses.get(0).getId());
+            codeEnttity.setRelId(udiRlSupResponses.get(0).getRlId());
+            codeEnttity.setSupId(udiRlSupResponses.get(0).getCustomerId() + "");
+            codeEnttity.setReCount(1);
             codeEnttity.setCount(1);
         }
+        orderService.insertOrder(orderEntity);
+        codeTempService.insertBatch(codeTempEntities);
         ForInvOutScanCodeResponse forInvOutScanCodeResponse = new ForInvOutScanCodeResponse();
         forInvOutScanCodeResponse.setBillNo(orderNo);
+
         addInoutService.dealProcess(orderEntity);
         if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
             ioCheckInoutService.check(orderEntity.getBillNo());