From 60af4db0b445edbb2856f9bc7199a3e627d32db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 9 +++++++++
1 files changed, 9 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 d1d5cfd..97ab3b5 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -12,6 +12,9 @@
public class CombParam {
// 鍗曟嵁缂栧彿
+ private String billNo;
+
+ // 鍗曟嵁缂栧彿
private String orderNo;
// 鎵樼洏鏉＄爜
@@ -25,9 +28,15 @@
@Data
public static class CombMat {
+ private Long detlId;
+
// 鐗╂枡缂栧彿
private String matnr;
+
+ // 搴忓垪鐮�
+ private String itemBatch;
+
// 搴忓垪鐮�
private String batch;
--
Gitblit v1.9.1