From 52aaccfe82a5dbcb5222590bcd92fc6d704c2ffd Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 4 Jun 2024 08:24:22 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BA=BF=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionSignforAppController.java | 4 ++- .../DistributionDeliveryInfoServiceImpl.java | 2 +- .../impl/WarehouseUpdownTypeServiceImpl.java | 34 ++++++++++--------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index 2f0d05872..7a7713732 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -251,7 +251,9 @@ public class DistributionSignforAppController { } } BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - updownTypeClient.downPackageOrDelTray(orderPackageCodes, myCurrentWarehouse.getId(), "司机一键签收下架解托"); + if(orderPackageCodes!=null){ + updownTypeClient.downPackageOrDelTray(orderPackageCodes, myCurrentWarehouse.getId(), "司机一键签收下架解托"); + } } catch (Exception e) { log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}", packageCodes); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java index 110915a3c..7a799b6e2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java @@ -554,7 +554,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl selectDistributionAppDeliveryInventory(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) { List inventoryList = distributionReservationMapper.selectInventoryListByReservation(Long.parseLong(distributionAppDeliveryListDTO.getReservationId())); if (Func.isEmpty(inventoryList)) { - log.error("##########查询该客户库存品信息为null"); + log.warn("##########查询该客户库存品信息为null"); return null; } List stockListIds = inventoryList.stream().map(DisStockListDetailEntity::getStockListId).distinct().collect(Collectors.toList()); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 2a7ad99ea..b173c43cb 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -886,9 +886,9 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl parcelListList = distributionParcelListClient.findALLNoUpShelfPackageByOrderCodeList(findParamterDTO); - if(parcelListList.isEmpty()){ + if (parcelListList.isEmpty()) { log.warn("############upShelfOrder: 没有可上架的包件"); - return R.fail(405,"没有可上架的包件"); + return R.fail(405, "没有可上架的包件"); } List upShelfPackageList = new ArrayList<>(); @@ -974,10 +974,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl trayGoodsQueryWrapper = new QueryWrapper<>(); trayGoodsQueryWrapper.in("association_value", orderPackageCodeList); List trayGoodsEntityList = warehouseTrayGoodsService.list(trayGoodsQueryWrapper); - if(!trayGoodsEntityList.isEmpty()){ + if (!trayGoodsEntityList.isEmpty()) { //把trayGoodsEntityList中的association_value提取出来存入一个List List orderPackageCodes = trayGoodsEntityList.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).collect(Collectors.toList()); - warehouseTrayTypeService.downPackageByOrderPackageCodeList(orderPackageCodes,"同步处理:包件解托",warehouseId); + warehouseTrayTypeService.downPackageByOrderPackageCodeList(orderPackageCodes, "同步处理:包件解托", warehouseId); } FindParamterDTO findParamterDTO = new FindParamterDTO(); @@ -1474,7 +1474,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl updownGoodsEntities1 = map.get(allocationId); List orderPackageCodes = updownGoodsEntities1.stream().map(WarehouseUpdownGoodsEntity::getAssociationValue).collect(Collectors.toList()); - if(!Objects.isNull(taryAllocationEntity)){ + if (!Objects.isNull(taryAllocationEntity)) { warehouseTrayTypeService.downPackageByOrderPackageCodeList(orderPackageCodes, remark, warehouseId); } WarehouseUpdownTypeEntity updownTypeEntity = updownTypeMap.get(allocationId); @@ -1494,14 +1494,14 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl parcelListEntities = new ArrayList<>(); orderPackageCodes.forEach(orderPackageCode -> { DistributionParcelListEntity parcelListEntity = parcelListEntityMap.get(orderPackageCode); - if(!Objects.isNull(parcelListEntity)){ + if (!Objects.isNull(parcelListEntity)) { parcelListEntities.add(parcelListEntity); } }); @@ -1540,8 +1540,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl t.getOrderPackageCode().equals(orderPackageCode)) .findFirst() .orElse(null); - if(parcelListEntity==null){ - log.info(">>>>>>>>>>>>>> 包条找不到 {} ",orderPackageCode); + if (parcelListEntity == null) { + log.info(">>>>>>>>>>>>>> 包条找不到 {} ", orderPackageCode); continue; } @@ -1780,7 +1784,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl orders = new ArrayList<>(orderSet); - if(orders.isEmpty()){ + if (orders.isEmpty()) { return Resp.scanSuccess("下架成功", "成功下架" + num + "件"); } @@ -1794,7 +1798,6 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl upShelfPackageList, Long warehouseId, String remark) { StringBuffer stringBuffer = new StringBuffer("下架零担订单成功"); @@ -3092,7 +3095,6 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl