From cca40ca8d275faa8b5cc9501ce4f09b81cfbd7fc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 16:04:38 +0800
Subject: [PATCH] 123

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 ac07e41..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,7 +11,7 @@
 public class CombParam {
 
     // 鍗曟嵁缂栧彿
-    private String orderNo;
+    //private String orderNo;
 
     // 鎵樼洏鏉$爜
     private String barcode;
@@ -19,10 +19,13 @@
     // 搴撲綅缂栧彿
     private String locNo;
 
+
     private List<CombMat> combMats;
 
     @Data
     public static class CombMat {
+
+        private Long id;
 
         private String orderNo;
 
@@ -36,13 +39,16 @@
         private String standby2 = "";
         private String standby3 = "";
 
-        private String boxType1 = "1";
-        private String boxType2 = "1";
-        private String boxType3 = "1";
+        private String boxType1 = "";
+        private String boxType2 = "";
+        private String boxType3 = "";
 
         // 鐗╂枡鏁伴噺
         private Double anfme;
 
+        // 鐗╂枡鏁伴噺
+        private Double enableQty;
+
         // 鍟嗗搧鍚嶇О
         private String maktx;
 

--
Gitblit v1.9.1