From 7326407d1340e830d9ccad0b20413b2d14fe14dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 15 Jul 2026 14:36:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockOutOrderDomainService.java | 77 ++++++++++++++----- 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 11ca0b915..c91f84814 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -74,6 +74,11 @@ import com.mhd.wms.domain.pickingOrder.service.PickingOrderDomainService; import com.mhd.wms.domain.pushSyncBms.PushSyncBmsDomainService; import com.mhd.wms.domain.replenishmentNotice.repository.todo.ReplenishmentNoticeDO; import com.mhd.wms.domain.replenishmentNotice.service.ReplenishmentNoticeDomainService; +import com.mhd.wms.domain.reviewOrder.entity.ReviewMaterialDetail; +import com.mhd.wms.domain.reviewOrder.entity.ReviewOrder; +import com.mhd.wms.domain.reviewOrder.repository.mapper.ReviewMaterialDetailMapper; +import com.mhd.wms.domain.reviewOrder.repository.mapper.ReviewOrderMapper; +import com.mhd.wms.domain.reviewOrder.repository.po.ReviewMaterialDetailPO; import com.mhd.wms.domain.reviewOrder.repository.todo.ReviewOrderDO; import com.mhd.wms.domain.statementStatistics.po.ImmediateInventoryPO; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; @@ -165,6 +170,12 @@ public class StockOutOrderDomainService { private PickingOrderApplicationService pickingOrderApplicationService; @Autowired private HandoverTaskOrderApplicationService handoverTaskOrderApplicationService; + @Autowired + private ReviewOrderApplicationService reviewOrderApplicationService; + @Autowired + private ReviewOrderMapper reviewOrderMapper; + @Autowired + private ReviewMaterialDetailMapper reviewMaterialDetailMapper; /** * 分页查询出库单列表 @@ -969,26 +980,56 @@ public class StockOutOrderDomainService { //复核 - ReviewOrderDO reviewOrderDO = new ReviewOrderDO(); - List materialDetailList = stockOutOrderDO.getMaterialDetailList(); - if (materialDetailList != null && materialDetailList.size() > 0) { - for (OutMaterialDetailDO outMaterialDetailDO : materialDetailList) { - Long uniqueId = outMaterialDetailDO.getUniqueId(); - PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new QueryWrapper().lambda() - .eq(PickingMaterialDetail::getOutUniqueId, uniqueId) - .eq(PickingMaterialDetail::getDelFlag, 1), false); - if (pickingMaterialDetail != null) { - outMaterialDetailDO.setActualQuantity(pickingMaterialDetail.getPickingQuantity()); - outMaterialDetailDO.setCheckArea(pickingMaterialDetail.getTotalArea()); - outMaterialDetailDO.setCheckVolume(pickingMaterialDetail.getTotalVolume()); - outMaterialDetailDO.setCheckNetWeight(pickingMaterialDetail.getTotalNetWeight()); - outMaterialDetailDO.setCheckGrossWeight(pickingMaterialDetail.getTotalGrossWeight()); - } +// ReviewOrderDO reviewOrderDO = new ReviewOrderDO(); +// List materialDetailList = stockOutOrderDO.getMaterialDetailList(); +// if (materialDetailList != null && materialDetailList.size() > 0) { +// for (OutMaterialDetailDO outMaterialDetailDO : materialDetailList) { +// Long uniqueId = outMaterialDetailDO.getUniqueId(); +// PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new QueryWrapper().lambda() +// .eq(PickingMaterialDetail::getOutUniqueId, uniqueId) +// .eq(PickingMaterialDetail::getDelFlag, 1), false); +// if (pickingMaterialDetail != null) { +// outMaterialDetailDO.setActualQuantity(pickingMaterialDetail.getPickingQuantity()); +// outMaterialDetailDO.setCheckArea(pickingMaterialDetail.getTotalArea()); +// outMaterialDetailDO.setCheckVolume(pickingMaterialDetail.getTotalVolume()); +// outMaterialDetailDO.setCheckNetWeight(pickingMaterialDetail.getTotalNetWeight()); +// outMaterialDetailDO.setCheckGrossWeight(pickingMaterialDetail.getTotalGrossWeight()); +// } +// } +// } +// stockOutOrderDO.setMaterialDetailList(materialDetailList); +// batchCheck(stockOutOrderDO); +// checkConfirm(stockOutOrderDO); + ReviewOrderDO cmd1 = new ReviewOrderDO(); + List reviewOrders = reviewOrderMapper.selectList(new QueryWrapper().lambda() + .eq(ReviewOrder::getOutOrderId, stockOutOrderDO.getOutOrderId()) + .eq(ReviewOrder::getDelFlag, 1)); + if (reviewOrders != null && reviewOrders.size() > 0) { + ReviewOrder reviewOrder = reviewOrders.get(0); + BeanUtils.copyProperties(reviewOrder,cmd1); + List details = new ArrayList<>(); + for (OutMaterialDetailDO outMaterialDetailDO : stockOutOrderDO.getMaterialDetailList()) { + ReviewMaterialDetailPO detailPO = new ReviewMaterialDetailPO(); + Long materialDetailId = outMaterialDetailDO.getMaterialDetailId(); + ReviewMaterialDetail reviewMaterialDetailPO = reviewMaterialDetailMapper.selectOne(new QueryWrapper().lambda() + .eq(ReviewMaterialDetail::getMaterialDetailId, materialDetailId) + .eq(ReviewMaterialDetail::getDelFlag, 1)); + reviewMaterialDetailPO.setReviewedQty(BigDecimal.ZERO); + reviewMaterialDetailPO.setReviewQtyEa(reviewMaterialDetailPO.getPendingReviewQty()); + reviewMaterialDetailPO.setVolumeCbm(outMaterialDetailDO.getOutVolume()); + reviewMaterialDetailPO.setNetWeightKg(outMaterialDetailDO.getOutWeight()); + reviewMaterialDetailPO.setGrossWeightKg(outMaterialDetailDO.getOutVolume()); + BeanUtils.copyProperties(reviewMaterialDetailPO, detailPO); + details.add(detailPO); } + cmd1.setDetails(details); } - stockOutOrderDO.setMaterialDetailList(materialDetailList); - batchCheck(stockOutOrderDO); - checkConfirm(stockOutOrderDO); + + + reviewOrderApplicationService.batchCheck(cmd1); + ReviewOrderDO cmd2 = new ReviewOrderDO(); + cmd2.setReviewOrderId(cmd1.getReviewOrderId()); + reviewOrderApplicationService.checkConfirm(cmd2); //交接