From c688ad2d55d6a5355e0e75402177f3e7989600bc Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 08 一月 2025 16:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 1e5e90a..da2dacb 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,33 @@
// 鎵樼洏鏉＄爜
private String barcode;
+ // 搴撲綅缂栧彿
+ private String locno;
+
+// // 璐т富
+// private int owner;
+
private List<CombMat> combMats;
@Data
public static class CombMat {
+ // 鍗曟嵁缂栧彿
+ private String orderNo;
+
// 鐗╂枡缂栧彿
private String matnr;
- // 鎵瑰彿
+ // 搴忓垪鐮�
private String batch;
// 鐗╂枡鏁伴噺
private Double anfme;
+ private Double weight;
+
+ private String memo;
+
}
}
--
Gitblit v1.9.1