Merge remote-tracking branch 'origin/dev' into pre-production

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

@@ -2378,7 +2378,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			List<String> orderPackageCodes = new ArrayList<>();
 			List<String> noUnloadOrderPackageCodes = new ArrayList<>();
 
-				//处理三方中转未卸车数据
+			String deliveryType = carsLoadEntity.getDeliveryType();
+			//处理三方中转未卸车数据
 			QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("load_id",loadId);
 			List<TrunklineCarsLoadScanEntity> carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper);
@@ -2393,13 +2394,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						String scanCode = trunklineCarsLoadScanEntity.getScanCode();
 						Integer num = trunklineCarsLoadScanEntity.getNum();
 						Integer unloadNum = trunklineCarsLoadScanEntity.getUnloadNum();
-						Integer isData = trunklineCarsLoadScanEntity.getIsData();
+						String scanStatus = trunklineCarsLoadScanEntity.getScanStatus();
 						if(unloadNum == num){
 							orderPackageCodes.add(scanCode);
 						}else{
 							//未卸车包件
-							if(isData == 1){
-								noUnloadOrderPackageCodes.add(scanCode);
+							if(scanStatus.equals("1")){
+								if(deliveryType.equals("2")){
+									noUnloadOrderPackageCodes.add(scanCode);
+								}
 							}
 						}
 					});