From d268718f9b7b458f97734b880c936b17f7c254f3 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Thu, 23 Jul 2026 17:53:32 +0800 Subject: [PATCH] =?UTF-8?q?fix(oms):=E5=85=A5=E5=BA=93/=E5=87=BA=E5=BA=93?= =?UTF-8?q?=20=E9=A2=84=E7=BA=A6/=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ReservationStockInOrderMapper.java | 2 ++ ...rvationStockInOrderApplicationService.java | 3 +++ .../ReservationStockInOrderDomainService.java | 24 +++++++++++++++++++ .../ReservationStockOutOrderMapper.java | 2 ++ ...vationStockOutOrderApplicationService.java | 3 +++ ...ReservationStockOutOrderDomainService.java | 24 +++++++++++++++++++ .../mapper/ReserveStockInOrderMapper.java | 2 ++ .../mapper/ReserveStockOutOrderMapper.java | 2 ++ .../ReservationStockOutOrderApi.java | 6 +++++ .../ReservationStockInOrderApi.java | 6 +++++ .../ReservationStockInOrderMapper.xml | 6 +++++ .../ReservationStockOutOrderMapper.xml | 5 ++++ .../ReserveStockInOrderMapper.xml | 5 ++++ .../ReserveStockOutOrderMapper.xml | 5 ++++ 14 files changed, 95 insertions(+) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java index 17eeac83f..d5b289c17 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java @@ -73,4 +73,6 @@ public interface ReservationStockInOrderMapper extends BaseMapper generateReserveOrderNumber1(@Param("prefix") String prefix); } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java index c15dd09d0..c0bb0bcce 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java @@ -2290,4 +2290,7 @@ public class ReservationStockInOrderApplicationService { return stockInOrderDomainService.generateReserveOrderNumber(); } + public String generateReserveOrderNumber1() { + return stockInOrderDomainService.generateReserveOrderNumber1(); + } } \ No newline at end of file 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 5c8413c36..6a3566dce 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 @@ -38,6 +38,7 @@ import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrd import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservationStockOutOrderService; import com.mhd.oms.domain.reserveInMaterialDetail.entity.ReserveInMaterialDetail; import com.mhd.oms.domain.reserveStockInOrder.entity.ReserveStockInOrder; +import com.mhd.oms.domain.reserveStockInOrder.repository.mapper.ReserveStockInOrderMapper; import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.WmsServiceFeign; import com.mhd.system.api.domain.*; @@ -88,6 +89,8 @@ public class ReservationStockInOrderDomainService { private BusinessDocumentOrderMapper businessDocumentOrderMapper; @Autowired private ExecutionStockInOrderMapper executionStockInOrderMapper; + @Autowired + private ReserveStockInOrderMapper reserveStockInOrderMapper; /** * 分页查询入库单列表 @@ -1232,4 +1235,25 @@ public class ReservationStockInOrderDomainService { return prefix + seq; } + public String generateReserveOrderNumber1() { + SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd"); + String datePart = sdf.format(new Date()); + String prefix = "R" + datePart; + List orderNumber1 = reservationStockInOrderMapper.generateReserveOrderNumber1(prefix); + List orderNumber2 = reserveStockInOrderMapper.generateReserveOrderNumber1(prefix); + List allOrders = new ArrayList<>(); + allOrders.addAll(orderNumber1); + allOrders.addAll(orderNumber2); + int maxseq = 0; + for(String order:allOrders) + { + String numStr = order.substring(prefix.length()); + int num = Integer.parseInt(numStr); + if(num > maxseq){ + maxseq = num; + } + } + String seq = String.format("%03d", maxseq + 1); + return prefix + seq; + } } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/mapper/ReservationStockOutOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/mapper/ReservationStockOutOrderMapper.java index 49faac8a2..89487e570 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/mapper/ReservationStockOutOrderMapper.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/mapper/ReservationStockOutOrderMapper.java @@ -39,4 +39,6 @@ public interface ReservationStockOutOrderMapper extends BaseMapper generateReserveOrderNumber1(@Param("prefix") String prefix); } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java index 324853ef1..877149037 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java @@ -1747,4 +1747,7 @@ public class ReservationStockOutOrderApplicationService { return stockOutOrderDomainService.generateReserveOrderNumber(); } + public String generateReserveOrderNumber1() { + return stockOutOrderDomainService.generateReserveOrderNumber1(); + } } \ No newline at end of file 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 4295d2b4d..bf7018944 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 @@ -51,6 +51,7 @@ import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservatio import com.mhd.oms.domain.reservationStockOutOrder.repository.mapper.ReservationStockOutOrderMapper; import com.mhd.oms.domain.reservationStockOutOrder.repository.po.ReservationStockOutOrderPO; import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDO; +import com.mhd.oms.domain.reserveStockOutOrder.repository.mapper.ReserveStockOutOrderMapper; import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.WmsServiceFeign; import com.mhd.system.api.domain.*; @@ -112,6 +113,8 @@ public class ReservationStockOutOrderDomainService { private BusinessDeliveryDetailsLinkMapper businessDeliveryDetailsLinkMapper; @Autowired private ReservationStockOutOrderMapper reservationStockOutOrderMapper; + @Autowired + private ReserveStockOutOrderMapper reserveStockOutOrderMapper; /** * 分页查询出库单列表 @@ -1076,4 +1079,25 @@ public class ReservationStockOutOrderDomainService { return prefix + seq; } + public String generateReserveOrderNumber1() { + SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd"); + String datePart = sdf.format(new Date()); + String prefix = "R" + datePart; + List orderNumber1 = reservationStockOutOrderMapper.generateReserveOrderNumber1(prefix); + List orderNumber2 = reserveStockOutOrderMapper.generateReserveOrderNumber1(prefix); + List allOrders = new ArrayList<>(); + allOrders.addAll(orderNumber1); + allOrders.addAll(orderNumber2); + int maxseq = 0; + for(String order:allOrders) + { + String numStr = order.substring(prefix.length()); + int num = Integer.parseInt(numStr); + if(num > maxseq){ + maxseq = num; + } + } + String seq = String.format("%03d", maxseq + 1); + return prefix + seq; + } } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/mapper/ReserveStockInOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/mapper/ReserveStockInOrderMapper.java index c1e48bbbc..412930a66 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/mapper/ReserveStockInOrderMapper.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/mapper/ReserveStockInOrderMapper.java @@ -48,4 +48,6 @@ public interface ReserveStockInOrderMapper extends BaseMapper generateReserveOrderNumber1(@Param("prefix") String prefix); } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/mapper/ReserveStockOutOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/mapper/ReserveStockOutOrderMapper.java index cacc94153..ed8bc8f50 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/mapper/ReserveStockOutOrderMapper.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/mapper/ReserveStockOutOrderMapper.java @@ -36,4 +36,6 @@ public interface ReserveStockOutOrderMapper extends BaseMapper queryOutStockNoticePrintDetail(ReserveStockOutOrderDO stockOutOrderDO); int countByOrderNumberPrefix(@Param("prefix") String prefix); + + List generateReserveOrderNumber1(@Param("prefix") String prefix); } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java index 86fc610cd..77dd5ebf6 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java @@ -252,4 +252,10 @@ public class ReservationStockOutOrderApi extends BaseController { return AjaxResult.success(stockOutOrderApplicationService.generateReserveOrderNumber()); } + + @ApiOperation("生成出库预约单号/出库业务单号") + @GetMapping("/generateOrderNumber1") + public AjaxResult generateOrderNumber1() { + return AjaxResult.success(stockOutOrderApplicationService.generateReserveOrderNumber1()); + } } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java index 196ecb6bb..92f9b315e 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java @@ -287,4 +287,10 @@ public class ReservationStockInOrderApi extends BaseController { return AjaxResult.success(stockInOrderApplicationService.generateReserveOrderNumber()); } + @ApiOperation("生成入库预约单号/入库业务单号") + @GetMapping("/generateOrderNumber1") + public AjaxResult generateOrderNumber1() { + return AjaxResult.success(stockInOrderApplicationService.generateReserveOrderNumber1()); + } + } \ No newline at end of file diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml index 06ab7caa1..17660e241 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml @@ -661,4 +661,10 @@ FROM reservation_stock_in_order WHERE in_order_number LIKE concat(#{prefix}, '%') + + \ No newline at end of file diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml index 43dce4f98..d143852cf 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml @@ -475,4 +475,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM reservation_stock_out_order WHERE out_order_number LIKE concat(#{prefix}, '%') + \ No newline at end of file diff --git a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml index 9ad6f89b9..873ed5d8e 100644 --- a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml @@ -782,5 +782,10 @@ FROM reserve_stock_in_order WHERE in_order_number LIKE concat(#{prefix}, '%') + \ No newline at end of file diff --git a/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml index d8807c9d5..a6559f786 100644 --- a/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml @@ -522,5 +522,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM reserve_stock_out_order WHERE out_order_number LIKE concat(#{prefix}, '%') + \ No newline at end of file