From 496548558bcb799c016432c3777a30bcc30dc4be Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 21 Jul 2026 21:20:56 +0800 Subject: [PATCH] =?UTF-8?q?fix(oms):=E5=87=BA=E5=85=A5=E5=BA=93=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E5=8D=95=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ReservationStockInOrderMapper.java | 2 ++ ...ReservationStockInOrderApplicationService.java | 4 ++++ .../ReservationStockInOrderDomainService.java | 12 ++++++++++++ .../mapper/ReservationStockOutOrderMapper.java | 2 ++ ...eservationStockOutOrderApplicationService.java | 4 ++++ .../ReservationStockOutOrderDomainService.java | 15 +++++++++++++++ .../ReservationStockOutOrderApi.java | 6 ++++++ .../ReservationStockInOrderApi.java | 6 ++++++ .../ReservationStockInOrderMapper.xml | 6 ++++++ .../ReservationStockOutOrderMapper.xml | 5 +++++ 10 files changed, 62 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 d2c956a0c..05a604714 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 @@ -67,4 +67,6 @@ public interface ReservationStockInOrderMapper extends BaseMapper queryOutStockNoticePrintDetail(ReservationStockOutOrderDO stockOutOrderDO); Long queryShipperId(@Param("userMemberCode") String userMemberCode,@Param("organizationId") Long organizationId); + + int countByOrderNumberPrefix(@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 a51006cb8..324853ef1 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 @@ -1743,4 +1743,8 @@ public class ReservationStockOutOrderApplicationService { return filteredList; } + public String generateReserveOrderNumber() { + return stockOutOrderDomainService.generateReserveOrderNumber(); + } + } \ 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 11fbe1589..af1c5052a 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 @@ -48,6 +48,7 @@ import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfo import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO; import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder; import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservationStockOutOrderService; +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.system.api.SystemServiceFeign; @@ -109,6 +110,8 @@ public class ReservationStockOutOrderDomainService { private IBusinessDeliveryDetailsLinkService businessDeliveryDetailsLinkService; @Autowired private BusinessDeliveryDetailsLinkMapper businessDeliveryDetailsLinkMapper; + @Autowired + private ReservationStockOutOrderMapper reservationStockOutOrderMapper; /** * 分页查询出库单列表 @@ -1064,4 +1067,16 @@ public class ReservationStockOutOrderDomainService { return prefix + seq; } + /** + * 生成出库预约单号： + */ + public String generateReserveOrderNumber() { + SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd"); + String datePart = sdf.format(new Date()); + String prefix = "C" + datePart; + int todayCount = reservationStockOutOrderMapper.countByOrderNumberPrefix(prefix); + String seq = String.format("%03d", todayCount + 1); + return prefix + seq; + } + } \ 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 634649524..86fc610cd 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 @@ -246,4 +246,10 @@ public class ReservationStockOutOrderApi extends BaseController { return getDataTable(list); } + @ApiOperation("生成出库预约单号") + @GetMapping("/generateOrderNumber") + public AjaxResult generateOrderNumber() { + return AjaxResult.success(stockOutOrderApplicationService.generateReserveOrderNumber()); + } + } \ 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 9795e5dc6..196ecb6bb 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 @@ -281,4 +281,10 @@ public class ReservationStockInOrderApi extends BaseController { return getDataTable(list); } + @ApiOperation("生成入库预约单号") + @GetMapping("/generateOrderNumber") + public AjaxResult generateOrderNumber() { + return AjaxResult.success(stockInOrderApplicationService.generateReserveOrderNumber()); + } + } \ 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 54a575636..3d057b2e0 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml @@ -649,4 +649,10 @@ + + \ 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 33dfef60e..43dce4f98 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml @@ -470,4 +470,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select max(user_id) as user_id from NGWL_TEST_USER."USER" where ORGANIZATION_ID = #{organizationId} and USER_MEMBER_CODE = #{userMemberCode} and DEL_FLAG = 1 + \ No newline at end of file