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 | 89 +++++++++++++++++++++++++++++---------------
1 files changed, 59 insertions(+), 30 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..8b04187 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,85 @@
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 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 matNo;
+ private String matnr = "";
+
+ // 搴忓垪鐮�
+ 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 count;
+ private Double anfme;
- public String getMatNo() {
- return matNo;
- }
+ // 鍟嗗搧鍚嶇О
+ private String maktx = "";
- public void setMatNo(String matNo) {
- this.matNo = matNo;
- }
+ // 瑙勬牸
+ private String specs = "";
+ private String supp = "";
+ //
+ private String suppCode = "";
+ // sku
+ private String sku = "";
+ //澶囨敞
+ private String memo = "";
+ //浠撳簱缂栫爜
+ private String manu = "";
- public Double getCount() {
- return count;
- }
-
- public void setCount(Double count) {
- this.count = count;
- }
+ private String supplier = "";
}
- 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