From 81dc017b68c6d7814a0875f76827e3ab1f3d97e7 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 18:17:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 23 ++++++++++++++++++- .../StockOutOrderApplicationService.java | 23 +++++++++++++++++++ .../service/StockOutOrderDomainService.java | 19 +++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 774aa4995..cc68fd571 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -29,6 +29,8 @@ import com.mhd.system.api.domain.cache.SystemServiceCacheUtil; import com.mhd.system.api.model.LoginUser; import com.mhd.wms.application.service.stockReceiptOrder.StockReceiptOrderApplicationService; import com.mhd.wms.application.service.stockShelfOrder.StockShelfOrderApplicationService; +import com.mhd.wms.domain.deliveTask.entity.DeliveTask; +import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService; import com.mhd.wms.domain.handoverTaskOrder.entity.HandoverTaskOrder; import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrderService; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; @@ -140,6 +142,8 @@ public class StockInOrderApplicationService { @Autowired private StockReceiptOrderApplicationService stockReceiptOrderApplicationService; @Autowired + private IDeliveTaskService deliveTaskService; + @Autowired private StockShelfOrderApplicationService stockShelfOrderApplicationService; private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_i"; @@ -624,6 +628,15 @@ public class StockInOrderApplicationService { //完成上架 Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId()); +// DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() +// .eq(DeliveTask::getTrackingNumber, stockReceiptOrder.getReceiptOrderNumber()) +// .eq(DeliveTask::getDelFlag, 1)); +// if (deliveTask != null) { +// deliveTask.setOperatorsBy(workUserId); +// deliveTask.setOperatorsName(workUserName); +// deliveTask.setTaskStatus(2); +// deliveTaskService.updateById(deliveTask); +// } return b && b1; } @@ -659,7 +672,15 @@ public class StockInOrderApplicationService { ids.add(stockReceiptOrder.getReceiptOrderId()); stockReceiptOrderDO.setReceiptOrderIds(ids); // stockReceiptOrderApplicationService.taskDistribution(stockReceiptOrderDO); - + DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() + .eq(DeliveTask::getTrackingNumber, stockReceiptOrder.getReceiptOrderNumber()) + .eq(DeliveTask::getDelFlag, 1)); + if (deliveTask != null) { + deliveTask.setOperatorsBy(workUserId); + deliveTask.setOperatorsName(workUserName); + deliveTask.setTaskStatus(2); + deliveTaskService.updateById(deliveTask); + } stockInOrderService.update(null, new LambdaUpdateWrapper() .set(StockInOrder::getWorkUserId, workUserId) 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 6184ff5c4..8e6556798 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 @@ -27,6 +27,8 @@ import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO; import com.mhd.system.api.domain.cache.SystemServiceCacheUtil; import com.mhd.system.api.model.LoginUser; import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; +import com.mhd.wms.domain.deliveTask.entity.DeliveTask; +import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService; import com.mhd.wms.domain.deliveryDetailsLink.entity.DeliveryDetailsLink; import com.mhd.wms.domain.deliveryDetailsLink.repository.facade.IDeliveryDetailsLinkService; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; @@ -48,6 +50,8 @@ import com.mhd.wms.domain.pickingMaterialDetail.repository.facade.IPickingMateri import com.mhd.wms.domain.pickingMaterialDetail.repository.mapper.PickingMaterialDetailMapper; import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingAggByOutOrderRow; import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingMaterialDetailPO; +import com.mhd.wms.domain.pickingOrder.entity.PickingOrder; +import com.mhd.wms.domain.pickingOrder.repository.facade.IPickingOrderService; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount; import com.mhd.wms.domain.receiptOrderAccount.repository.facade.IReceiptOrderAccountService; @@ -112,6 +116,8 @@ public class StockOutOrderApplicationService { @Autowired private IPickingMaterialDetailService pickingMaterialDetailService; @Autowired + private IPickingOrderService pickingOrderService; + @Autowired private IReceiptOrderAccountService receiptOrderAccountService; @Autowired private IDeliveryDetailsLinkService deliveryDetailsLinkService; @@ -123,6 +129,8 @@ public class StockOutOrderApplicationService { private StockInOrderMapper stockInOrderMapper; @Autowired private PickingMaterialDetailMapper pickingMaterialDetailMapper; + @Autowired + private IDeliveTaskService deliveTaskService; private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_e"; private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD"; @@ -1647,6 +1655,21 @@ public class StockOutOrderApplicationService { if (workUserId == null || workUserName == null) { throw new ServiceException("作业人员id或名称为空!"); } + PickingOrder pickingOrder = pickingOrderService.getOne(new LambdaQueryWrapper() + .eq(PickingOrder::getOrderNumber, stockOutOrder.getOutOrderNumber()) + .eq(PickingOrder::getDelFlag, 1),false); + if (pickingOrder != null) { + DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() + .eq(DeliveTask::getTrackingNumber, pickingOrder.getPickingOrderNumber()) + .eq(DeliveTask::getDelFlag, 1)); + if (deliveTask != null) { + deliveTask.setOperatorsBy(workUserId); + deliveTask.setOperatorsName(workUserName); + deliveTask.setTaskStatus(2); + deliveTaskService.updateById(deliveTask); + } + } + stockOutOrderService.update(null, new LambdaUpdateWrapper() .set(StockOutOrder::getWorkUserId, workUserId) .set(StockOutOrder::getWorkUserName, workUserName) 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 44b246a7d..78e0a2913 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 @@ -24,6 +24,7 @@ import com.mhd.wms.application.service.pickingOrder.PickingOrderApplicationServi 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.entity.DeliveTask; import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService; import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO; import com.mhd.wms.domain.deliveryDetailsLink.repository.facade.IDeliveryDetailsLinkService; @@ -1041,6 +1042,15 @@ public class StockOutOrderDomainService { ReviewOrderDO cmd2 = new ReviewOrderDO(); cmd2.setReviewOrderId(cmd1.getReviewOrderId()); reviewOrderApplicationService.checkConfirm(cmd2); + DeliveTask reviewdeliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() + .eq(DeliveTask::getTrackingNumber, cmd1.getReviewOrderNumber()) + .eq(DeliveTask::getDelFlag, 1)); + if (reviewdeliveTask != null) { + reviewdeliveTask.setOperatorsBy(stockOutOrder.getWorkUserId()); + reviewdeliveTask.setOperatorsName(stockOutOrder.getWorkUserName()); + reviewdeliveTask.setTaskStatus(2); + deliveTaskService.updateById(reviewdeliveTask); + } //交接 @@ -1054,6 +1064,15 @@ public class StockOutOrderDomainService { List ids = new ArrayList<>(); ids.add(handoverTaskOrder.getHandoverTaskOrderId()); handoverTaskOrderDO1.setHandoverTaskOrderIds(ids); + DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() + .eq(DeliveTask::getTrackingNumber, handoverTaskOrder.getTaskNumber()) + .eq(DeliveTask::getDelFlag, 1)); + if (deliveTask != null) { + deliveTask.setOperatorsBy(stockOutOrder.getWorkUserId()); + deliveTask.setOperatorsName(stockOutOrder.getWorkUserName()); + deliveTask.setTaskStatus(2); + deliveTaskService.updateById(deliveTask); + } // handoverTaskOrderApplicationService.taskDistribution(handoverTaskOrderDO1); //完成交接 HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO();