一键签收超时调整

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -2084,7 +2084,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //				}
 			} else {
 				log.error("################库存品未进行备货操作+{}" + detailEntities);
-				return R.fail("一键装车失败!!!库存品都备货了!?");
+				return R.fail("库存品未进行备货操作");
 			}
 		}
 		//查询出该签收任务下的客户对应的所有包件和库存品信息
@@ -2297,9 +2297,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					//更新签收人
 					Integer m = distributionSignforMapper.updateSignUser(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), AuthUtil.getUser());
 
-					distributionAsyncService.checkStockArticleSignStatus(parcelListEntity);
-					log.info("一件签收包件下架解托>>>>>>>>>>>>>>>parcelListEntity.getOrderPackageCode():{}", parcelListEntity.getOrderPackageCode());
-					warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
+//					distributionAsyncService.checkStockArticleSignStatus(parcelListEntity);
+//					log.info("一件签收包件下架解托>>>>>>>>>>>>>>>parcelListEntity.getOrderPackageCode():{}", parcelListEntity.getOrderPackageCode());
+//					warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
 				} else {
 					//存在装车数据
 					if (distributionSignfor.getIsClerk()) {
@@ -2326,11 +2326,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionAsyncService.checkSignStatus(loadscanEntities.getPackageId(), loadscanEntities.getReservationId(), loadscanEntities.getDeliveryId());
 					}
 				}
-
 				packageIds.add(parcelListEntity.getId());
 			}
 			if (Func.isNotEmpty(packageIds)){
-
 				distributionAsyncService.handlPakcage(packageIds,myCurrentWarehouse.getId());
 			}
 		}