异常签收下架解托

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

@@ -1699,6 +1699,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 //		distrilbutionloadingscanDTO.setDeliveryId(Long.parseLong("1715287814326857729"));
 //		distrilbutionloadingscanDTO.setReservationId(Long.parseLong("1715287814523990017"));
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			return R.fail(403,"未授权!!!");
+		}
 		List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()));
 		if (Func.isNotEmpty(parcelListEntityList) && parcelListEntityList.size() == 1) {
 			DistributionParcelListEntity parcelListEntity = parcelListEntityList.get(0);
@@ -1792,6 +1796,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						//进行签收数量的修改
 						Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 						//修改签收数量
+						//包件下架解托
+						warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
+
 //				Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 						if (Func.isEmpty(loadscanEntity)) {
 							//更新装车包件数和签收包件数
@@ -1857,6 +1864,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setIsAbnormalLoading(2);
 						distributionLoadscanEntity.setIsAbnormalSigning(2);
 						distributionLoadscanEntity.setAbnormalNote("异常签收");
+						warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
 						if (Func.isEmpty(loadscanEntity)){
 							distributionLoadscanService.save(distributionLoadscanEntity);
                         }else {