From 3b0cab2402876426acbc0814394ff940fd2ce83d Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 15 四月 2026 20:22:16 +0800
Subject: [PATCH] 1.erp对接新增字段 2.电视机数据

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 52 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..8b04187 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,70 @@
     // 鎵樼洏鏉$爜
     private String barcode;
 
+    // 搴撲綅缂栧彿
+    private String locNo;
+
+    // 闆嗚绠卞彿
+    private String containerNo;
+
+    // TEU
+    private Integer teu;
+
+    // 杞︾墝鍙�
+    private String plateNo;
+
+    // 杞︽鍙�
+    private String trainNo;
+
+    // 绔嬫柟鏁帮紝鍗曚綅锛氱珛鏂圭背
+    private Double cubeNumber;
+
     private List<CombMat> combMats;
 
     @Data
     public static class CombMat {
 
+        private String orderNo;
+
+        /**
+         * 璐х墿棰戞锛�1=楂橀锛�2=浣庨
+         */
+        private Integer freqType;
+
         // 鐗╂枡缂栧彿
-        private String matnr;
+        private String matnr = "";
 
         // 搴忓垪鐮�
-        private String batch;
+        private String batch = "";
+        private String brand = "";
+        private String standby1 = "1";
+        private String standby2 = "1";
+        private String standby3 = "1";
+
+        private String boxType1 = "1";
+        private String boxType2 = "1";
+        private String boxType3 = "1";
 
         // 鐗╂枡鏁伴噺
         private Double anfme;
 
+        // 鍟嗗搧鍚嶇О
+        private String maktx = "";
+
+        // 瑙勬牸
+        private String specs = "";
+        private String supp = "";
+        //
+        private String suppCode = "";
+        // sku
+        private String sku = "";
+        //澶囨敞
+        private String memo = "";
+        //浠撳簱缂栫爜
+        private String manu = "";
+
+        private String supplier = "";
+
     }
 
 }

--
Gitblit v1.9.1