1.托盘装车bug修复

2.优化发车时间逻辑
3.优化更新包件同步计算订单数量逻辑

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/DealWithAbnormalVO.java

@@ -18,4 +18,6 @@ public class DealWithAbnormalVO implements Serializable {
 
 	private Long userId;
 
+	private String remark;
+
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/RetentionCarsLoadVO.java

@@ -0,0 +1,19 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class RetentionCarsLoadVO implements Serializable {
+
+
+	private Long scanId;
+	private Long loadId;
+	private String loadCode;
+	private String orderPackageCode;
+	private Long warehouseId;
+	private String warehouseName;
+
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesAbnormalRecordClient.java

@@ -71,6 +71,7 @@ public class AftersalesAbnormalRecordClient implements IAftersalesAbnormalRecord
 		String warehouseName = dealWithAbnormalVO.getWarehouseName();
 		String nickName = dealWithAbnormalVO.getNickName();
 		Long userId = dealWithAbnormalVO.getUserId();
+		String remark = dealWithAbnormalVO.getRemark();
 
 
 		List<AftersalesAbnormalRecordEntity> abnormalRecordEntities = aftersalesAbnormalRecordService.findListByOrderPackageCodes(orderPackageCodes);

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java

@@ -391,6 +391,8 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 										DistributionParcelListEntity updateParceListEntity = new DistributionParcelListEntity();
 										updateParceListEntity.setId(parcelListId);
 										updateParceListEntity.setQuantity(parcelList.getQuantity()+packageNum);
+										updateParceListEntity.setWarehouseId(parcelList.getWarehouseId());
+										updateParceListEntity.setOrderCode(parcelList.getOrderCode());
 										updateParcelListEntityList.add(updateParceListEntity);
 
 										//更新零担品类数量信息

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

@@ -1256,6 +1256,8 @@ public class SyncOrderInfoToPlatform {
 					DistributionParcelListEntity updateEntity = new DistributionParcelListEntity();
 					updateEntity.setId(distributionParcelListEntity.getId());
 					updateEntity.setOrderPackageStatus("60");
+					updateEntity.setWarehouseId(distributionParcelListEntity.getWarehouseId());
+					updateEntity.setOrderCode(distributionParcelListEntity.getOrderCode());
 					updateParceList.add(updateEntity);
 				});
 			}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java

@@ -1083,4 +1083,67 @@ public class CarsLoadApiController {
 		}
 	}
 
+
+	@ResponseBody
+	@PostMapping("/findRetentionCarsLoadPackage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询滞留干线包件", notes = "传入loadCarsDTO")
+	public R findRetentionCarsLoadPackage(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############findRetentionCarsLoadPackage: ";
+		log.info(method+"请求参数{}",loadCarsDTO);
+
+		String orderPackageCode = loadCarsDTO.getOrderPackageCode();
+
+		try{
+
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"请选择指定仓库");
+				return R.fail(405,"请选择指定仓库");
+			}
+			Long warehouseId = myCurrentWarehouse.getId();
+			String warehouseName = myCurrentWarehouse.getName();
+
+			return carsLoadService.findRetentionCarsLoadPackage(orderPackageCode,warehouseId,warehouseName);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+	@ResponseBody
+	@PostMapping("/retentionCarsLoadPackage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "滞留干线包件", notes = "传入loadCarsDTO")
+	public R retentionCarsLoadPackage(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############retentionCarsLoadPackage: ";
+		log.info(method+"请求参数{}",loadCarsDTO);
+
+		List<Long> loadScanIds = loadCarsDTO.getLoadScanIds();
+
+		try{
+
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"请选择指定仓库");
+				return R.fail(405,"请选择指定仓库");
+			}
+			Long warehouseId = myCurrentWarehouse.getId();
+			String warehouseName = myCurrentWarehouse.getName();
+
+			return carsLoadService.retentionCarsLoadPackage(loadScanIds,warehouseId,warehouseName);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -3056,7 +3056,4 @@ public class CarsLoadController {
 		}
 	}
 
-
-
-
 }

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

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Mapper
@@ -25,4 +26,5 @@ public interface TrunklineCarsLoadLineMapper extends BaseMapper<TrunklineCarsLoa
 
     void deleteEntityById(@Param("carsLoadLineId") Long carsLoadLineId);
 
+    void updateStartTime(@Param("lineId") Long lineId,@Param("nodeStatus") String nodeStatus, @Param("date") Date date, @Param("userId") Long userId, @Param("nickName") String nickName);
 }

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

@@ -53,4 +53,14 @@
     </delete>
 
 
+    <update id="updateStartTime">
+        update logpm_trunkline_cars_load_line
+        set start_date = #{date},
+            node_status = #{nodeStatus},
+            start_user_id = #{userId},
+            start_user_name = #{nickName}
+        where load_id = #{lineId}
+        and id = #{lineId}
+    </update>
+
 </mapper>

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

@@ -201,4 +201,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
     List<TrunklineCarsLoadScanEntity> findListByIdsAndType(@Param("carsLoadScanIdList") List<Long> carsLoadScanIdList, @Param("type") int type);
 
 	void updateWaybillInfoByOrderPackageCodes(@Param("orderPackageCodeList") List<String> orderPackageCodeList, @Param("waybillId") Long waybillId, @Param("waybillNo") String waybillNo);
+
+	List<RetentionCarsLoadVO> findRetentionPackage(@Param("orderPackageCode") String orderPackageCode, @Param("warehouseId") Long warehouseId);
 }

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

@@ -1202,5 +1202,20 @@
         </foreach>
     </update>
 
+    <select id="findRetentionPackage" resultType="com.logpm.trunkline.vo.RetentionCarsLoadVO">
+        select id scanId,
+               load_id loadId,
+               load_code loadCode,
+               scan_code orderPackageCode,
+               warehouse_id warehouseId,
+               warehouse_name warehouseName
+        from logpm_trunkline_cars_load_scan
+        where scan_code = #{orderPackageCode}
+        and warehouse_id = #{warehouseId}
+        and type = '1'
+        and scan_status = '1'
+    </select>
+
+
 
 </mapper>

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

@@ -4,6 +4,7 @@ import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity;
 import org.springblade.core.mp.base.BaseService;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 public interface ITrunklineCarsLoadLineService extends BaseService<TrunklineCarsLoadLineEntity> {
@@ -28,4 +29,5 @@ public interface ITrunklineCarsLoadLineService extends BaseService<TrunklineCars
 
     void deleteEntityById(Long carsLoadLineId);
 
+    void updateStartTime(Long lineId,String nodeStatus, Date date, Long userId, String nickName);
 }

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

@@ -203,4 +203,7 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	List<TrunklineCarsLoadScanEntity> findListByIdsAndType(List<Long> carsLoadScanIdList, int type);
 
 	void updateWaybillInfoByOrderPackageCodes(List<String> orderPackageCodeList, Long waybillId, String waybillNo);
+
+	List<RetentionCarsLoadVO> findRetentionPackage(String orderPackageCode, Long warehouseId);
+
 }

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

@@ -279,4 +279,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R zeroUnloadEnter(List<Long> loadScanIds, Long warehouseId, String warehouseName);
 
+	R findRetentionCarsLoadPackage(String orderPackageCode, Long warehouseId, String warehouseName);
+
+	R retentionCarsLoadPackage(List<Long> loadScanIds, Long warehouseId, String warehouseName);
 }

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

@@ -1474,6 +1474,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		InputStream inputStream = file.getInputStream();
 
 		List<PacakgeDetailExcelDTO> pacakgeDetailExcelDTOS = EasyExcel.read(inputStream).head(PacakgeDetailExcelDTO.class).sheet(0).headRowNumber(2).doReadSync();
+		pacakgeDetailExcelDTOS.forEach(dto -> {
+			dto.setOrderCode(dto.getOrderCode().trim());
+			dto.setOrderPackageCode(dto.getOrderPackageCode().trim());
+		});
 		//排除pacakgeDetailExcelDTOS中的orderPackageCode为空的元素
 		pacakgeDetailExcelDTOS = pacakgeDetailExcelDTOS.stream().filter(item -> StringUtil.isNotBlank(item.getOrderPackageCode())).collect(Collectors.toList());
 		//把importStandardOuPaiDTOS中orderPackageCode相同的元素去重
@@ -1841,6 +1845,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		long start = System.currentTimeMillis();
 
 		List<ImportCustomizedOuPaiDTO> importCustomizedOuPaiDTOS = EasyExcel.read(inputStream).head(ImportCustomizedOuPaiDTO.class).sheet(0).headRowNumber(1).doReadSync();
+		//把importCustomizedOuPaiDTOS中orderCode和orderPackageCode去空格
+		importCustomizedOuPaiDTOS.forEach(dto -> {
+			dto.setOrderCode(dto.getOrderCode().trim());
+			dto.setOrderPackageCode(dto.getOrderPackageCode().trim());
+		});
+
 		//判断importCustomizedOuPaiDTOS中firstsName有值的数量
 		long countWithMaterialName = importCustomizedOuPaiDTOS.stream()
 			.filter(dto -> StringUtil.isNotBlank(dto.getFirstsName()))
@@ -1854,6 +1864,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		importCustomizedOuPaiDTOS = importCustomizedOuPaiDTOS.stream().filter(item -> StringUtil.isNotBlank(item.getOrderPackageCode())).collect(Collectors.toList());
 		//把importStandardOuPaiDTOS中orderPackageCode相同的元素去重
 		importCustomizedOuPaiDTOS = importCustomizedOuPaiDTOS.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ImportCustomizedOuPaiDTO::getOrderPackageCode))), ArrayList::new));
+		//去除importCustomizedOuPaiDTOS中字段的空格
+
+
 
 		//提取出合包码不为空的数据
 		List<ImportCustomizedOuPaiDTO> mergeDataList = importCustomizedOuPaiDTOS.stream().filter(item -> StringUtil.isNotBlank(item.getMergeCode())).collect(Collectors.toList());
@@ -2188,6 +2201,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//读取inputStream中Excel的表头数据
 
 		List<ImportStandardOuPaiDTO> importStandardOuPaiDTOS = EasyExcel.read(inputStream).head(ImportStandardOuPaiDTO.class).sheet(0).headRowNumber(1).doReadSync();
+		importStandardOuPaiDTOS.forEach(dto -> {
+			dto.setOrderCode(dto.getOrderCode().trim());
+			dto.setOrderPackageCode(dto.getOrderPackageCode().trim());
+		});
 		//判断importStandardOuPaiDTOS中materialName有值的数量
 		long countWithMaterialName = importStandardOuPaiDTOS.stream()
 			.filter(dto -> StringUtil.isNotBlank(dto.getMaterialName()))
@@ -3125,6 +3142,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		InputStream inputStream = file.getInputStream();
 
 		List<ImportOrderNoPackageExcelDTO> importOrderNoPackageExcelDTOS = EasyExcel.read(inputStream).head(ImportOrderNoPackageExcelDTO.class).sheet(0).headRowNumber(2).doReadSync();
+		importOrderNoPackageExcelDTOS.forEach(dto -> {
+			dto.setOrderCode(dto.getOrderCode().trim());
+		});
 
 		//过滤掉importOrderNoPackageExcelDTOS中orderCode为空的数据
 		importOrderNoPackageExcelDTOS = importOrderNoPackageExcelDTOS.stream().filter(item -> StringUtil.isNotBlank(item.getOrderCode())).collect(Collectors.toList());
@@ -3375,7 +3395,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		InputStream inputStream = file.getInputStream();
 
 		List<ImportOrderNoPackageExcelDTO> importOrderNoPackageExcelDTOS = EasyExcel.read(inputStream).head(ImportOrderNoPackageExcelDTO.class).sheet(0).headRowNumber(2).doReadSync();
-
+		importOrderNoPackageExcelDTOS.forEach(dto -> {
+			dto.setOrderCode(dto.getOrderCode().trim());
+		});
 		//过滤掉importOrderNoPackageExcelDTOS中orderCode为空的数据
 		importOrderNoPackageExcelDTOS = importOrderNoPackageExcelDTOS.stream().filter(item -> StringUtil.isNotBlank(item.getOrderCode())).collect(Collectors.toList());
 

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

@@ -10,6 +10,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Slf4j
@@ -77,4 +78,9 @@ public class TrunklineCarsLoadLineServiceImpl extends BaseServiceImpl<TrunklineC
 	public void deleteEntityById(Long carsLoadLineId) {
 		baseMapper.deleteEntityById(carsLoadLineId);
 	}
+
+	@Override
+	public void updateStartTime(Long lineId,String nodeStatus, Date date, Long userId, String nickName) {
+		baseMapper.updateStartTime(lineId,nodeStatus,date,userId,nickName);
+	}
 }

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

@@ -504,4 +504,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		baseMapper.updateWaybillInfoByOrderPackageCodes(orderPackageCodeList,waybillId,waybillNo);
 	}
 
+	@Override
+	public List<RetentionCarsLoadVO> findRetentionPackage(String orderPackageCode, Long warehouseId) {
+		return baseMapper.findRetentionPackage(orderPackageCode,warehouseId);
+	}
+
 }

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

@@ -305,11 +305,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			Date date = new Date();
 			//修改节点的发车状态
-			carsLoadLineEntity.setNodeStatus("20");
-			carsLoadLineEntity.setStartDate(date);
-			carsLoadLineEntity.setStartUserId(AuthUtil.getUserId());
-			carsLoadLineEntity.setStartUserName(AuthUtil.getNickName());
-			trunklineCarsLoadLineService.updateById(carsLoadLineEntity);
+//			carsLoadLineEntity.setNodeStatus("20");
+//			carsLoadLineEntity.setStartDate(date);
+//			carsLoadLineEntity.setStartUserId(AuthUtil.getUserId());
+//			carsLoadLineEntity.setStartUserName(AuthUtil.getNickName());
+			trunklineCarsLoadLineService.updateStartTime(carsLoadLineEntity.getId(),"20",date,AuthUtil.getUserId(),AuthUtil.getNickName());
 
 			//修改配载计划的节点状态
 			carsLoadEntity.setStartTime(date);
@@ -384,11 +384,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			Date date = new Date();
 			//修改节点的发车状态
-			currentCarsLoadLineEntity.setNodeStatus("20");
-			currentCarsLoadLineEntity.setStartDate(date);
-			currentCarsLoadLineEntity.setStartUserId(AuthUtil.getUserId());
-			currentCarsLoadLineEntity.setStartUserName(AuthUtil.getNickName());
-			trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
+			trunklineCarsLoadLineService.updateStartTime(currentCarsLoadLineEntity.getId(),"20",date,AuthUtil.getUserId(),AuthUtil.getNickName());
 
 			//修改配载计划的节点状态
 			carsLoadEntity.setLoadStatus("30");
@@ -813,10 +809,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		if (1 == startCarType) {
 			//发展仓发车
 			currentCarsLoadLineEntity.setNodeStatus("10");
-			currentCarsLoadLineEntity.setStartDate(null);
-			currentCarsLoadLineEntity.setStartUserId(null);
-			currentCarsLoadLineEntity.setStartUserName(null);
-			trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
+//			currentCarsLoadLineEntity.setStartDate(null);
+//			currentCarsLoadLineEntity.setStartUserId(null);
+//			currentCarsLoadLineEntity.setStartUserName(null);
+//			trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
+			trunklineCarsLoadLineService.updateStartTime(currentCarsLoadLineEntity.getId(),"10",null,null,null);
 
 			carsLoadEntity.setLoadStatus("0");
 			carsLoadEntity.setStartTime(null);
@@ -834,11 +831,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		} else if (2 == startCarType) {
 			//中间网点发车
-			currentCarsLoadLineEntity.setNodeStatus("10");
-			currentCarsLoadLineEntity.setStartDate(null);
-			currentCarsLoadLineEntity.setStartUserId(null);
-			currentCarsLoadLineEntity.setStartUserName(null);
-			trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
+			trunklineCarsLoadLineService.updateStartTime(currentCarsLoadLineEntity.getId(),"10",null,null,null);
 
 			carsLoadEntity.setLoadStatus("20");
 			carsLoadEntity.setStartTime(null);
@@ -1400,6 +1393,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 									Integer quantity = entity.getQuantity();
 									DistributionParcelListEntity updatePaceList = new DistributionParcelListEntity();
 									updatePaceList.setId(parceListId);
+									updatePaceList.setOrderCode(entity.getOrderCode());
+									updatePaceList.setWarehouseId(entity.getWarehouseId());
 									updatePaceList.setQuantity(quantity+totalUnloadNum);
 									updatePaceList.setOrderPackageStatus("20");
 									updatePaceList.setOrderPackageStockupStatus("10");
@@ -1628,7 +1623,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		//把scanList中warehouseId不为空的num值求和 为空则用0代替
 		Integer realLoadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getWarehouseId())).mapToInt(TrunklineCarsLoadScanEntity::getNum).sum();
 		///把scanList中scanStatus不为1的unloadNum值求和 为空则用0代替
-		Integer realUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1")).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
+		Integer realUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && !scan.getScanStatus().equals("4")).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
 		Integer stockCarNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && scan.getScanStatus().equals("1")).mapToInt(TrunklineCarsLoadScanEntity::getNum).sum();
 
 		carsLoadEntity.setPlanLoadingNumber(loadPlanNum);
@@ -1649,7 +1644,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				planNum = nodeNumDataVO.getPlanNum();
 			}
 			Integer lineRealLoadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getWarehouseId()) && NumberUtil.equals(nodeId,scan.getWarehouseId())).mapToInt(TrunklineCarsLoadScanEntity::getNum).sum();
-			Integer lineRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && !Objects.isNull(scan.getUnloadNodeId()) && NumberUtil.equals(nodeId,scan.getUnloadNodeId())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
+			Integer lineRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && !scan.getScanStatus().equals("4") && !Objects.isNull(scan.getUnloadNodeId()) && NumberUtil.equals(nodeId,scan.getUnloadNodeId())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
 			carsLoadLineEntity.setPlanLoadingNumber(planNum);
 			carsLoadLineEntity.setRealLoadingNumber(lineRealLoadingNum);
 			carsLoadLineEntity.setUnloadNumber(lineRealUnloadingNum);
@@ -1668,7 +1663,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String orderCode = carsOrderEntity.getOrderCode();
 			String waybillNo = carsOrderEntity.getWaybillNo();
 			Integer carsOrderRealLoadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getWarehouseId()) && NumberUtil.equals(nodeId,scan.getWarehouseId()) && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getNum).sum();
-			Integer carsOrderRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
+			Integer carsOrderRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && !scan.getScanStatus().equals("4") && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
 			Integer carsOrderRealSignNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && scan.getScanStatus().equals("3") && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
 			carsOrderEntity.setRealNum(carsOrderRealLoadingNum);
 			carsOrderEntity.setUnloadNum(carsOrderRealUnloadingNum);
@@ -4117,6 +4112,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						DistributionParcelListEntity updateEntity = new DistributionParcelListEntity();
 						updateEntity.setId(entity.getId());
 						updateEntity.setQuantity(quantity-entityByWaybillDetailId.getNum());
+						updateEntity.setOrderCode(entity.getOrderCode());
+						updateEntity.setWarehouseId(entity.getWarehouseId());
 						updateParceList.add(updateEntity);
 						DistributionParcelNumberEntity parcelNumberEntity = parcelNumberMapByParceListId.get(parceListId);
 						DistributionParcelNumberEntity updateNumberEntity = new DistributionParcelNumberEntity();
@@ -4933,7 +4930,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		noWaybillNoTrunklineCarsLoadScanMapByOrderCode.keySet().forEach(orderCode -> {
 			List<TrunklineCarsLoadScanVO> trunklineCarsLoadScanVOS = noWaybillNoTrunklineCarsLoadScanMapByOrderCode.get(orderCode);
 			//把trunklineCarsLoadScanVOS中所有元素的num加起来，如果num为空则用0代替
-			Integer loadingNum = trunklineCarsLoadScanVOS.stream().filter(t-> Objects.isNull(t.getWarehouseId())).map(TrunklineCarsLoadScanVO::getNum).reduce(0, Integer::sum);
+			Integer loadingNum = trunklineCarsLoadScanVOS.stream().filter(t-> !Objects.isNull(t.getWarehouseId())).map(TrunklineCarsLoadScanVO::getNum).reduce(0, Integer::sum);
 			Integer unloadNum = trunklineCarsLoadScanVOS.stream().map(TrunklineCarsLoadScanVO::getUnloadNum).reduce(0, Integer::sum);
 			Integer signNum = trunklineCarsLoadScanVOS.stream().filter(t-> t.getScanStatus().equals("3")).map(TrunklineCarsLoadScanVO::getUnloadNum).reduce(0, Integer::sum);
 
@@ -5309,6 +5306,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 									DistributionParcelListEntity updatePaceList = new DistributionParcelListEntity();
 									updatePaceList.setId(parceListId);
 									updatePaceList.setQuantity(quantity+totalUnloadNum);
+									updatePaceList.setOrderCode(entity.getOrderCode());
+									updatePaceList.setWarehouseId(entity.getWarehouseId());
 									updatePaceList.setOrderPackageStatus("20");
 									updatePaceList.setOrderPackageStockupStatus("10");
 									updatePaceList.setOrderPackageReservationStatus("10");
@@ -5374,6 +5373,153 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		return R.success("操作成功");
 	}
 
+	@Override
+	public R findRetentionCarsLoadPackage(String orderPackageCode, Long warehouseId, String warehouseName) {
+
+		//查询包件所在车次
+		List<RetentionCarsLoadVO> retentionList = trunklineCarsLoadScanService.findRetentionPackage(orderPackageCode,warehouseId);
+
+		return R.data(retentionList);
+	}
+
+	@Override
+	public R retentionCarsLoadPackage(List<Long> loadScanIds, Long warehouseId, String warehouseName) {
+
+		QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.in("id", loadScanIds)
+			.eq("scan_status","1");
+		List<TrunklineCarsLoadScanEntity> carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper);
+		if (CollUtil.isEmpty(carsLoadScanEntityList)) {
+			log.warn("##################removeCarsLoadScan: 没有滞留的数据 carsLoadScanIds={}", loadScanIds);
+			return R.fail(405, "没有滞留的数据");
+		}
+
+		//把carsLoadScanEntityList通过loadId分组
+		Map<Long, List<TrunklineCarsLoadScanEntity>> groupedByLoadId = carsLoadScanEntityList.stream()
+			.collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getLoadId));
+		Set<Long> loadIdSet = groupedByLoadId.keySet();
+
+		List<TrunklineCarsLoadEntity> trunklineCarsLoadEntities = baseMapper.selectBatchIds(loadIdSet);
+		//把trunklineCarsLoadEntities转化成以id为key的Map
+		Map<Long, TrunklineCarsLoadEntity> map = trunklineCarsLoadEntities.stream().collect(Collectors.toMap(TrunklineCarsLoadEntity::getId, Function.identity()));
+
+		List<DistributionParcelListEntity> updateParceListList = new ArrayList<>();
+		List<DistributionStockArticleEntity> updateStockArticleList = new ArrayList<>();
+		List<TrunklineCarsLoadScanEntity> updateScanList = new ArrayList<>();
+
+		groupedByLoadId.keySet().forEach(loadId -> {
+			List<TrunklineCarsLoadScanEntity> loadScanEntityList = groupedByLoadId.get(loadId);
+			if(CollUtil.isNotEmpty(loadScanEntityList)){
+				//把loadScanEntityList通过fromNodeId进行分组
+				Map<Long, List<TrunklineCarsLoadScanEntity>> groupedByFromWarehouseId = loadScanEntityList.stream().filter(carsLoadScanEntity-> !Objects.isNull(carsLoadScanEntity.getFromWarehouseId()))
+					.collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getFromWarehouseId));
+				groupedByFromWarehouseId.keySet().forEach(fromWarehouseId -> {
+					BasicdataWarehouseEntity fromWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(fromWarehouseId);
+					String fromWarehouseEntityName = fromWarehouseEntity.getName();
+
+					List<TrunklineCarsLoadScanEntity> loadScanEntityList1 = groupedByFromWarehouseId.get(fromWarehouseId);
+					if(CollUtil.isNotEmpty(loadScanEntityList1)){
+						//把trunklineCarsLoadScanEntities通过orderCode进行分组
+						Map<String, List<TrunklineCarsLoadScanEntity>> groupedByOrderCode = loadScanEntityList1.stream().filter(carsLoadScanEntity-> !Objects.isNull(carsLoadScanEntity.getOrderCode()))
+							.collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getOrderCode));
+						groupedByOrderCode.keySet().forEach(orderCode -> {
+							DistributionStockArticleEntity distributionStockArticle = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
+							List<TrunklineCarsLoadScanEntity> loadScanEntityList2 = groupedByOrderCode.get(orderCode);
+							if(CollUtil.isNotEmpty(loadScanEntityList2)){
+
+								TrunklineCarsLoadScanEntity carsLoadScanEntity = loadScanEntityList2.get(0);
+								Long loadId1 = carsLoadScanEntity.getLoadId();
+								String loadCode = carsLoadScanEntity.getLoadCode();
+
+								//把loadScanEntityList2的num进行累加
+								Integer num = loadScanEntityList2.stream().map(TrunklineCarsLoadScanEntity::getNum).reduce(0, Integer::sum);
+								//把loadScanEntityList2中所有元素的scanCode放入一个List
+								List<String> scanCodeList = loadScanEntityList2.stream().map(TrunklineCarsLoadScanEntity::getScanCode).collect(Collectors.toList());
+
+								FindParamterDTO findParamterDTO = new FindParamterDTO();
+								findParamterDTO.setOrderPackageCodeList(scanCodeList);
+								findParamterDTO.setWarehouseId(fromWarehouseId);
+								List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListClient.findListByOrderPackageCodeList(findParamterDTO);
+								parcelListEntityList.forEach(parcelListEntity -> {
+									DistributionParcelListEntity updateParceList = new DistributionParcelListEntity();
+									updateParceList.setId(parcelListEntity.getId());
+									updateParceList.setOrderPackageStatus("20");
+									updateParceList.setWarehouseId(parcelListEntity.getWarehouseId());
+									updateParceList.setOrderCode(parcelListEntity.getOrderCode());
+									updateParceListList.add(updateParceList);
+								});
+								loadScanEntityList2.forEach(trunklineCarsLoadScanEntity -> {
+									TrunklineCarsLoadScanEntity updateEntity = new TrunklineCarsLoadScanEntity();
+									updateEntity.setId(trunklineCarsLoadScanEntity.getId());
+									updateEntity.setScanStatus("4");
+									updateScanList.add(updateEntity);
+									String trayCode = trunklineCarsLoadScanEntity.getTrayCode();
+									String scanCode = trunklineCarsLoadScanEntity.getScanCode();
+									if (StringUtil.isNotBlank(trayCode)) {
+										updownTypeClient.downPackageOrDelTray(scanCode, warehouseId, "包件下架解托");
+									}
+								});
+
+
+								DistributionStockArticleEntity updateStockArticle = new DistributionStockArticleEntity();
+								updateStockArticle.setId(distributionStockArticle.getId());
+								updateStockArticle.setHandQuantity(distributionStockArticle.getHandQuantity()+num);
+								updateStockArticleList.add(updateStockArticle);
+
+								TrunklineCarsLoadEntity carsLoadEntity = map.get(loadId1);
+								if(!Objects.isNull(carsLoadEntity)){
+									String loadType = carsLoadEntity.getLoadType();
+									if(!StringUtils.equals(loadType, "4")){
+										String content = "包件在 " + warehouseName + "滞留 ,车次号:"+loadCode+",配载计划目的仓 " + fromWarehouseEntityName;
+										packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), scanCodeList, warehouseId, warehouseName, WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content);
+									}
+								}else{
+									String content = "包件在 " + warehouseName + "滞留 ,车次号:"+loadCode+",配载计划目的仓 " + fromWarehouseEntityName;
+									packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), scanCodeList, warehouseId, warehouseName, WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content);
+								}
+							}
+						});
+					}
+				});
+			}
+		});
+		//更新装车明细
+		if (CollUtil.isNotEmpty(updateScanList)){
+			trunklineCarsLoadScanService.updateBatchById(updateScanList);
+		}
+		if(CollUtil.isNotEmpty(updateStockArticleList)){
+			distributionStockArticleClient.updateByBatchId(updateStockArticleList);
+		}
+		if(CollUtil.isNotEmpty(updateParceListList)){
+			distributionParcelListClient.updateList(updateParceListList);
+		}
+		if(CollUtil.isNotEmpty(loadIdSet)){
+			loadIdSet.forEach(loadId -> {
+				updateNumByLoadId(loadId);
+			});
+		}
+
+		//把carsLoadScanEntityList通过finalNodeId分组
+		Map<Long, List<TrunklineCarsLoadScanEntity>> groupedByFinalNodeId = carsLoadScanEntityList.stream().filter(carsLoadScanEntity-> !Objects.isNull(carsLoadScanEntity.getFinalNodeId()))
+			.collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getFinalNodeId));
+
+		groupedByFinalNodeId.keySet().forEach(finalNodeId -> {
+			List<TrunklineCarsLoadScanEntity> trunklineCarsLoadScanEntities = groupedByFinalNodeId.get(finalNodeId);
+			if(CollUtil.isNotEmpty(trunklineCarsLoadScanEntities)){
+				//把trunklineCarsLoadScanEntities中所有元素的scanCode放入一个List
+				List<String> scanCodeList = trunklineCarsLoadScanEntities.stream().map(TrunklineCarsLoadScanEntity::getScanCode).collect(Collectors.toList());
+				DealWithAbnormalVO dealWithAbnormalVO = new DealWithAbnormalVO();
+				dealWithAbnormalVO.setOrderPackageCodes(scanCodeList);
+				dealWithAbnormalVO.setWarehouseName(warehouseName);
+				dealWithAbnormalVO.setNickName(AuthUtil.getNickName());
+				dealWithAbnormalVO.setRemark("滞留同步系统自动处理（"+warehouseName+" "+" "+AuthUtil.getNickName()+"）");
+				abnormalRecordClient.dealwithOrderPackageCodes(dealWithAbnormalVO);
+			}
+		});
+
+		return R.success("滞留成功");
+	}
+
 	private void updateParcelListToWarehouse(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId, String status) {
 		String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
 		String orderCode = advanceDetailEntity.getOrderCode();
@@ -5396,6 +5542,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					DistributionParcelListEntity updateEntity = new DistributionParcelListEntity();
 					updateEntity.setId(distributionParcelListEntity.getId());
 					updateEntity.setOrderPackageStatus("60");
+					updateEntity.setOrderCode(distributionParcelListEntity.getOrderCode());
+					updateEntity.setWarehouseId(distributionParcelListEntity.getWarehouseId());
 					updateParceList.add(updateEntity);
 				});
 			}
@@ -9893,7 +10041,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			}
 
 			List<TrunklineCarsLoadScanEntity> saveScanList = new ArrayList<>();
+			List<DistributionParcelListEntity> updateList = new ArrayList<>();
 			parcelListEntityList.forEach(parcelListEntity -> {
+
 				String orderPackageCode = parcelListEntity.getOrderPackageCode();
 				Long waybillId = parcelListEntity.getWaybillId();
 				String waybillNo = parcelListEntity.getWaybillNumber();
@@ -9939,9 +10089,23 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				carsLoadScanEntity.setMaterialName(parcelListEntity.getMaterialName());
 				carsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
 				saveScanList.add(carsLoadScanEntity);
+
+
+				DistributionParcelListEntity updetaEntity = new DistributionParcelListEntity();
+				updetaEntity.setId(parcelListEntity.getId());
+				updetaEntity.setWarehouseId(parcelListEntity.getWarehouseId());
+				updetaEntity.setOrderCode(parcelListEntity.getOrderCode());
+				updetaEntity.setOrderPackageStatus("60");
+				updateList.add(updetaEntity);
 			});
 
-			trunklineCarsLoadScanService.saveBatch(saveScanList);
+			if(CollUtil.isNotEmpty(saveScanList)){
+				trunklineCarsLoadScanService.saveBatch(saveScanList);
+			}
+			if(CollUtil.isNotEmpty(updateList)){
+				distributionParcelListClient.updateList(updateList);
+			}
+
 
 			updateNumByLoadId(loadId);
 
@@ -10153,6 +10317,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 											DistributionParcelListEntity updateParceList = new DistributionParcelListEntity();
 											updateParceList.setId(parcelListEntity.getId());
 											updateParceList.setOrderPackageStatus("20");
+											updateParceList.setOrderCode(parcelListEntity.getOrderCode());
+											updateParceList.setWarehouseId(parcelListEntity.getWarehouseId());
 											updateParceListList.add(updateParceList);
 										});
 										loadScanEntityList2.forEach(trunklineCarsLoadScanEntity -> {
@@ -10533,6 +10699,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						parcelList.setIsTransfer(1);
 					}
 				}
+				parcelList.setOrderCode(parcelListEntity.getOrderCode());
+				parcelList.setWarehouseId(parcelListEntity.getWarehouseId());
 				updateParcelListList.add(parcelList);
 			});
 		});
@@ -10646,6 +10814,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				log.warn("##############unloadPackage: 系统无编码 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
 				return R.fail(4005, "系统无编码");
 			}
+			String scanStatus = scanEntity.getScanStatus();
+			if (scanStatus.equals("4")) {
+				log.warn("##############unloadPackage: 包件已滞留 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+				return R.fail(4005, "包件已滞留");
+			}
+
 			log.warn("##############unloadPackage: 包件已卸车 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
 			return R.fail(405, "包件已卸车");
 		}
@@ -12239,6 +12413,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						DistributionParcelListEntity updateEntity = new DistributionParcelListEntity();
 						updateEntity.setId(distributionParcelListEntity.getId());
 						updateEntity.setOrderPackageStatus("60");
+						updateEntity.setOrderCode(distributionParcelListEntity.getOrderCode());
+						updateEntity.setWarehouseId(distributionParcelListEntity.getWarehouseId());
 						updateParceList.add(updateEntity);
 					});
 				}
@@ -12272,6 +12448,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			dealWithAbnormalVO.setCarsNo(carsLoadEntity.getCarsNo());
 			dealWithAbnormalVO.setWarehouseName(warehouseName);
 			dealWithAbnormalVO.setNickName(AuthUtil.getNickName());
+			dealWithAbnormalVO.setRemark("数据同步系统自动处理（"+warehouseName+" "+carsLoadEntity.getCarsNo()+" "+AuthUtil.getNickName()+"）");
 			abnormalRecordClient.dealwithOrderPackageCodes(dealWithAbnormalVO);
 		}