From f27f3ea5055888f7f1c797d0fd7fb26a2013c89c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 19:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/inout/dto/InoutParam.java | 85 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/inout/dto/InoutParam.java b/igds-core/src/main/java/com/ld/igds/inout/dto/InoutParam.java
index 084299f..e42e3de 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/dto/InoutParam.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/dto/InoutParam.java
@@ -10,79 +10,80 @@
/**
* 鍑哄叆搴撶殑椤甸潰鍙傛暟瀹氫箟
- *
- * @author jiazx
*
+ * @author jiazx
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class InoutParam extends BaseParam {
- public String plateNum;// 杞︾墝鍙�
+ public String plateNum;// 杞︾墝鍙�
- private String intelCard;// 鏅烘収鍗″彿
+ private String intelCard;// 鏅烘収鍗″彿
- private String id;// 娴佹按鍙�
+ private String id;// 娴佹按鍙�
- private String progress;// 褰撳墠鎵�鍦ㄦ祦绋�
+ private String progress;// 褰撳墠鎵�鍦ㄦ祦绋�
- private String type;// 涓氬姟鏁版嵁绫诲瀷锛屽嚭搴撴垨鑰呭叆搴�
+ private String type;// 涓氬姟鏁版嵁绫诲瀷锛屽嚭搴撴垨鑰呭叆搴�
- private String checkId;// 鍖栭獙鍗曞彿
+ private String checkId;// 鍖栭獙鍗曞彿
- @PropertyDef(label = "鍝佺")
- private String foodVariety;
+ @PropertyDef(label = "鍝佺")
+ private String foodVariety;
- @PropertyDef(label = "绫诲瀷")
- private String foodType;
+ @PropertyDef(label = "绫诲瀷")
+ private String foodType;
- private String checkStatus;
+ private String checkStatus;
- private String customerName;
+ private String customerName;
- private String customerId;
+ private String customerId;
- private String recordStatus;
+ private String recordStatus;
- private String msg;
-
- private String userId;//鐧婚檰浜篒D
+ private String msg;
- private double curStorage=0.0;//褰撳墠搴撳瓨鑾峰彇鎹熸孩鐨勫簱瀛�
+ private String userId;//鐧婚檰浜篒D
- private String year; // 骞翠唤
-
- private String deptId;// 鎵�灞炲垎搴�
-
- private String orderTag = "DESC";
-
- private double weight;//閲嶉噺淇℃伅
+ private double curStorage = 0.0;//褰撳墠搴撳瓨鑾峰彇鎹熸孩鐨勫簱瀛�
- private Double de;
+ private String year; // 骞翠唤
- private Double fullWeight;
+ private String deptId;// 鎵�灞炲垎搴�
- private String fullWeightUser;
+ private String orderTag = "DESC";
- private Date fullWeightTime;
+ private double weight;//閲嶉噺淇℃伅
- private Double emptyWeight;
+ private Double de;
- private Date emptyWeightTime;
+ private Double fullWeight;
- private Date completeTime;
+ private String fullWeightUser;
- private String emptyWeightUser;
+ private Date fullWeightTime;
- private Double netWeight;
+ private Double emptyWeight;
- private Double settleWeight;
- private Double recordWeight;
+ private Date emptyWeightTime;
- //鏄惁缁撶畻
- private String settleTag;
+ private Date completeTime;
- private Double price;
+ private String emptyWeightUser;
- private Double settleMoney;
+ private Double netWeight;
+
+ private Double settleWeight;
+ private Double recordWeight;
+
+
+ private Double price;
+
+ private String settleBizType;
+
+ private Double settleMoney;
+
+ private Date updateTime = new Date();
}
--
Gitblit v1.9.3