From e282fbfabb7ddf460d7232f2aa4d3f8bbdd115f2 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 15 九月 2022 14:53:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/hylyasrs' into hylyasrs
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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..e19b459 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,22 @@
// 鎵樼洏鏉＄爜
private String barcode;
+ // 搴撲綅缂栧彿
+ private String locno;
+
private List<CombMat> combMats;
@Data
public static class CombMat {
// 鐗╂枡缂栧彿
- private String matNo;
+ private String matnr;
- // 鎵瑰彿
+ // 搴忓垪鐮�
private String batch;
// 鐗╂枡鏁伴噺
- private Double count;
+ private Double anfme;
}
--
Gitblit v1.9.1