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

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

@@ -7086,7 +7086,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				distributionStockArticleClient.submitHandleNumByOrderId(1, articleId);
 				distributionParcelListClient.updateOrderPackageCodeById(pacakageId, "60");
 
-				DownPackageTrayVO downPackageTrayVO = buildDownPackageTrayVO(orderPackageCode, wid, "中转卸车下架解托");
+				DownPackageTrayVO downPackageTrayVO = buildDownPackageTrayVO(orderPackageCode, wid, "三方中转卸车下架解托");
 				if(downPackageTrayVO!=null){
 					updownTypeClient.downPackageOrDelTray(downPackageTrayVO);
 				}
@@ -7301,7 +7301,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 
 		//处理托盘的入库和货物的入库
-		trayTypeClient.changeTrayWarehouseInfo(trayCode, warehouseId);
+		trayTypeClient.trayToNull(trayCode,"三方中转托盘卸车");
 
 		JSONObject jsonObject = trunklineCarsLoadScanService.findUnloadNumAudio(loadId, warehouseId);
 		Integer totalUnloadNum = jsonObject.getInteger("totalUnloadNum");
@@ -8492,6 +8492,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				//更新包件状态
 				distributionParcelListClient.updateOrderPackageCodeById(parcelListEntity.getId(), "70");
 
+				DownPackageTrayVO downPackageTrayVO = new DownPackageTrayVO();
+				downPackageTrayVO.setOrderPackageCodes(orderPackageCode);
+				downPackageTrayVO.setWarehouseId(parcelListEntity.getWarehouseId());
+				downPackageTrayVO.setRemark("直发商家异常签收下架解托");
+				updownTypeClient.downPackageOrDelTray(downPackageTrayVO);
+
 				//无装车记录异常日志记录
 				try {
 					carsLoadAsyncService.abnormalListUnloadByLoadIdAndWarehouseId(loadId, warehouseId, warehouseEntity.getName(), loadScanId, AuthUtil.getTenantId(), AuthUtil.getUserId(), AuthUtil.getNickName(), Func.firstLong(AuthUtil.getDeptId()));
@@ -8566,6 +8572,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			//生成签收记录
 			trunklineCarsSignLogService.addEntity(carsLoadScanEntity, remark);
+
+
+			DownPackageTrayVO downPackageTrayVO = new DownPackageTrayVO();
+			downPackageTrayVO.setOrderPackageCodes(orderPackageCode);
+			downPackageTrayVO.setWarehouseId(parcelListEntity.getWarehouseId());
+			downPackageTrayVO.setRemark("直发商家签收下架解托");
+			updownTypeClient.downPackageOrDelTray(downPackageTrayVO);
+
 		}
 
 		//重新计算数量
@@ -8927,6 +8941,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				scanZeroDetailService.updateBatchById(updateZerpPackageList);
 			}
 
+			orderPackageCodes.forEach(orderPackageCode -> {
+				DownPackageTrayVO downPackageTrayVO = new DownPackageTrayVO();
+				downPackageTrayVO.setOrderPackageCodes(orderPackageCode);
+				downPackageTrayVO.setWarehouseId(warehouseId);
+				downPackageTrayVO.setRemark("PC批量签收下架解托");
+				updownTypeClient.downPackageOrDelTray(downPackageTrayVO);
+			});
+
+
 			//生成签收记录
 			trunklineCarsSignLogService.addList(updateCarsLoadScanList, "PC批量签收");