From d82c353588cb3a9a080bccb65e06e44a5d9dcfb0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 八月 2025 08:45:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 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 a8880ee..8fa2429 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -11,7 +11,7 @@
 public class CombParam {
 
     // 鍗曟嵁缂栧彿
-    private String orderNo;
+    //private String orderNo;
 
     // 鎵樼洏鏉$爜
     private String barcode;
@@ -19,14 +19,16 @@
     // 搴撲綅缂栧彿
     private String locNo;
 
+    //閫�搴撶粍鎵�
+    private String tkFlag;
+
 
     private List<CombMat> combMats;
 
     @Data
     public static class CombMat {
 
-        // 鏉$爜
-        private String  vbarcode;
+        private Long id;
 
         private String orderNo;
 
@@ -47,12 +49,25 @@
         // 鐗╂枡鏁伴噺
         private Double anfme;
 
+
+        // 鐗╂枡杈呮暟閲�
+        private Double weight;
+
+        // 鐗╂枡鏁伴噺
+        private Double enableQty;
+
         // 鍟嗗搧鍚嶇О
         private String maktx;
 
         // 瑙勬牸
         private String specs;
 
+        //
+        private String tiaoma;
+
+        //搴撳瓨鐘舵��
+        private String cstateid;
+
     }
 
 }

--
Gitblit v1.9.1