1.干线-bug修复

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java

@@ -118,4 +118,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 	List<String> findSignListOrderPackageCodes(@Param("loadId") Long loadId);
 
 	List<String> findSignListOrderPackageCodesByIds(@Param("list") List<Long> loadScanIds);
+
+	List<Long> findAllIdListByLoadId(@Param("loadId") Long loadId);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -537,4 +537,12 @@
         </if>
     </select>
 
+    <select id="findAllIdListByLoadId" resultType="Long">
+        select id
+        from logpm_trunkline_cars_load_scan
+        where 1=1
+        and load_id = #{loadId}
+        and scan_status = '1'
+    </select>
+
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml

@@ -18,7 +18,8 @@
 
     <select id="finaSignOrderList" resultType="com.logpm.trunkline.vo.TrunklineLoadSignOrderVO">
         select ltlso.*,
-                ltcl.driver_name driverName
+                ltcl.driver_name driverName,
+               ltcl.cars_no carsNo
         from logpm_trunkline_load_sign_order ltlso
         left join logpm_trunkline_cars_load ltcl on ltcl.id = ltlso.load_id
         <where>
@@ -61,6 +62,7 @@
                ltcls.num num,
                ltcls.unload_num unloadNum,
                ltcls.remark remak,
+               ltcls.load_code carsNo,
                ltco.sign_order_id signOrderId
         from logpm_trunkline_cars_order ltco
         left join logpm_trunkline_cars_load_scan ltcls on ltco.load_id = ltcls.load_id and ltco.node_id = ltcls.warehouse_id and ltcls.order_code = ltco.order_code and ltcls.waybill_no = ltco.waybill_no

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java

@@ -114,4 +114,5 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 
 	List<String> findSignListOrderPackageCodesByIds(List<Long> loadScanIds);
 
+	List<Long> findAllIdListByLoadId(Long loadId);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java

@@ -278,4 +278,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		return baseMapper.findSignListOrderPackageCodesByIds(loadScanIds);
 	}
 
+	@Override
+	public List<Long> findAllIdListByLoadId(Long loadId) {
+		return baseMapper.findAllIdListByLoadId(loadId);
+	}
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -664,8 +664,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		carsLoadEntity.setCancleUserName(AuthUtil.getUserName());
 		updateById(carsLoadEntity);
 
-		//TODO 逻辑删除装车扫描表的数据
+		//逻辑删除装车扫描表的数据
+		List<Long> carsLoadScanIdList = trunklineCarsLoadScanService.findAllIdListByLoadId(loadId);
 
+		removeCarsLoadScan(StringUtil.join(carsLoadScanIdList, ","),warehouseId);
 
 		try {
 			trunklineCarsLoadLogService.saveLog(carsLoadEntity, currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_CARS_LOAD.getValue());
@@ -896,6 +898,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				currentCarsLoadLineEntity.setUnloadUserName(AuthUtil.getUserName());
 				currentCarsLoadLineEntity.setUnloadDate(new Date());
 				trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
+				carsLoadEntity.setLoadStatus("80");
+				updateById(carsLoadEntity);
+
 				try {
 					carsLoadAsyncService.saveLog(carsLoadEntity, currentCarsLoadLineEntity, CarsLoadLogTypeConstant.END_UNLOAD_CARS_LOAD.getValue(), AuthUtil.getNickName(), AuthUtil.getUserId());
 					openOrderAsyncService.saveUnloadStartCarLog(currentCarsLoadLineEntity, AuthUtil.getNickName(), AuthUtil.getUserId());