From d46f45254cf23f4c0302be87e067b25acda54ca1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 11 七月 2025 09:23:41 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   47 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 41 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..a39f7d2 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,59 @@
 public class CombParam {
 
     // 鍗曟嵁缂栧彿
-    private String orderNo;
+    //private String orderNo;
 
     // 鎵樼洏鏉$爜
     private String barcode;
+
+    // 搴撲綅缂栧彿
+    private String locNo;
+
+    //閫�搴撶粍鎵�
+    private String tkFlag;
+
 
     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 weight;
+
+        // 鐗╂枡鏁伴噺
+        private Double enableQty;
+
+        // 鍟嗗搧鍚嶇О
+        private String maktx;
+
+        // 瑙勬牸
+        private String specs;
+
+        //
+        private String tiaoma;
 
     }
 

--
Gitblit v1.9.1