From dde5bc0ac38319b02e41c9d28c9fc1dcdbba1359 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 30 六月 2023 09:32:46 +0800
Subject: [PATCH] 补单提交后刷新
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 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..4a296b2 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());
@@ -261,7 +267,6 @@
bill.setFullTime(DateFormatUtils.format(data.getFullWeightTime(),
"yyyy-MM-dd HH:mm:ss"));
bill.setSerId(data.getId());
-// bill.setSpecType(StringUtils.isEmpty(data.getSpecType()) ? "鏁ｇ伯" : data.getSpecType());
if ("5016".equals(data.getCompanyId())) {
bill.setCompleteTime(DateFormatUtils.format(data.getCompleteTime(), "yyyy-MM-dd"));
bill.setSerId(data.getId().substring(2));
@@ -269,7 +274,6 @@
}
//瀹㈡埛淇℃伅
- // bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());
bill.setCustomerName(data.getCustomerName() == null ? "" : data.getCustomerName());
bill.setUserId(data.getUserId() == null ? "" : data.getUserId());
bill.setUserAddress(data.getUserAddress() == null ? "" : data.getUserAddress());
@@ -300,20 +304,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.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());
+ bill.setDeHandle(data.getDeHandle());
+ bill.setDeOther(data.getDeOther());
bill.setSettleWeight(data.getSettleWeight());
-// if(data.getWet() != null && data.getWet() > 0){
-// bill.setWet(data.getWet() +"");
-// }
-// if(data.getImpurity() != null && data.getImpurity() > 0){
-// bill.setImpurity(data.getImpurity()+"");
-// }
bill.setPrice(data.getPrice() == null ? "" : data.getPrice() + "");
if (data.getSettleMoney() <= 0) {
--
Gitblit v1.9.3