From 0e5c14c1396f4201db0c1ace3e68879b69a8399c Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 13 Nov 2024 18:13:28 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/vo/WarehouseWaybillVO.java | 2 + .../service/impl/OpenOrderServiceImpl.java | 82 +++++++++++++------ .../impl/TrunklineCarsLoadServiceImpl.java | 18 +++- .../mapper/WarehouseWaybillMapper.xml | 6 +- 4 files changed, 80 insertions(+), 28 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java index b3d459934..a41ab71fd 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java @@ -54,4 +54,6 @@ public class WarehouseWaybillVO extends WarehouseWaybillEntity { private BigDecimal totalFee; private String chargeTypes; + private Integer zeroEditStatus; + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 1d20f91d3..08111ac78 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -2628,6 +2628,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { return R.fail(405, "运单信息不存在"); } + String waybillNo = waybillEntity.getWaybillNo(); + if (isEdit.equals(1)) { Integer abolishStatus = waybillEntity.getAbolishStatus(); if (abolishStatus.equals(1)) { @@ -2645,7 +2647,37 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Map map = new HashMap<>(); + + Integer zeroEditStatus = 1; + + Integer waybillType = waybillEntity.getWaybillType(); + Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); + Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); + if (waybillType.equals(2)) { + //零担改单限制 + + Integer totalCount = waybillEntity.getTotalCount(); + DistributionStockArticleEntity endStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, destinationWarehouseId); + if (Objects.isNull(endStockArticleEntity)) { + DistributionStockArticleEntity startStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, departureWarehouseId); + if (Objects.isNull(startStockArticleEntity)) { + zeroEditStatus = 1; + } + Integer handQuantity = startStockArticleEntity.getHandQuantity(); + if (!NumberUtil.equals(handQuantity, totalCount)) { + zeroEditStatus = 0; + } + }else{ + Integer incomingQuantity = endStockArticleEntity.getIncomingNum(); + if(!NumberUtil.equals(incomingQuantity,totalCount)){ + zeroEditStatus = 0; + } + } + } + warehouseWaybillVO.setZeroEditStatus(zeroEditStatus); + map.put("warehouseWaybill", warehouseWaybillVO); + map.put("zeroEditStatus", zeroEditStatus); map.put("payTypeList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_TYPE)); map.put("payWayList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_WAY)); map.put("deliveryWayList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_DELIVERY_WAY)); @@ -2687,33 +2719,35 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } Integer waybillType = waybillEntity.getWaybillType(); - if (waybillType.equals(2)) { - //零担改单限制 - Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); - Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); - Integer totalCount = waybillEntity.getTotalCount(); - DistributionStockArticleEntity endStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, destinationWarehouseId); - if (Objects.isNull(endStockArticleEntity)) { - DistributionStockArticleEntity startStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, departureWarehouseId); - if (Objects.isNull(startStockArticleEntity)) { - log.warn("#############updateWaybill: 订单信息不存在！ waybillId={}", waybillId); - return R.fail(405, "订单信息不存在！"); - } - Integer handQuantity = startStockArticleEntity.getHandQuantity(); - if (!NumberUtil.equals(handQuantity, totalCount)) { - log.warn("#############updateWaybill: 始发仓数据已发运 waybillId={}", waybillId); - return R.fail(405, "始发仓数据已发运"); - } - }else{ - Integer incomingQuantity = endStockArticleEntity.getIncomingNum(); - if(!NumberUtil.equals(incomingQuantity,totalCount)){ - log.warn("#############updateWaybill: 目的仓数据还未完全到达 waybillId={}", waybillId); - return R.fail(405, "目的仓数据还未完全到达"); + Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); + Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); + if(warehouseId.equals(departureWarehouseId) || warehouseId.equals(destinationWarehouseId)){ + if (waybillType.equals(2)) { + //零担改单限制 + + Integer totalCount = waybillEntity.getTotalCount(); + DistributionStockArticleEntity endStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, destinationWarehouseId); + if (Objects.isNull(endStockArticleEntity)) { + DistributionStockArticleEntity startStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, departureWarehouseId); + if (Objects.isNull(startStockArticleEntity)) { + log.warn("#############updateWaybill: 订单信息不存在！ waybillId={}", waybillId); + return R.fail(405, "订单信息不存在！"); + } + Integer handQuantity = startStockArticleEntity.getHandQuantity(); + if (!NumberUtil.equals(handQuantity, totalCount)) { + log.warn("#############updateWaybill: 始发仓数据已发运 waybillId={}", waybillId); + return R.fail(405, "始发仓数据已发运"); + } + }else{ + Integer incomingQuantity = endStockArticleEntity.getIncomingNum(); + if(!NumberUtil.equals(incomingQuantity,totalCount)){ + log.warn("#############updateWaybill: 目的仓数据还未完全到达 waybillId={}", waybillId); + return R.fail(405, "目的仓数据还未完全到达"); + } } } } - // //验证运单是否有配送任务 // //查询运单下所有订单号 // List orderCodes = distributionParcelListClient.findOrderCodeByWaybillId(waybillId); @@ -2747,8 +2781,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String consigneeName = waybillEntity.getConsigneeName(); String consigneeAddress = waybillEntity.getConsigneeAddress(); String consigneeMobile = waybillEntity.getConsigneeMobile(); - Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); - Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); String departureWarehouseName = waybillEntity.getDepartureWarehouseName(); String destinationWarehouseName = waybillEntity.getDestinationWarehouseName(); Integer totalCount = waybillEntity.getTotalCount(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 5bababb47..720defaa9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -1668,7 +1668,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl !Objects.isNull(scan.getWarehouseId()) && NumberUtil.equals(nodeId,scan.getWarehouseId()) && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getNum).sum(); - Integer carsOrderRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && !Objects.isNull(scan.getUnloadNodeId()) && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum(); + Integer carsOrderRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum(); Integer carsOrderRealSignNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && scan.getScanStatus().equals("3") && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum(); carsOrderEntity.setRealNum(carsOrderRealLoadingNum); carsOrderEntity.setUnloadNum(carsOrderRealUnloadingNum); @@ -4933,7 +4933,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl { List trunklineCarsLoadScanVOS = noWaybillNoTrunklineCarsLoadScanMapByOrderCode.get(orderCode); //把trunklineCarsLoadScanVOS中所有元素的num加起来，如果num为空则用0代替 - Integer loadingNum = trunklineCarsLoadScanVOS.stream().map(TrunklineCarsLoadScanVO::getNum).reduce(0, Integer::sum); + Integer loadingNum = trunklineCarsLoadScanVOS.stream().filter(t-> Objects.isNull(t.getWarehouseId())).map(TrunklineCarsLoadScanVO::getNum).reduce(0, Integer::sum); Integer unloadNum = trunklineCarsLoadScanVOS.stream().map(TrunklineCarsLoadScanVO::getUnloadNum).reduce(0, Integer::sum); Integer signNum = trunklineCarsLoadScanVOS.stream().filter(t-> t.getScanStatus().equals("3")).map(TrunklineCarsLoadScanVO::getUnloadNum).reduce(0, Integer::sum); @@ -7542,6 +7542,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl #{item}