From 0c9c81bc493c1517e13f14bd6e8bed477e666404 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 27 Aug 2024 09:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=A0=81=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/collect/IoCollectOrderController.java |  1 +
 .../com/glxp/api/entity/collect/IoCollectCode.java   |  3 +--
 .../api/service/collect/IoCollectCodeService.java    | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
index 8eaec7eb2..d6fa440ce 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -298,6 +298,7 @@ public class IoCollectOrderController extends BaseController {
 
     /**
      * 置顶
+     *
      * @param collectOrderRequest
      * @return
      */
diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java b/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java
index 5779dc822..d5ce79b62 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java
@@ -133,13 +133,12 @@ public class IoCollectCode implements Serializable {
     private Integer scanCount;
 
 
-
     /**
      * 耗材字典外键id
      */
     @TableField(value = "relId")
     @ApiModelProperty(value = "耗材字典外键id")
-    private String relId;
+    private Long relId;
 
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java
index f20ea2545..b50b9ed54 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java
@@ -42,6 +42,7 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
 
     /**
      * 追溯码查询
+     *
      * @param ioCollectCodeRequest
      * @return
      */
@@ -108,6 +109,7 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
                     .operUser(collectOrder.getCreateUser())
                     .fifoSplit(3)
                     .workPlaceCode(collectOrder.getWorkPlaceCode())
+                    .relId(ioCollectOrderCodeMan.getRelId())
                     .remark(collectOrder.getRemark()).build());
         }
         saveBatch(ioCollectCodes);
@@ -117,8 +119,8 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
         if (CollUtil.isEmpty(codeAutoList))
             return;
         List<IoCollectCode> ioCollectCodes = new ArrayList<>();
-        for (IoCollectOrderCodeAuto ioCollectOrderCodeMan : codeAutoList) {
-            ioCollectCodes.add(IoCollectCode.builder().code(ioCollectOrderCodeMan.getUdiCode())
+        for (IoCollectOrderCodeAuto collectOrderCodeAuto : codeAutoList) {
+            ioCollectCodes.add(IoCollectCode.builder().code(collectOrderCodeAuto.getUdiCode())
                     .fromType(collectOrder.getFromType())
                     .busType(collectOrder.getBusType())
                     .billNo(collectOrder.getBillNo())
@@ -126,6 +128,7 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
                     .operTime(collectOrder.getUpdateTime())
                     .operUser(collectOrder.getCreateUser())
                     .fifoSplit(1)
+                    .relId(collectOrderCodeAuto.getRelId())
                     .workPlaceCode(collectOrder.getWorkPlaceCode())
                     .remark(collectOrder.getRemark()).build());
         }
@@ -136,8 +139,8 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
         if (CollUtil.isEmpty(codeAutoList))
             return;
         List<IoCollectCode> ioCollectCodes = new ArrayList<>();
-        for (IoCollectOrderCodeAuto ioCollectOrderCodeMan : codeAutoList) {
-            ioCollectCodes.add(IoCollectCode.builder().code(ioCollectOrderCodeMan.getUdiCode())
+        for (IoCollectOrderCodeAuto collectOrderCodeAuto : codeAutoList) {
+            ioCollectCodes.add(IoCollectCode.builder().code(collectOrderCodeAuto.getUdiCode())
                     .fromType(collectOrder.getFromType())
                     .busType(collectOrder.getBusType())
                     .billNo(collectOrder.getBillNo())
@@ -145,6 +148,7 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
                     .operTime(collectOrder.getUpdateTime())
                     .operUser(collectOrder.getCreateUser())
                     .fifoSplit(2)
+                    .relId(collectOrderCodeAuto.getRelId())
                     .workPlaceCode(collectOrder.getWorkPlaceCode())
                     .remark(collectOrder.getRemark()).build());
         }