From d8cbab6fb0e98ed9a474a93ceea35eea7894ae55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 12 Jun 2026 09:01:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(material):=20=E6=B7=BB=E5=8A=A0=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=89=B9=E6=AC=A1=E5=8F=B7=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 MaterialMinQO 中新增 batchNo 字段并添加非空验证 - 修复 NormalOrderController 中的批次号设置逻辑 - 订单创建时使用传入的批次号而非自动生成 - 移除对 NoUtil.getBatchNo 的调用 - 保持供应商信息设置的一致性 --- .../nflg/wms/admin/controller/NormalOrderController.java | 2 +- .../java/com/nflg/wms/common/pojo/qo/MaterialMinQO.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java index 5e94de56..3e8c3aea 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java @@ -535,7 +535,7 @@ public class NormalOrderController extends BaseController { .setSupplierCode(supplier.getSupplierCode()) .setSupplierId(it.getSupplierId()) .setSupplierName(supplier.getSupplierName()) - .setBatchNo(NoUtil.getBatchNo(supplier.getSupplierCode())) + .setBatchNo(it.getBatchNo()) .setCreateUserName(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()) ); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialMinQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialMinQO.java index cc31cc23..a551546c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialMinQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialMinQO.java @@ -29,4 +29,10 @@ public class MaterialMinQO { */ @NotNull private Integer count; + + /** + * 批次号 + */ + @NotBlank(message = "批次号不能为空") + private String batchNo; }