From e6d4ca1a2415c9ecf11cf6e74ad490e70fa2795e Mon Sep 17 00:00:00 2001 From: kilo Date: Thu, 2 Nov 2023 22:10:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=85=8D=E9=80=81=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionAddvalueServiceImpl.java | 2 +- .../DistributionDeliveryListServiceImpl.java | 24 ++++++++++--------- .../DistributionReservationServiceImpl.java | 6 +++++ .../impl/DistributionSignforServiceImpl.java | 15 ++++++++++++ 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java index c94cbc85f..515cd470b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java @@ -345,8 +345,8 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImplquery().lambda() .eq(DistributionAddvalueDetailEntity::getAddvalueId, distributionAddvalueEntity.getId())); distributionAddvaluePackageMapper.deleteAddvaluePackageList(distributionAppAddvalueDTO.getReservationId(), addvalueDetailEntity.getId()); - distributionAddvalueDetailMapper.deleteAddvalueDetail(distributionAddvalueEntity.getId()); distributionAddvalueMapper.deleteAddvalue(distributionAppAddvalueDTO.getReservationId(), distributionAppAddvalueDTO.getAddvalueType()); + distributionAddvalueDetailMapper.deleteAddvalueDetail(distributionAddvalueEntity.getId()); return Resp.scanSuccess("操作成功","操作成功"); } switch (distributionAppAddvalueDTO.getAddvalueType()) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 7b823d5c4..21a66eb65 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -50,6 +50,7 @@ import com.logpm.warehouse.vo.TrayTypeDataVO; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.apache.commons.lang.StringUtils; +import org.apache.ibatis.scripting.xmltags.ForEachSqlNode; import org.jetbrains.annotations.NotNull; import org.springblade.common.constant.DistributionTypeConstant; import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant; @@ -1268,6 +1269,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl { + List parcelListEntities = distributionReservationMapper.selectPackageByReservationAndStockArticle(distrilbutionloadingscanDTO.getReservationId(), ord.getStockArticleId()); for (DistributionParcelListEntity parcelListEntity : parcelListEntities) { DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity(); @@ -1313,15 +1315,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionStockListEntity::getId, loadscaninvnEntity.getInventoryId())); stockListEntity.setQuantityStock(stockListEntity.getQuantityStock() - loadscaninvnEntity.getPackageNub()); stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() - loadscaninvnEntity.getPackageNub()); @@ -1520,7 +1522,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl loadscanEntityList = new ArrayList<>(); List trayList = new ArrayList<>(); for (DistributionReservationStockarticleEntity reservationStockarticleEntity : reservationStockarticleEntityList) { - if (reservationStockarticleEntity.equals(IsOrNoConstant.no.getValue())){ + if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())){ //查询订制品备货数量 List packageListStockUpScan = distributionStockMapper.selectList(Wrappers.query().lambda() .eq(DistributionStockEntity::getType, 1) @@ -2475,7 +2477,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl zeroPackageListStockUpScan = distributionStockMapper.selectList(Wrappers.query().lambda() .eq(DistributionStockEntity::getType, 2) @@ -2507,9 +2509,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Func.isNotEmpty(i.getStockPackageCode()) && i.getStockLockingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue())).count(); - + Integer packageListScanNum = loadscanEntityList.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum(); + Long inventoryListScanNum = stockListDetailEntityList.stream().filter(i -> Func.isNotEmpty(i.getStockPackageCode()) && i.getStockLockingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue())).count(); + distributionAppReservationVO.setLoadingNub(packageListScanNum + inventoryListScanNum.intValue()); if (packageListScanNum + inventoryListScanNum ==distributionAppReservationVO.getReservationNum() ) { distributionAppReservationVO.setIsload("是"); } else { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 10953e25f..56c60b3fc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -2709,6 +2709,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl { + if (Func.isNotEmpty(s.getAllocation())){ + s.setAllocation(null); + } DistributionStockArticleDTO stockArticleDTO = Func.copy(s, DistributionStockArticleDTO.class); if (s.getIsZero().equals("0")) { WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(s.getWaybillNumber()); @@ -2786,6 +2789,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl customList = baseMapper.selectAppcustomListPage(page, distributionDeliveryList.getId()); for (DistributionAppSignforVO distributionAppReservationVO : customList) { + //查询装车数量 + List packageScanList = distributionLoadscanService.list(Wrappers.query().lambda() + .eq(DistributionLoadscanEntity::getReservationId, distributionAppReservationVO.getId()) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); + AtomicInteger loadingNum = new AtomicInteger(); + List inventoryScanList = distributionLoadscaninvnService.list(Wrappers.query().lambda() + .eq(DistributionLoadscaninvnEntity::getReservationId, distributionAppReservationVO.getId()) + .ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); + if (Func.isNotEmpty(packageScanList)){ + loadingNum.getAndAdd(packageScanList.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum()); + } + if (Func.isNotEmpty(inventoryScanList)){ + loadingNum.getAndAdd(inventoryScanList.stream().mapToInt(DistributionLoadscaninvnEntity::getLoadedNub).sum()); + } + distributionAppReservationVO.setLoadedNumber(loadingNum.get()); //查询配送状态 distributionAppReservationVO.setDeliveryStatus("配送中"); if (distributionAppReservationVO.getDriverSigning().equals("2") || distributionAppReservationVO.getSigningStatus().equals("2")) { From 6f6d50e071889099e3d916094db6dec3af33a64b Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Fri, 3 Nov 2023 13:57:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=AC=A7=E6=B4=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81=E7=9A=84=E4=BB=93=E5=BA=93?= =?UTF-8?q?ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OuPaiFactoryServiceImpl.java | 2 +- .../logpm/factory/receiver/OrderStatusHandler.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index 8e52214a9..1d3315235 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -363,7 +363,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { } JSONObject detailObject = new JSONObject(); - detailObject.put("WarehouseOid", receivingOrderEntity.getEndWarehouseOid()); + detailObject.put("WarehouseOid", receivingOrderEntity.getCurrentWarehouseOid()); detailObject.put("WarehouseBelong", "oppein"); detailObject.put("Creator", orderStatusDTO.getUsername()); detailObject.put("PackageCode", unitNo); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java index 46233ed0e..9c91623a2 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java @@ -97,13 +97,13 @@ public class OrderStatusHandler { break; case FactoryConstant.OUPAI: -// r = ouPaiFactoryService.handleStatusData(orderStatusDTO); -// if (r.getCode() == 400 || r.getCode() == 200) { -// log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.OUPAI, orderSelfNum); -//// channel.basicAck(deliveryTag,true); -// } else { -// throw new CustomerException(r.getCode(), r.getMsg()); -// } + r = ouPaiFactoryService.handleStatusData(orderStatusDTO); + if (r.getCode() == 400 || r.getCode() == 200) { + log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.OUPAI, orderSelfNum); +// channel.basicAck(deliveryTag,true); + } else { + throw new CustomerException(r.getCode(), r.getMsg()); + } default: From 2828968be5dbb81ff143a7f032104c116c437b86 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Fri, 3 Nov 2023 14:06:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=AC=A7=E6=B4=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81=E7=9A=84=E4=BB=93=E5=BA=93?= =?UTF-8?q?ID1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oupai/service/impl/OuPaiFactoryServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index 1d3315235..968d450f2 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -362,6 +362,16 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { return Resp.fail(400, "未查询到该单据推送收货单信息"); } + if(StringUtil.isBlank(receivingOrderEntity.getCurrentWarehouseOid())){ + log.info(" 该订单为没有收货仓 不进行推送 >>> getCurrentWarehouseOid={} ", receivingOrderEntity.getCurrentWarehouseOid()); + return Resp.fail(400, "收货仓信息不能为null"); + } + if(!receivingOrderEntity.getCurrentWarehouseName().contains("仓")){ + log.info(" 该订单为没有收货仓信息不正确 getCurrentWarehouseName={} ", receivingOrderEntity.getCurrentWarehouseName()); + return Resp.fail(400, "该订单为没有收货仓信息不正确"); + } + + JSONObject detailObject = new JSONObject(); detailObject.put("WarehouseOid", receivingOrderEntity.getCurrentWarehouseOid()); detailObject.put("WarehouseBelong", "oppein");