From f7b699b0da8aa185edeb38dc1abaaf964ba41d95 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期五, 02 八月 2024 09:15:01 +0800 Subject: [PATCH] # --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java index 6c7c7ce..5d793ba 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java @@ -4,6 +4,7 @@ import com.zy.asrs.framework.exception.CoolException; import com.zy.asrs.wms.asrs.entity.*; import com.zy.asrs.wms.asrs.entity.enums.LocStsType; +import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType; import com.zy.asrs.wms.asrs.entity.param.GeneratePakInParam; import com.zy.asrs.wms.asrs.service.*; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +30,8 @@ private OrderDetlFieldService orderDetlFieldService; @Autowired private TaskDetlFieldService taskDetlFieldService; + @Autowired + private OrderService orderService; @Autowired private OrderDetlService orderDetlService; @Autowired @@ -135,17 +138,32 @@ throw new CoolException("缁勬墭閫氱煡妗f洿鏂板け璐�"); } - //鏇存柊璁㈠崟鏁版嵁 + //鏇存柊璁㈠崟鏄庣粏鏁版嵁 OrderDetl orderDetl = orderDetlService.getById(taskDetl.getDetlId()); if(orderDetl == null){ - throw new CoolException("璁㈠崟鏁版嵁寮傚父"); + throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�"); } orderDetl.setWorkQty(orderDetl.getWorkQty() + taskDetl.getAnfme()); orderDetl.setUpdateTime(new Date()); boolean orderDetlUpdate = orderDetlService.updateById(orderDetl); if(!orderDetlUpdate){ - throw new CoolException("璁㈠崟鏇存柊澶辫触"); + throw new CoolException("璁㈠崟鏄庣粏鏇存柊澶辫触"); + } + + //鑾峰彇璁㈠崟 + Order order = orderService.getById(taskDetl.getOrderId()); + if(order == null){ + throw new CoolException("璁㈠崟涓嶅瓨鍦�"); + } + + //鏇存柊璁㈠崟鐘舵�� + if (order.getOrderSettle().equals(OrderSettleType.WAIT.val())) { + order.setOrderSettle(OrderSettleType.WORKING.val()); + order.setUpdateTime(new Date()); + if (!orderService.updateById(order)) { + throw new CoolException("璁㈠崟鏁版嵁鏇存柊澶辫触"); + } } } -- Gitblit v1.9.1