From 0cc3fbedc7d27dda956bb263a346c1ea934fdc54 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 29 五月 2024 13:15:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 cb30c4b..9f6b164 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -13,22 +13,49 @@
// 鍗曟嵁缂栧彿
private String orderNo;
- // 鎵樼洏鏉＄爜
+ // 璐ф灦鏉＄爜
private String barcode;
+
+ // 璐ф灦鏉＄爜
+ private Short containerType;
+
+ // 搴撲綅缂栧彿
+ private String locno;
+
+ // 搴撲綅绫诲瀷锛� 1銆佸緟鍖呰鎴愬搧锛�2銆佸師鏉愭枡锛�3銆佺澹�
+ private Integer locType;
+
+ //绗簩鍗曚綅鏁伴噺
+ private Double anfme;
private List<CombMat> combMats;
@Data
public static class CombMat {
- // 鐗╂枡缂栧彿
- private String matNo;
+ //鏂欐兂鐮�
+ private String containerCode;
- // 鎵瑰彿
+ //閿�鍞鍗曞彿
+ private String csocode;
+
+ //閿�鍞鍗曡鍙�
+ private String isoseq;
+
+ // 鐗╂枡缂栧彿
+ private String matnr;
+
+ // 搴忓垪鐮�
private String batch;
// 鐗╂枡鏁伴噺
- private Double count;
+ private Double anfme;
+
+ // 鍟嗗搧鍚嶇О
+ private String maktx;
+
+ // 瑙勬牸
+ private String specs;
}
--
Gitblit v1.9.1