From d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 14 +++++++++++---
1 files changed, 11 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..277e87f 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,27 @@
// 鎵樼洏鏉＄爜
private String barcode;
+ // 鏄惁鍐荤粨
+ private Integer frozen;
+
private List<CombMat> combMats;
@Data
public static class CombMat {
// 鐗╂枡缂栧彿
- private String matNo;
+ private String matnr;
- // 鎵瑰彿
+ // 搴忓垪鐮�
private String batch;
// 鐗╂枡鏁伴噺
- private Double count;
+ private Double anfme;
+
+ // 澶囨敞
+ private String memo;
+
+ private String cstmr;
}
--
Gitblit v1.9.1