From 6d26806d8b26f791f37a215fe60bb24fcf46e61b 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, 12 May 2026 17:48:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=8D=95=E4=B8=8B=E5=8F=91=E6=B7=BB=E5=8A=A0=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=BF=A1=E6=81=AF;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReserveStockInOrderDomainService.java | 32 +++++++++---------- .../ReserveStockOutOrderDomainService.java | 29 ++++++++--------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java index 4d3071b9b..b830c4000 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java @@ -454,24 +454,22 @@ public class ReserveStockInOrderDomainService { } //todo下发推送到入库业务单 - List inOrderIds = stockInOrderDO.getInOrderIds(); - for (Long inOrderId : inOrderIds) { - ReserveStockInOrder byId = stockInOrderService.getById(inOrderId); - ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder(); - BeanUtils.copyProperties(byId, reservationStockInOrder,"inOrderId"); - reservationStockInOrderService.save(reservationStockInOrder); - String inOrderNumber = reservationStockInOrder.getInOrderNumber(); - List materialDetailList = materialDetailService.list(new QueryWrapper().lambda().eq(ReserveInMaterialDetail::getInOrderNumber, inOrderNumber)); - List inMaterialDetailList = new ArrayList<>(); - for (ReserveInMaterialDetail reserveInMaterialDetail : materialDetailList) { - ReservationInMaterialDetail reservationInMaterialDetail = new ReservationInMaterialDetail(); - BeanUtils.copyProperties(reserveInMaterialDetail, reservationInMaterialDetail,"materialDetailId"); - reservationInMaterialDetail.setQuantity(reserveInMaterialDetail.getReserveQuantity()); - //reservationInMaterialDetail.set - inMaterialDetailList.add(reservationInMaterialDetail); - } - reservationInMaterialDetailService.saveBatch(inMaterialDetailList); + Long inOrderId = stockInOrderDO.getInOrderId(); + ReserveStockInOrder byId = stockInOrderService.getById(inOrderId); + ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder(); + BeanUtils.copyProperties(byId, reservationStockInOrder,"inOrderId"); + reservationStockInOrderService.save(reservationStockInOrder); + String inOrderNumber = reservationStockInOrder.getInOrderNumber(); + List materialDetailList = materialDetailService.list(new QueryWrapper().lambda().eq(ReserveInMaterialDetail::getInOrderNumber, inOrderNumber)); + List inMaterialDetailList = new ArrayList<>(); + for (ReserveInMaterialDetail reserveInMaterialDetail : materialDetailList) { + ReservationInMaterialDetail reservationInMaterialDetail = new ReservationInMaterialDetail(); + BeanUtils.copyProperties(reserveInMaterialDetail, reservationInMaterialDetail,"materialDetailId"); + reservationInMaterialDetail.setQuantity(reserveInMaterialDetail.getReserveQuantity()); + //reservationInMaterialDetail.set + inMaterialDetailList.add(reservationInMaterialDetail); } + reservationInMaterialDetailService.saveBatch(inMaterialDetailList); return update; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java index c842d01fe..79211d013 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java @@ -272,22 +272,21 @@ public class ReserveStockOutOrderDomainService { outMaterialDetailService.updateById(reserveOutMaterialDetail); } //todo下发推送到wms - List outOrderIds = stockOutOrderDO.getOutOrderIds(); - for (Long outOrderId : outOrderIds) { - ReserveStockOutOrder byId = stockOutOrderService.getById(outOrderId); - ReservationStockOutOrder reservationStockOutOrder = new ReservationStockOutOrder(); - BeanUtils.copyProperties(byId, reservationStockOutOrder,"outOrderId"); - reservationStockOutOrderService.save(reservationStockOutOrder); - String outOrderNumber = reservationStockOutOrder.getOutOrderNumber(); - List materialDetailList = outMaterialDetailService.list(new QueryWrapper().lambda().eq(ReserveOutMaterialDetail::getOutOrderNumber, outOrderNumber)); - List inMaterialDetailList = new ArrayList<>(); - for (ReserveOutMaterialDetail reserveOutMaterialDetail : materialDetailList) { - ReservationOutMaterialDetail reservationOutMaterialDetail = new ReservationOutMaterialDetail(); - BeanUtils.copyProperties(reserveOutMaterialDetail, reservationOutMaterialDetail,"materialDetailId"); - inMaterialDetailList.add(reservationOutMaterialDetail); - } - reservationOutMaterialDetailService.saveBatch(inMaterialDetailList); + Long outOrderId = stockOutOrderDO.getOutOrderId(); + ReserveStockOutOrder byId = stockOutOrderService.getById(outOrderId); + ReservationStockOutOrder reservationStockOutOrder = new ReservationStockOutOrder(); + BeanUtils.copyProperties(byId, reservationStockOutOrder,"outOrderId"); + reservationStockOutOrderService.save(reservationStockOutOrder); + String outOrderNumber = reservationStockOutOrder.getOutOrderNumber(); + List materialDetailList = outMaterialDetailService.list(new QueryWrapper().lambda().eq(ReserveOutMaterialDetail::getOutOrderNumber, outOrderNumber)); + List inMaterialDetailList = new ArrayList<>(); + for (ReserveOutMaterialDetail reserveOutMaterialDetail : materialDetailList) { + ReservationOutMaterialDetail reservationOutMaterialDetail = new ReservationOutMaterialDetail(); + BeanUtils.copyProperties(reserveOutMaterialDetail, reservationOutMaterialDetail,"materialDetailId"); + inMaterialDetailList.add(reservationOutMaterialDetail); } + reservationOutMaterialDetailService.saveBatch(inMaterialDetailList); + return update; }