From 52b9d92b488aa1cdccbefe405571b7e9c600578b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 六月 2025 14:24:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 21 ++++++++++++++++++---
1 files changed, 18 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 62ae6b4..af763b6 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,23 @@
public class CombParam {
// 鍗曟嵁缂栧彿
- private String orderNo;
+ //private String orderNo;
// 鎵樼洏鏉＄爜
private String barcode;
// 搴撲綅缂栧彿
- private String locno;
+ private String locNo;
+
private List<CombMat> combMats;
@Data
public static class CombMat {
+
+ private Long id;
+
+ private String orderNo;
// 鐗╂枡缂栧彿
private String matnr = "";
@@ -35,9 +39,20 @@
private String standby2 = "";
private String standby3 = "";
+ private String boxType1 = "";
+ private String boxType2 = "";
+ private String boxType3 = "";
+
// 鐗╂枡鏁伴噺
private Double anfme;
+
+ // 鐗╂枡杈呮暟閲�
+ private Double weight;
+
+ // 鐗╂枡鏁伴噺
+ private Double enableQty;
+
// 鍟嗗搧鍚嶇О
private String maktx;
--
Gitblit v1.9.1