From eea9c3e06de7b3559c6e1558ea276fd5e8646eb9 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 17 十月 2025 13:42:37 +0800
Subject: [PATCH] 1.所有序列码修改成批号

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   71 ++++++++++++++++++-----------------
 1 files changed, 37 insertions(+), 34 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..00c3844 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,59 @@
 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 rsta;
+
+    //澶у皬鎵樼洏
+    private String barcodeSize;
+
+    private String ck;
+
+    private boolean type = false;
+
+
+    //agv鐘舵��
+    /**
+     * 0锛氭棤闇�璋冪敤AGV
+     * 1锛氱瓑寰呰皟鐢ˋGV
+     * 2锛欰GV浠诲姟涓嬪彂鎴愬姛
+     * 3锛欰GV浠诲姟瀹屾垚
+     * 4锛氱粰杈撻�佺嚎涓嬪彂鍏ュ簱鎸囦护
+     */
+    private Integer beBatch = 0;
+
     private List<CombMat> combMats;
 
+    @Data
     public static class CombMat {
-
+        private String bc;
         // 鐗╂枡缂栧彿
-        private String matNo;
+        private String matnr;
+
+        // 鎵瑰彿
+        private String batch;
 
         // 鐗╂枡鏁伴噺
-        private Double count;
-
-        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 Double anfme;
 
     }
 
-    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