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

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,7 +13618,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					updateScanEntity.setMaterialCode(trunklineAdvanceDetailEntity.getMaterialCode());
 					updateScanEntity.setMaterialName(trunklineAdvanceDetailEntity.getMaterialName());
 					updateScanEntity.setIsData(1);
-					updateScanList.add(updateScanEntity);
+
+					DistributionParcelListEntity parcelList = parcelMap.get(orderPackageCode);
+					if(Objects.isNull(parcelList)){
+						updateScanList.add(updateScanEntity);
+					}
+
+
 				}
 			});
 
@@ -13675,14 +13681,11 @@ 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);
-						}
+						TrunklineAdvanceDetailEntity updateEntity = new TrunklineAdvanceDetailEntity();
+						updateEntity.setId(trunklineAdvanceDetailEntity.getId());
+						updateEntity.setNowWarehouseId(warehouseId);
+						updateEntity.setNowWarehouseName(warehouseName);
+						updateNowWarehouseList.add(updateEntity);
 					}
 				});