From 6add29cf829a6d1c49475f377212e43bfa205767 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 9 Dec 2024 17:26:09 +0800
Subject: [PATCH] =?UTF-8?q?12/9=20=E5=B7=B2=E5=AE=8C=E6=88=90=E5=8D=95-?=
 =?UTF-8?q?=E7=A0=81=E6=A0=A1=E9=AA=8C=20=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IoCollectCodeBackupController.java        | 31 +++++++++++++++++++
 .../res/collect/IoCollectCodeResponse.java    |  1 +
 .../collect/IoCollectCodeBackService.java     |  1 +
 3 files changed, 33 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java
index 42f7b984f..6d2e33a92 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java
@@ -10,11 +10,17 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.collect.IoCollectCodeBackup;
 import com.glxp.api.entity.collect.IoCollectOrder;
+import com.glxp.api.req.collect.CollectOrderCodeAutoRequest;
+import com.glxp.api.req.collect.CollectOrderCodeManRequest;
 import com.glxp.api.req.collect.IoCollectCodeRequest;
 import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.collect.CollectOrderCodeAutoResponse;
+import com.glxp.api.res.collect.CollectOrderCodeManResponse;
 import com.glxp.api.res.collect.IoCollectCodeResponse;
 import com.glxp.api.service.collect.IoCollectCodeBackService;
+import com.glxp.api.service.collect.IoCollectOrderCodeAutoService;
+import com.glxp.api.service.collect.IoCollectOrderCodeManService;
 import com.glxp.api.service.collect.IoCollectOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
@@ -40,6 +46,12 @@ public class IoCollectCodeBackupController extends BaseController {
     @Resource
     IoCollectOrderService collectOrderService;
 
+    @Resource
+    IoCollectOrderCodeAutoService ioCollectOrderCodeAutoService;
+
+    @Resource
+    IoCollectOrderCodeManService ioCollectOrderCodeManService;
+
     /**
      * 追溯码备份查询
      */
@@ -107,6 +119,25 @@ public class IoCollectCodeBackupController extends BaseController {
     @GetMapping("/udiwms/basic/collect/ioCollectCode/endList")
     public BaseResponse filterList(IoCollectCodeRequest request) {
         List<IoCollectCodeResponse> ioCollectCodeResponses = ioCollectCodeBackService.filterList(request);
+        for (IoCollectCodeResponse ioCollectCodeResponse : ioCollectCodeResponses){
+            CollectOrderCodeAutoRequest collectOrderCodeAutoRequest = new CollectOrderCodeAutoRequest();
+            collectOrderCodeAutoRequest.setOrderIdFk(request.getBillNo());
+            collectOrderCodeAutoRequest.setUdiCode(ioCollectCodeResponse.getCode());
+            List<CollectOrderCodeAutoResponse> collectOrderCodeAutoResponses = ioCollectOrderCodeAutoService.filterList(collectOrderCodeAutoRequest);
+            if (collectOrderCodeAutoResponses.size() >0){
+                CollectOrderCodeAutoResponse collectOrderCodeAutoResponse = collectOrderCodeAutoResponses.get(0);
+                ioCollectCodeResponse.setSerialNo(collectOrderCodeAutoResponse.getSerialNo());
+            }else {
+                CollectOrderCodeManRequest collectOrderCodeManRequest = new CollectOrderCodeManRequest();
+                collectOrderCodeManRequest.setUdiCode(ioCollectCodeResponse.getCode());
+                collectOrderCodeManRequest.setOrderIdFk(request.getBillNo());
+                List<CollectOrderCodeManResponse> collectOrderCodeManResponses = ioCollectOrderCodeManService.filterList(collectOrderCodeManRequest);
+                if (collectOrderCodeManResponses.size() > 0){
+                    CollectOrderCodeManResponse collectOrderCodeManResponse = collectOrderCodeManResponses.get(0);
+                    ioCollectCodeResponse.setSerialNo(collectOrderCodeManResponse.getSerialNo());
+                }
+            }
+        }
         PageInfo<IoCollectCodeResponse> pageInfo = new PageInfo<>(ioCollectCodeResponses);
         PageSimpleResponse<IoCollectCodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java
index e3689d33c..5a3e3d001 100644
--- a/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java
@@ -109,5 +109,6 @@ public class IoCollectCodeResponse {
     private String batchNo;
     private String productDate;
     private String expireDate;
+    private String serialNo;
     private Integer scanActCount;
 }
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java
index 4d44a4864..0af47f089 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java
@@ -38,6 +38,7 @@ public class IoCollectCodeBackService extends ServiceImpl<IoCollectCodeBackMappe
     @Resource
     UdiRelevanceService udiRelevanceService;
 
+
     /**
      * 追溯码查询
      *