1.干线-直发商家逻辑优化

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;

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

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