1.优化卸车数据同步逻辑

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

@@ -596,7 +596,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				abnormalRecordEntity.setDealTime(new Date());
 				abnormalRecordEntity.setDealUserId(userId);
 				abnormalRecordEntity.setDealUserName(nickName);
-				abnormalRecordEntity.setRemark("无卸车记录,已入库，系统判定自动完结");
+				abnormalRecordEntity.setRemark("无卸车记录,已在其他车次入库，系统判定自动完结");
 			}
 			addList.add(abnormalRecordEntity);
 //			abnormalRecordClient.addAbnormalRecord(abnormalRecordEntity);

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

@@ -13618,8 +13618,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					updateScanEntity.setMaterialCode(trunklineAdvanceDetailEntity.getMaterialCode());
 					updateScanEntity.setMaterialName(trunklineAdvanceDetailEntity.getMaterialName());
 					updateScanEntity.setIsData(1);
+
+					DistributionParcelListEntity parcelList = parcelMap.get(orderPackageCode);
+					if(Objects.isNull(parcelList)){
 						updateScanList.add(updateScanEntity);
 					}
+
+
+				}
 			});
 
 			if(CollUtil.isNotEmpty(incomingAdvanceDetailList)){
@@ -13675,15 +13681,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 							});
 						}
 
-						DistributionParcelListEntity parcelList = parcelMap.get(orderPackageCode);
-						if(Objects.isNull(parcelList)){
 						TrunklineAdvanceDetailEntity updateEntity = new TrunklineAdvanceDetailEntity();
 						updateEntity.setId(trunklineAdvanceDetailEntity.getId());
 						updateEntity.setNowWarehouseId(warehouseId);
 						updateEntity.setNowWarehouseName(warehouseName);
 						updateNowWarehouseList.add(updateEntity);
 					}
-					}
 				});
 
 				if(CollUtil.isNotEmpty(updateParceList)){