From 06ea3e5721995a4a4e1ae0db93d7f7dac1bfa162 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 11 三月 2026 15:20:05 +0800
Subject: [PATCH] 1.成品灌装完成后采集plc反馈的是否贴标信息随工作任务存入数据库中 2.库存查询界面以及出库提取界面新增是否贴标搜索筛选功能

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 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 84a4927..ac07e41 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -16,20 +16,39 @@
     // 鎵樼洏鏉$爜
     private String barcode;
 
+    // 搴撲綅缂栧彿
+    private String locNo;
+
     private List<CombMat> combMats;
 
     @Data
     public static class CombMat {
 
+        private String orderNo;
+
         // 鐗╂枡缂栧彿
-        private String matnr;
+        private String matnr = "";
 
         // 搴忓垪鐮�
-        private String batch;
+        private String batch = "";
+        private String brand = "";
+        private String standby1 = "";
+        private String standby2 = "";
+        private String standby3 = "";
+
+        private String boxType1 = "1";
+        private String boxType2 = "1";
+        private String boxType3 = "1";
 
         // 鐗╂枡鏁伴噺
         private Double anfme;
 
+        // 鍟嗗搧鍚嶇О
+        private String maktx;
+
+        // 瑙勬牸
+        private String specs;
+
     }
 
 }

--
Gitblit v1.9.1