1.干线装车bug修复

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java

@@ -902,9 +902,10 @@ public class SyncOrderInfoToPlatform {
 			Integer id = waybillJSON.getInt("id");
 			String waybillNo = waybillJSON.getStr("waybillNo");
 
-			List<String> list = advanceClient.findListByWaybillNo(waybillNo);
+			List<String> orderCodes = new ArrayList<>();
+			orderCodes.add(waybillNo);
 
-			syncOrderInfoService.handleData(list,oldId,warehouseId,null,null);
+			syncOrderInfoService.handleData(orderCodes,oldId,warehouseId,null,null);
 
 			warehouseMappingDataService.updateSyncWaybillOrderRecordById(id,1);
 		});

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

@@ -187,4 +187,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
     CustmoerUnloadNumVO findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 
 	Integer findStockNumByLoadId(@Param("loadId") Long loadId);
+
+	TrunklineCarsLoadScanEntity findEntityByLoadIdAndOrderPackageCodeAndScanStatus(@Param("loadId") Long loadId, @Param("orderPackageCode") String orderPackageCode, @Param("scanStatus") String scanStatus);
 }

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

@@ -1009,4 +1009,12 @@
     </select>
 
 
+    <select id="findEntityByLoadIdAndOrderPackageCodeAndScanStatus" parameterType="">
+        select *
+        from logpm_trunkline_cars_load_scan
+        where scan_code = #{orderPackageCode}
+          and load_id = #{loadId}
+          and scan_status = #{scanStatus}
+    </select>
+
 </mapper>

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

@@ -183,4 +183,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	CustmoerUnloadNumVO findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(Long loadId, Long warehouseId);
 
 	Integer findStockNumByLoadId(Long loadId);
+
+	TrunklineCarsLoadScanEntity findEntityByLoadIdAndOrderPackageCodeAndScanStatus(Long loadId, String orderPackageCode, String scanStatus);
 }

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

@@ -469,4 +469,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		return baseMapper.findStockNumByLoadId(loadId);
 	}
 
+	@Override
+	public TrunklineCarsLoadScanEntity findEntityByLoadIdAndOrderPackageCodeAndScanStatus(Long loadId, String orderPackageCode, String scanStatus) {
+		return baseMapper.findEntityByLoadIdAndOrderPackageCodeAndScanStatus(loadId,orderPackageCode,scanStatus);
+	}
+
 }

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

@@ -3573,13 +3573,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Long loadScanId = null;
 
 
-		TrunklineCarsLoadScanEntity trunklineCarsLoadScan = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId, orderPackageCode);
+		TrunklineCarsLoadScanEntity trunklineCarsLoadScan = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCodeAndScanStatus(loadId, orderPackageCode,"1");
 		if(!Objects.isNull(trunklineCarsLoadScan)){
-			String scanStatus = trunklineCarsLoadScan.getScanStatus();
-			if("1".equals(scanStatus)){
-				log.warn("##################loadingScan: 包件已装车 orderPackageCode={}", orderPackageCode);
-				return Resp.scanFail(405,"包件已装车","包件已装车");
-			}
+			log.warn("##################loadingScan: 包件已装车 orderPackageCode={}", orderPackageCode);
+			return Resp.scanFail(405,"包件已装车","包件已装车");
 		}
 
 
@@ -6452,7 +6449,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Long waybillId = null;
 
 		Date date = new Date();
-		TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId, orderPackageCode);
+//		TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId, orderPackageCode);
+		TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCodeAndScanStatus(loadId, orderPackageCode,"1");
 		if (Objects.isNull(carsLoadScanEntity)) {
 			//因为没有装车记录，补装车记录
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(orderPackageCode);