From 9afe7ca53c38f2aa1010c2ac2a778012d133160f Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 03 六月 2025 16:42:03 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java index d007b60..01536e4 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java @@ -560,20 +560,15 @@ orderDetl2.setQty(wrkDetl.getAnfme()); orderDetl2.setBatch(wrkDetl.getBatch()); orderDetlService.insert(orderDetl2); - log.info("鎻掑叆-------------------------{}",orderDetl2.getOrderNo()); + log.info("鎻掑叆-------------------------{}", orderDetl2.getOrderNo()); } else { - orderDetl = orderDetlService.selectItem(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), null, orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3()); - OrderDetl orderDetl2 = new OrderDetl(); - orderDetl2.sync(orderDetl); - if (orderDetl.getAnfme() <= wrkDetl.getAnfme()) { - orderDetlService.deleteById(orderDetl.getId()); - } else { - orderDetl.setAnfme(orderDetl.getAnfme() - wrkDetl.getAnfme()); - orderDetlService.updateById(orderDetl); + OrderDetl orderDetl2 = orderDetlService.selectItem(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), null, orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3()); + if (orderDetl2.getAnfme() <= wrkDetl.getAnfme()) { + orderDetlService.deleteById(orderDetl2.getId()); } - orderDetl2.setQty(orderDetl.getQty() + wrkDetl.getAnfme()); - orderDetl2.setBatch(wrkDetl.getBatch()); - orderDetlService.updateById(orderDetl2); + orderDetl.setQty(orderDetl.getQty() + wrkDetl.getAnfme()); + orderDetl.setBatch(wrkDetl.getBatch()); + orderDetlService.updateById(orderDetl); } boolean b = orderDetlPakoutService.increaseQtyByOrderNo(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3(), wrkDetl.getAnfme()); if (!b) { -- Gitblit v1.9.1