From d165365eb86acab2465b7654bb9a0b37fffc774e Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 16 Jan 2024 17:25:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-=E7=9B=B4=E5=8F=91?=
 =?UTF-8?q?=E5=95=86=E5=AE=B6=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/logpm/trunkline/vo/SignPackageVO.java   | 4 ++++
 .../logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml    | 3 ++-
 .../logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignPackageVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignPackageVO.java
index 61889538c..a75bf8f19 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignPackageVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignPackageVO.java
@@ -1,9 +1,13 @@
 package com.logpm.trunkline.vo;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
+@Data
 public class SignPackageVO implements Serializable {
 
+	private Long carsLoadScanId;
 	private String orderPackageCode;
 	private Integer num;
 	private Integer unloadNum;
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
index 9b20aa7f2..380585a21 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
@@ -253,7 +253,8 @@
     </update>
 
     <select id="findSignPackageList" resultType="com.logpm.trunkline.vo.SignPackageVO">
-        select scan_code orderPackageCode,
+        select id carsLoadScanId,
+               scan_code orderPackageCode,
                num num,
                unload_num unloadNum,
                scan_status scanStatus
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
index 0e446a4e3..46cd9b278 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
@@ -38,7 +38,7 @@
     </select>
 
     <select id="finaSignOrderDetail" resultType="com.logpm.trunkline.vo.TrunklineLoadSignOrderVO">
-        select ltlso.*
+        select ltlso.*,
             ltcl.driver_name driverName,
             ltcl.cars_no carsNo
         from logpm_trunkline_load_sign_order ltlso