From 9eff15e48335c52908a4ffef643d7620ef41a8a4 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 21 Jul 2026 21:51:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(oms):=E4=BF=AE=E6=94=B9orderNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ReservationStockInOrderDomainService.java | 6 ------ .../service/ReservationStockOutOrderDomainService.java | 4 ---- .../service/ReserveStockInOrderDomainService.java | 2 +- .../service/ReserveStockOutOrderDomainService.java | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java index 99c44048f..b827f61f8 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java @@ -538,9 +538,6 @@ public class ReservationStockInOrderDomainService { reservationStockInOrder.setWarehouseName(warehouseName); reservationStockInOrder.setBusinessInOrderNumber(inOrderNumber); reservationStockInOrder.setInOrderNumber(generateExecutionOrderNumber(warehouseCode)); - // 原本 businessOrderNo 通过 BeanUtils.copyProperties 从预约单拷贝，现改为与执行单号一致 - // reservationStockInOrder.setBusinessOrderNo(byId.getBusinessOrderNo()); - reservationStockInOrder.setBusinessOrderNo(reservationStockInOrder.getInOrderNumber()); List inMaterialDetailList = new ArrayList<>(); int index = 1; @@ -694,9 +691,6 @@ public class ReservationStockInOrderDomainService { reservationStockInOrder.setWarehouseName(warehouseName); reservationStockInOrder.setBusinessInOrderNumber(inOrderNumber); reservationStockInOrder.setInOrderNumber(generateExecutionOrderNumber(warehouseCode)); - // 原本 businessOrderNo 通过 BeanUtils.copyProperties 从预约单拷贝，现改为与执行单号一致 - // reservationStockInOrder.setBusinessOrderNo(byId.getBusinessOrderNo()); - reservationStockInOrder.setBusinessOrderNo(reservationStockInOrder.getInOrderNumber()); List inMaterialDetailList = new ArrayList<>(); int index = 1; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java index af1c5052a..8663d6b39 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java @@ -394,8 +394,6 @@ public class ReservationStockOutOrderDomainService { reservationStockInOrder.setBusinessOutOrderNumber(inOrderNumber); reservationStockInOrder.setOutOrderNumber(generateExecutionOrderNumber(warehouseCode)); - // reservationStockInOrder.setBusinessOrderNo(byId.getBusinessOrderNo()); - reservationStockInOrder.setBusinessOrderNo(reservationStockInOrder.getOutOrderNumber()); List inMaterialDetailList = new ArrayList<>(); for (ReservationOutMaterialDetail reservationOutMaterialDetail : details) { @@ -520,8 +518,6 @@ public class ReservationStockOutOrderDomainService { reservationStockInOrder.setWarehouseName(warehouseName); reservationStockInOrder.setBusinessOutOrderNumber(inOrderNumber); reservationStockInOrder.setOutOrderNumber(generateExecutionOrderNumber(warehouseCode)); - // reservationStockInOrder.setBusinessOrderNo(byId.getBusinessOrderNo()); - reservationStockInOrder.setBusinessOrderNo(reservationStockInOrder.getOutOrderNumber()); List inMaterialDetailList = new ArrayList<>(); for (ReservationOutMaterialDetail reservationOutMaterialDetail : details) { 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 52494f144..a379ff8e9 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 @@ -101,7 +101,7 @@ public class ReserveStockInOrderDomainService { @Transactional(rollbackFor = Exception.class) public Boolean insert(ReserveStockInOrderDO stockInOrderDO) { if (stockInOrderDO.getInOrderNumber() == null) { - stockInOrderDO.setInOrderNumber(OrderSequence.getOrderCode("RK")); + stockInOrderDO.setInOrderNumber(generateReserveOrderNumber()); } // //设置默认值 // setDefaultValues(stockInOrderDO); 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 466e381b8..324750480 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 @@ -93,7 +93,7 @@ public class ReserveStockOutOrderDomainService { @Transactional(rollbackFor = Exception.class) public Boolean insert(ReserveStockOutOrderDO stockOutOrderDO) { if (stockOutOrderDO.getOutOrderNumber() == null) { - stockOutOrderDO.setOutOrderNumber(OrderSequence.getOrderCode("CK")); + stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber()); } // 与 update / batchInsert 一致：前端传计划数量为 quantity，非 outboundQuantity setMaterialDetailInfo(stockOutOrderDO);