From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 11 +++++++++++
1 files changed, 11 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 84a4927..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,10 +16,19 @@
// 鎵樼洏鏉＄爜
private String barcode;
+ // 搴撲綅缂栧彿
+ private String locno;
+
+// // 璐т富
+// private int owner;
+
private List<CombMat> combMats;
@Data
public static class CombMat {
+
+ // 鍗曟嵁缂栧彿
+ private String orderNo;
// 鐗╂枡缂栧彿
private String matnr;
@@ -30,6 +39,8 @@
// 鐗╂枡鏁伴噺
private Double anfme;
+ private Double weight;
+
}
}
--
Gitblit v1.9.1