diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionDeliveryAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionDeliveryAppController.java index 5a9491cdd..ac791c42b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionDeliveryAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionDeliveryAppController.java @@ -309,6 +309,17 @@ public class DistributionDeliveryAppController { return msg; } + + /** + * 配送管理 发车 + */ + @PostMapping("/isStart") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "发车", notes = "传入DistrilbutionloadingscanDTO") + public R isStart(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { + return distributionDeliveryListService.isStart(distrilbutionloadingscanDTO); + } + /** * 配送管理 发车 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index cf1dccc69..87c1ec364 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -568,6 +568,14 @@ public interface IDistributionDeliveryListService extends BaseService distributionParcelListEntities = baseMapper.selectPackageListByDeliveryListId(distributionDeliveryList.getId()); + List abnormalEntityList = new ArrayList<>(); + if (!distributionParcelListEntities.isEmpty()) { + for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) { + if (OrderPackageLoadingStatusConstant.weizhuancghe.getValue().equals(distributionParcelListEntity.getOrderPackageLoadingStatus())) { + DistributionLoadscanAbnormalEntity packageLoadscanAbnormalEntity = createdPakcageAbnormal(distributionDeliveryList, distributionParcelListEntity, warehouseEntity); + abnormalEntityList.add(packageLoadscanAbnormalEntity); + } + } + } + List disStockListDetailEntities = baseMapper.selectInventoryListByDeliveryListId(distributionDeliveryList.getId()); + if (!disStockListDetailEntities.isEmpty()) { + for (DisStockListDetailEntity disStockListDetailEntity : disStockListDetailEntities) { + if (InventoryLoadingStatusConstant.weizhuangche.getValue().equals(disStockListDetailEntity.getStockLockingStatus())) { + DistributionLoadscanAbnormalEntity inventoryLoadscanAbnormalEntity = createdInventoryPakcageAbnormal(distributionDeliveryList, disStockListDetailEntity, warehouseEntity); + abnormalEntityList.add(inventoryLoadscanAbnormalEntity); + } + } + } + //零担 + List zeroLoadscanAbnormalList = baseMapper.selectZeroListByDeliveryId(distributionDeliveryList.getId()); + if (!zeroLoadscanAbnormalList.isEmpty()) { + abnormalEntityList.addAll(zeroLoadscanAbnormalList); + } + if (!abnormalEntityList.isEmpty()) { + return false; + } + return true; + } private DistributionLoadscanAbnormalEntity createdPakcageAbnormal(DistributionDeliveryListEntity distributionDeliveryList, DistributionParcelListEntity distributionParcelListEntity, BasicdataWarehouseEntity warehouseEntity) { DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity = new DistributionLoadscanAbnormalEntity(); @@ -9570,6 +9600,35 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl