From a582f5cd87d2ee36b79b9b3ab6de1a7690d3c1cf Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 24 九月 2024 13:26:14 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   66 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 32 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..73c3a88 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,58 @@
 package com.zy.asrs.entity.param;
 
+import lombok.Data;
+
 import java.util.List;
 
 /**
  * Created by vincent on 2020/6/28
  */
+@Data
 public class CombParam {
+
+    // bom鍙�
+    private String bomCode;
+
+    // 鍗曟嵁缂栧彿
+    private String orderNo;
+
+    // 閿�鍞崟鍙�
+    private String threeCode;
 
     // 鎵樼洏鏉$爜
     private String barcode;
 
+    // 搴撲綅缂栧彿
+    private String locno;
+
+    // 鏄惁婊℃澘
+    private String isFull;
+
     private List<CombMat> combMats;
 
+    @Data
     public static class CombMat {
+        //璁㈠崟缂栧彿
+        private String orderNo;
+
+        // Bom鍙�
+        private String bomCode;
+
+        // 閿�鍞崟鍙�
+        private String threeCode;
 
         // 鐗╂枡缂栧彿
-        private String matNo;
+        private String matnr;
+
+        // 搴忓垪鐮�
+        private String batch;
 
         // 鐗╂枡鏁伴噺
-        private Double count;
+        private Double anfme;
 
-        public String getMatNo() {
-            return matNo;
-        }
-
-        public void setMatNo(String matNo) {
-            this.matNo = matNo;
-        }
-
-        public Double getCount() {
-            return count;
-        }
-
-        public void setCount(Double count) {
-            this.count = count;
-        }
+        // 搴撲綅鍙�
+        private String locNo;
 
     }
 
-    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