From 7d12cfdbaa4a89c1b12d806a5abc61026fc057f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Mon, 1 Jun 2026 08:34:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor(request):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E6=97=A0=E6=89=AB=E6=8F=8F=E8=AF=B7=E6=B1=82=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 NoScanningItemDataRequest 类用于明细数据
- 修改 NoScanningItemRequest 结构，将数量、批次号等字段移至子类
- 将订单项ID改为物料编号，新增明细列表字段
- 调整 NoScanningRequest 中的字段定义，订单项ID改为库存地点编号
- 保留并验证明细列表的必填校验规则
- 优化请求对象的字段映射关系和验证注解配置
---
 .../request/NoScanningItemDataRequest.java    | 31 +++++++++++++++++++
 .../pojo/request/NoScanningItemRequest.java   | 24 +++++++-------
 .../admin/pojo/request/NoScanningRequest.java | 11 +++----
 3 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemDataRequest.java

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemDataRequest.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemDataRequest.java
new file mode 100644
index 00000000..7f655d6d
--- /dev/null
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemDataRequest.java
@@ -0,0 +1,31 @@
+package com.nflg.wms.admin.pojo.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class NoScanningItemDataRequest {
+
+    /**
+     * 数量
+     */
+    @NotNull
+    private BigDecimal num;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 序列号
+     */
+    private String serialNo;
+
+    /**
+     * 库位
+     */
+    private String binNo;
+}
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemRequest.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemRequest.java
index d797b7b6..401443a9 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemRequest.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemRequest.java
@@ -1,31 +1,33 @@
 package com.nflg.wms.admin.pojo.request;
 
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class NoScanningItemRequest {
 
     /**
-     * 数量
+     * 订单项ID
      */
     @NotNull
-    private BigDecimal num;
+    private Long orderItemId;
 
     /**
-     * 批次号
+     * 物料编号
      */
-    private String batchNo;
+    @NotBlank
+    private String materialNo;
 
     /**
-     * 序列号
+     * 明细列表
      */
-    private String serialNo;
-
-    /**
-     * 库位
-     */
-    private String binNo;
+    @Valid
+    @NotEmpty
+    private List<NoScanningItemDataRequest> datas;
 }
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningRequest.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningRequest.java
index 22dde3d6..f966672d 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningRequest.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningRequest.java
@@ -12,20 +12,17 @@ import java.util.List;
 public class NoScanningRequest {
 
     /**
-     * 订单项ID
+     * 订单id
      */
     @NotNull
-    private Long orderItemId;
+    private Long id;
 
     /**
-     * 物料编号
+     * 库存地点编号
      */
     @NotBlank
-    private String materialNo;
+    private String warehouseNo;
 
-    /**
-     * 明细列表
-     */
     @Valid
     @NotEmpty
     private List<NoScanningItemRequest> items;