From 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:29:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 23 ++++++++++++++++++++---
1 files changed, 20 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..472fe59 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity.param;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -11,10 +12,16 @@
public class CombParam {
// 鍗曟嵁缂栧彿
+ private String billNo;
+
+ // 鍗曟嵁缂栧彿
private String orderNo;
// 鎵樼洏鏉＄爜
private String barcode;
+
+ // 搴撲綅缂栧彿
+ private String locno;
private List<CombMat> combMats;
@@ -22,13 +29,23 @@
public static class CombMat {
// 鐗╂枡缂栧彿
- private String matNo;
+ private String matnr;
- // 鎵瑰彿
+
+ // 搴忓垪鐮�
+ private String itemBatch;
+
+ // 搴忓垪鐮�
private String batch;
// 鐗╂枡鏁伴噺
- private Double count;
+ private Double anfme;
+
+ // 鍟嗗搧鍚嶇О
+ private String maktx;
+
+ // 瑙勬牸
+ private String specs;
}
--
Gitblit v1.9.1