From 340b69790a7a2eff1ff5de75f109dc77f4b4008f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 十一月 2024 16:12:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 e19b459..da2dacb 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -19,10 +19,16 @@
// 搴撲綅缂栧彿
private String locno;
+// // 璐т富
+// private int owner;
+
private List<CombMat> combMats;
@Data
public static class CombMat {
+
+ // 鍗曟嵁缂栧彿
+ private String orderNo;
// 鐗╂枡缂栧彿
private String matnr;
@@ -33,6 +39,10 @@
// 鐗╂枡鏁伴噺
private Double anfme;
+ private Double weight;
+
+ private String memo;
+
}
}
--
Gitblit v1.9.1