From a4d1e11a3ee5739d0f3089c53510baad571d9427 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 19 十月 2023 19:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java b/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java
index 55829ea..a75caef 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java
@@ -6,6 +6,7 @@
/**
* 绉伴噸鍗曚俊鎭皝瑁�
+ *
* @author chen
*/
@Data
@@ -38,6 +39,9 @@
private String unitName = "";
private String deptId = "";
+ private String weightUser = "";//绉伴噸浜�
+
+ private String keeperUser = "";//淇濈鍛�
//鎵胯繍浜�
private String driverName = "";
private String userId = "";
@@ -57,6 +61,14 @@
private double emptyWeight = 0.0;
//鍑�閲�
private double netWeight = 0.0;
+ //璐ㄦ鎵ｉ噸
+ private double deCheck = 0.0;
+ //璐ㄦ澧為噸
+ private double addCheck = 0.0;
+ //璐ㄦ缁撴灉
+ private String checkStatus;
+ //鍏ュ簱閲嶉噺
+ private double recordWeight = 0.0;
//姘村垎澧炴墸閲�
private double deWet = 0.0;
//鏉傝川澧炴墸閲�
@@ -76,12 +88,12 @@
//缁撶畻閲嶉噺
private double settleWeight = 0.0;
//鍗曚环
- private String price ="";
+ private String price = "";
//澶у啓閲戦
- private String moneyName ="";
+ private String moneyName = "";
//澶囨敞
private String remark = "";
//淇濈鍛�
- private String handleUser;
+ private String handleUser = "";
}
--
Gitblit v1.9.3