From fd827141a7f5004bb17e44b04cadecadb0099d60 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 29 六月 2023 18:17:36 +0800
Subject: [PATCH] 合同管理调整
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
index 4abd844..99927be 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
@@ -116,6 +116,11 @@
htmlStr = htmlStr.replace("deImpurity", bill.getDeImpurity() + "");
htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");
+
+ htmlStr = htmlStr.replace("recordWeight", bill.getRecordWeight() + "");
+ htmlStr = htmlStr.replace("deCheck", bill.getDeCheck() + "");
+ htmlStr = htmlStr.replace("addCheck", bill.getAddCheck() + "");
+
htmlStr = htmlStr.replace("deSum", bill.getDeSum() + "");
htmlStr = htmlStr.replace("settleWeight",
new DecimalFormat("0").format(bill.getSettleWeight()));
@@ -127,6 +132,7 @@
htmlStr = htmlStr.replace("wet", bill.getWet() + "");
htmlStr = htmlStr.replace("impurity", bill.getImpurity() + "");
+ htmlStr = htmlStr.replace("checkStatus", bill.getCheckStatus());
htmlStr = htmlStr.replace("remark", bill.getRemark());
htmlStr = htmlStr.replace("moneyName", bill.getMoneyName());
@@ -300,11 +306,15 @@
bill.setFullWeight(data.getFullWeight());
bill.setEmptyWeight(data.getEmptyWeight());
bill.setNetWeight(data.getNetWeight());
+ bill.setDeCheck(data.getDeCheck());
+ bill.setAddCheck(data.getAddCheck());
+ bill.setRecordWeight(data.getRecordWeight());
+ bill.setCheckStatus(data.getCheckStatus().equals(InoutConstant.STATUS_PASS) ? "鍚堟牸" : "涓嶅悎鏍�");
// bill.setDeWet(data.getDeWet());
// bill.setDeImpurity(data.getDeImpurity());
-// bill.setDeHandle(data.getDeHandle());
-// bill.setDeOther(data.getDeOther());
+ bill.setDeHandle(data.getDeHandle());
+ bill.setDeOther(data.getDeOther());
// bill.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());
bill.setSettleWeight(data.getSettleWeight());
--
Gitblit v1.9.3