From 7bcf11baaf2565c2b3123b10c0fb1e32f0b2800a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 14 Jul 2026 18:08:28 +0800 Subject: [PATCH] =?UTF-8?q?pda=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockOutOrderApplicationService.java | 11 +++++++ .../service/StockOutOrderDomainService.java | 30 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 61b914cf4..ac9dbd8a9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1148,6 +1148,17 @@ public class StockOutOrderApplicationService { } public Boolean checkUpload(StockOutOrderDO stockOutOrderDO){ + //pda复核下发 + String outOrderNumber = stockOutOrderDO.getOutOrderNumber(); + StockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper().lambda() + .eq(StockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(StockOutOrder::getDelFlag, 1), false); + stockOutOrderDO.setCheckOperatorsBy(stockOutOrder.getWorkUserId()); + List outOrderIds = new ArrayList<>(); + outOrderIds.add(stockOutOrder.getOutOrderId()); + stockOutOrderDO.setOutOrderIds(outOrderIds); + checkTaskDistribution(stockOutOrderDO); + Boolean b = stockOutOrderDomainService.checkUpload(stockOutOrderDO); return b; } 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 4c7b4f7e5..11ca0b915 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 @@ -19,6 +19,10 @@ import com.mhd.system.api.domain.BatchDetailFeignPO; import com.mhd.system.api.domain.DeliveryDetailsLink; import com.mhd.system.api.domain.PackDetailFeignPO; import com.mhd.system.api.model.LoginUser; +import com.mhd.wms.application.service.handoverTaskOrder.HandoverTaskOrderApplicationService; +import com.mhd.wms.application.service.pickingOrder.PickingOrderApplicationService; +import com.mhd.wms.application.service.reviewOrder.ReviewOrderApplicationService; +import com.mhd.wms.application.service.stockOutOrder.StockOutOrderApplicationService; import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService; import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO; @@ -70,6 +74,7 @@ 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.repository.todo.ReviewOrderDO; import com.mhd.wms.domain.statementStatistics.po.ImmediateInventoryPO; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper; @@ -156,6 +161,11 @@ public class StockOutOrderDomainService { private IPickingOrderService pickingOrderService; @Autowired private StockInOrderMapper stockInOrderMapper; + @Autowired + private PickingOrderApplicationService pickingOrderApplicationService; + @Autowired + private HandoverTaskOrderApplicationService handoverTaskOrderApplicationService; + /** * 分页查询出库单列表 */ @@ -888,6 +898,15 @@ public class StockOutOrderDomainService { } pickingOrder.setStatus(2); pickingOrderService.updateById(pickingOrder); + + //拣货任务下发 + PickingOrderDO pickingOrderDO = new PickingOrderDO(); + pickingOrderDO.setOperatorsBy(stockOutOrder.getWorkUserId()); + List ids = new ArrayList<>(); + ids.add(pickingOrder.getPickingOrderId()); + pickingOrderDO.setPickingOrderIdList(ids); + pickingOrderApplicationService.allDistribution(pickingOrderDO); + List materialDetailList = stockOutOrderDO.getMaterialDetailList(); if (CollectionUtils.isEmpty(materialDetailList)) { throw new RuntimeException("出库单明细不存在!"); @@ -950,6 +969,7 @@ public class StockOutOrderDomainService { //复核 + ReviewOrderDO reviewOrderDO = new ReviewOrderDO(); List materialDetailList = stockOutOrderDO.getMaterialDetailList(); if (materialDetailList != null && materialDetailList.size() > 0) { for (OutMaterialDetailDO outMaterialDetailDO : materialDetailList) { @@ -970,10 +990,20 @@ public class StockOutOrderDomainService { batchCheck(stockOutOrderDO); checkConfirm(stockOutOrderDO); //交接 + + HandoverTaskOrder handoverTaskOrder = handoverTaskOrderService.getOne(new LambdaQueryWrapper() .eq(HandoverTaskOrder::getOrderNumber, outOrderNumber) .eq(HandoverTaskOrder::getDelFlag, 1)); if (handoverTaskOrder != null) { + //交接pda下发 + HandoverTaskOrderDO handoverTaskOrderDO1 = new HandoverTaskOrderDO(); + handoverTaskOrderDO1.setOperatorsBy(stockOutOrder.getWorkUserId()); + List ids = new ArrayList<>(); + ids.add(handoverTaskOrder.getHandoverTaskOrderId()); + handoverTaskOrderDO1.setHandoverTaskOrderIds(ids); + handoverTaskOrderApplicationService.taskDistribution(handoverTaskOrderDO1); + //完成交接 HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO(); List handoverTaskOrderId = new ArrayList<>(); handoverTaskOrderId.add(handoverTaskOrder.getHandoverTaskOrderId());