From d6a7dc745a4d9a9a32a854cfcc97de2cecccf7d0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 06 六月 2025 08:31:08 +0800
Subject: [PATCH] 123

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index cb30c4b..5415c0d 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -11,24 +11,49 @@
 public class CombParam {
 
     // 鍗曟嵁缂栧彿
-    private String orderNo;
+    //private String orderNo;
 
     // 鎵樼洏鏉$爜
     private String barcode;
+
+    // 搴撲綅缂栧彿
+    private String locNo;
+
 
     private List<CombMat> combMats;
 
     @Data
     public static class CombMat {
 
-        // 鐗╂枡缂栧彿
-        private String matNo;
+        private Long id;
 
-        // 鎵瑰彿
-        private String batch;
+        private String orderNo;
+
+        // 鐗╂枡缂栧彿
+        private String matnr = "";
+
+        // 搴忓垪鐮�
+        private String batch = "";
+        private String brand = "";
+        private String standby1 = "";
+        private String standby2 = "";
+        private String standby3 = "";
+
+        private String boxType1 = "";
+        private String boxType2 = "";
+        private String boxType3 = "";
 
         // 鐗╂枡鏁伴噺
-        private Double count;
+        private Double anfme;
+
+        // 鐗╂枡鏁伴噺
+        private Double enableQty;
+
+        // 鍟嗗搧鍚嶇О
+        private String maktx;
+
+        // 瑙勬牸
+        private String specs;
 
     }
 

--
Gitblit v1.9.1