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 | 12 +++++++++---
1 files changed, 9 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 a8880ee..af763b6 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -11,7 +11,7 @@
public class CombParam {
// 鍗曟嵁缂栧彿
- private String orderNo;
+ //private String orderNo;
// 鎵樼洏鏉＄爜
private String barcode;
@@ -25,8 +25,7 @@
@Data
public static class CombMat {
- // 鏉＄爜
- private String vbarcode;
+ private Long id;
private String orderNo;
@@ -47,6 +46,13 @@
// 鐗╂枡鏁伴噺
private Double anfme;
+
+ // 鐗╂枡杈呮暟閲�
+ private Double weight;
+
+ // 鐗╂枡鏁伴噺
+ private Double enableQty;
+
// 鍟嗗搧鍚嶇О
private String maktx;
--
Gitblit v1.9.1