From d7cbe984b51fb8fa509890809aa75e6416168249 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 19 八月 2024 08:20:49 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   58 +++++++++++++++++++++++++++-------------------------------
 1 files changed, 27 insertions(+), 31 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..472fe59 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,52 @@
 package com.zy.asrs.entity.param;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.util.List;
 
 /**
  * Created by vincent on 2020/6/28
  */
+@Data
 public class CombParam {
+
+    // 鍗曟嵁缂栧彿
+    private String billNo;
+
+    // 鍗曟嵁缂栧彿
+    private String orderNo;
 
     // 鎵樼洏鏉$爜
     private String barcode;
 
+    // 搴撲綅缂栧彿
+    private String locno;
+
     private List<CombMat> combMats;
 
+    @Data
     public static class CombMat {
 
         // 鐗╂枡缂栧彿
-        private String matNo;
+        private String matnr;
+
+
+        // 搴忓垪鐮�
+        private String itemBatch;
+
+        // 搴忓垪鐮�
+        private String batch;
 
         // 鐗╂枡鏁伴噺
-        private Double count;
+        private Double anfme;
 
-        public String getMatNo() {
-            return matNo;
-        }
+        // 鍟嗗搧鍚嶇О
+        private String maktx;
 
-        public void setMatNo(String matNo) {
-            this.matNo = matNo;
-        }
-
-        public Double getCount() {
-            return count;
-        }
-
-        public void setCount(Double count) {
-            this.count = count;
-        }
+        // 瑙勬牸
+        private String specs;
 
     }
 
-    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