From c3c2d0e5698babfc787102be8aaf6430cea9d2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 28 May 2026 20:14:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=AF=BC=E5=85=A5=E6=8A=A5?= =?UTF-8?q?=E9=94=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mhd/common/core/utils/RegexUtil.java | 4 ++-- .../ReservationStockOutOrderDomainService.java | 15 ++++++++------- .../repository/po/StockReceiptOrderPO.java | 4 ++-- .../stockShelfOrder/entity/StockShelfOrder.java | 4 +++- .../repository/po/StockShelfOrderPO.java | 3 +++ .../repository/todo/StockShelfOrderDO.java | 3 +++ .../dto/stockShelfOrder/StockShelfOrderDTO.java | 3 +++ 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/utils/RegexUtil.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/utils/RegexUtil.java index fc5d6edb5..c46195d7a 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/utils/RegexUtil.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/utils/RegexUtil.java @@ -42,7 +42,7 @@ public class RegexUtil { */ public static boolean isAccountLegal(String str) throws PatternSyntaxException { // 4-20位，大小写字母或数字 - String regEx = "(^[A-Za-z0-9]{3,20}$)"; + String regEx = "(^[A-Za-z0-9]{1,20}$)"; Pattern p = Pattern.compile(regEx); Matcher m = p.matcher(str); return m.matches(); @@ -109,4 +109,4 @@ public class RegexUtil { } -} +} \ 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 9fd88e4d3..69c81cf13 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 @@ -111,14 +111,15 @@ public class ReservationStockOutOrderDomainService { } stockOutOrderService.insert(stockOutOrderDO); List reservationDeliveryDetailsLinkList = stockOutOrderDO.getReservationDeliveryDetailsLinkList(); - reservationDeliveryDetailsLinkList.forEach(reservationDeliveryDetailsLink -> { - reservationDeliveryDetailsLink.setOrderNumber(stockOutOrderDO.getOutOrderNumber()); - reservationDeliveryDetailsLink.setOrderId(stockOutOrderDO.getOutOrderId()); - }); - if (!CollectionUtils.isEmpty(reservationDeliveryDetailsLinkList)) { - reservationDeliveryDetailsLinkService.saveBatch(reservationDeliveryDetailsLinkList); + if (reservationDeliveryDetailsLinkList != null && !reservationDeliveryDetailsLinkList.isEmpty()){ + reservationDeliveryDetailsLinkList.forEach(reservationDeliveryDetailsLink -> { + reservationDeliveryDetailsLink.setOrderNumber(stockOutOrderDO.getOutOrderNumber()); + reservationDeliveryDetailsLink.setOrderId(stockOutOrderDO.getOutOrderId()); + }); + if (!CollectionUtils.isEmpty(reservationDeliveryDetailsLinkList)) { + reservationDeliveryDetailsLinkService.saveBatch(reservationDeliveryDetailsLinkList); + } } - return outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList()); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java index 754f6d99f..2120572d6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java @@ -191,7 +191,7 @@ public class StockReceiptOrderPO extends StockInOrderBasePO { @Excel(name = "业务单号") private String businessOrderNo; - @ApiModelProperty("业务单号") - @Excel(name = "业务单号") + @ApiModelProperty("批次号") + @Excel(name = "批次号") private String batchNo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/entity/StockShelfOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/entity/StockShelfOrder.java index 76f52d387..03ef30fec 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/entity/StockShelfOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/entity/StockShelfOrder.java @@ -114,6 +114,8 @@ public class StockShelfOrder extends BaseVOEntity { @ApiModelProperty("推送人姓名") private String pushByName; - + @ApiModelProperty("批次号") + @Excel(name = "批次号") + private String batchNo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java index b101440b7..7b7177f83 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java @@ -135,5 +135,8 @@ public class StockShelfOrderPO extends StockInOrderBasePO { @ApiModelProperty("推送人姓名") private String pushByName; + @ApiModelProperty("批次号") + @Excel(name = "批次号") + private String batchNo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java index b8c666fba..bf2e584f9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java @@ -148,4 +148,7 @@ public class StockShelfOrderDO extends StockInOrderBaseDO { @ApiModelProperty("推送人姓名") private String pushByName; + @ApiModelProperty("批次号") + @Excel(name = "批次号") + private String batchNo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java index b79c9969c..0eab1eed3 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java @@ -137,4 +137,7 @@ public class StockShelfOrderDTO extends StockInOrderBaseDTO { @ApiModelProperty("推送人姓名") private String pushByName; + @ApiModelProperty("批次号") + @Excel(name = "批次号") + private String batchNo; } \ No newline at end of file