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

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   72 +++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 29 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 568b7e6..a39f7d2 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -1,56 +1,70 @@
 package com.zy.asrs.entity.param;
 
+import lombok.Data;
+
 import java.util.List;
 
 /**
  * Created by vincent on 2020/6/28
  */
+@Data
 public class CombParam {
+
+    // 鍗曟嵁缂栧彿
+    //private String orderNo;
 
     // 鎵樼洏鏉$爜
     private String barcode;
 
+    // 搴撲綅缂栧彿
+    private String locNo;
+
+    //閫�搴撶粍鎵�
+    private String tkFlag;
+
+
     private List<CombMat> combMats;
 
+    @Data
     public static class CombMat {
 
+        private Long id;
+
+        private String orderNo;
+
         // 鐗╂枡缂栧彿
-        private String matNo;
+        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;
 
-        public String getMatNo() {
-            return matNo;
-        }
 
-        public void setMatNo(String matNo) {
-            this.matNo = matNo;
-        }
+        // 鐗╂枡杈呮暟閲�
+        private Double weight;
 
-        public Double getCount() {
-            return count;
-        }
+        // 鐗╂枡鏁伴噺
+        private Double enableQty;
 
-        public void setCount(Double count) {
-            this.count = count;
-        }
+        // 鍟嗗搧鍚嶇О
+        private String maktx;
+
+        // 瑙勬牸
+        private String specs;
+
+        //
+        private String tiaoma;
 
     }
 
-    public String getBarcode() {
-        return barcode;
-    }
-
-    public void setBarcode(String barcode) {
-        this.barcode = barcode;
-    }
-
-    public List<CombMat> getCombMats() {
-        return combMats;
-    }
-
-    public void setCombMats(List<CombMat> combMats) {
-        this.combMats = combMats;
-    }
 }

--
Gitblit v1.9.1