From cca40ca8d275faa8b5cc9501ce4f09b81cfbd7fc Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 05 六月 2025 16:04:38 +0800 Subject: [PATCH] 123 --- src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java index d3a8183..ef443d8 100644 --- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java @@ -33,6 +33,10 @@ private OrderDetlService orderDetlService; @Autowired + private OrderDetlPakoutService orderDetlPakoutService; + @Autowired + private WrkDetlService wrkDetlService; + @Autowired private InventoryCheckOrderDetlService inventoryCheckOrderDetlService; @Autowired @@ -89,8 +93,7 @@ List<OrderDetl> orderDetlList = new ArrayList<>(); for (OrderDetl detail : orderDetls) { - DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), - detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme()); + DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme()); if (DetlDto.has(list, dto)) { DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3()); assert detlDto != null; @@ -185,6 +188,26 @@ } } if (complete) { + if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) { + throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�"); + } + List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(order.getOrderNo()); + for (WrkDetl wrkDetl : wrkDetls) { + OrderDetl orderDetl = new OrderDetl(); + orderDetl.sync(wrkDetl); + orderDetl.setQty(wrkDetl.getAnfme()); + orderDetl.setOrderId(order.getId()); + orderDetl.setOrderNo(order.getOrderNo()); + orderDetl.setStatus(1); + orderDetl.setCreateTime(order.getCreateTime()); + orderDetl.setCreateBy(order.getCreateBy()); + orderDetl.setUpdateTime(order.getUpdateTime()); + orderDetl.setUpdateBy(order.getUpdateBy()); + if (!orderDetlService.insert(orderDetl)) { + throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�"); + } + } + // 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶� if (!orderService.updateSettle(orderSou.getId(), 4L, null)) { throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); -- Gitblit v1.9.1