From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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..62ad3d5 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -16,19 +16,30 @@
// 鎵樼洏鏉＄爜
private String barcode;
+ // 搴撲綅缂栧彿
+ private String locno;
+
+// // 璐т富
+// private int owner;
+
private List<CombMat> combMats;
@Data
public static class CombMat {
- // 鐗╂枡缂栧彿
- private String matNo;
+ // 鍗曟嵁缂栧彿
+ private String orderNo;
- // 鎵瑰彿
+ // 鐗╂枡缂栧彿
+ private String matnr;
+
+ // 搴忓垪鐮�
private String batch;
// 鐗╂枡鏁伴噺
- private Double count;
+ private Double anfme;
+
+ private Double weight;
}
--
Gitblit v1.9.1