From c45f2e980ff53c2e0d8a0a05480d347132a6cd3c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 29 八月 2025 16:06:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 2ebc72b..8fa2429 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -1,6 +1,5 @@
package com.zy.asrs.entity.param;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -12,18 +11,26 @@
public class CombParam {
// 鍗曟嵁缂栧彿
- private String orderNo;
+ //private String orderNo;
// 鎵樼洏鏉＄爜
private String barcode;
// 搴撲綅缂栧彿
- private String locno;
+ private String locNo;
+
+ //閫�搴撶粍鎵�
+ private String tkFlag;
+
private List<CombMat> combMats;
@Data
public static class CombMat {
+
+ private Long id;
+
+ private String orderNo;
// 鐗╂枡缂栧彿
private String matnr = "";
@@ -35,12 +42,19 @@
private String standby2 = "";
private String standby3 = "";
- private String boxType1 = "1";
- private String boxType2 = "1";
- private String boxType3 = "1";
+ private String boxType1 = "";
+ private String boxType2 = "";
+ private String boxType3 = "";
// 鐗╂枡鏁伴噺
private Double anfme;
+
+
+ // 鐗╂枡杈呮暟閲�
+ private Double weight;
+
+ // 鐗╂枡鏁伴噺
+ private Double enableQty;
// 鍟嗗搧鍚嶇О
private String maktx;
@@ -48,6 +62,12 @@
// 瑙勬牸
private String specs;
+ //
+ private String tiaoma;
+
+ //搴撳瓨鐘舵��
+ private String cstateid;
+
}
}
--
Gitblit v1.9.1