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 92e0c7292..c1e48bbbc 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 @@ -46,4 +46,6 @@ public interface ReserveStockInOrderMapper extends BaseMapper queryNoticePrintDetail(ReserveStockInOrderDO stockInOrderDO); public String getJsbz(@Param("id") Long id); + + int countByOrderNumberPrefix(@Param("prefix") String prefix); } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java index a31ca9db3..a33be77fa 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java @@ -2066,4 +2066,8 @@ public class ReserveStockInOrderApplicationService { // 3. 拼接结果 return datePart + randomPart; } + + public String generateReserveOrderNumber() { + return stockInOrderDomainService.generateReserveOrderNumber(); + } } \ No newline at end of file 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 d451559cf..3f581c5e6 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 @@ -973,4 +973,16 @@ public class ReserveStockInOrderDomainService { return stockInOrderService.queryNoticePrintDetail(stockInOrderDO); } + /** + * 生成入库预约单号 + */ + public String generateReserveOrderNumber() { + SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd"); + String datePart = sdf.format(new Date()); + String prefix = "R" + datePart; + int todayCount = reservationStockInOrderMapper.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/reserveStockInOrder/ReserveStockInOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reserveStockInOrder/ReserveStockInOrderApi.java index 6e455959e..5a033c040 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reserveStockInOrder/ReserveStockInOrderApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reserveStockInOrder/ReserveStockInOrderApi.java @@ -256,4 +256,13 @@ public class ReserveStockInOrderApi extends BaseController { } } + /** + * 生成入库预约单号 + */ + @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/reserveStockInOrder/ReserveStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml index 7546d26e8..9ad6f89b9 100644 --- a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml @@ -777,4 +777,10 @@ AND USER_ID = #{id} limit 1 + + \ No newline at end of file