From 9e02c41bbc10752e066917c4237275f5031960f4 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 24 八月 2023 11:45:19 +0800
Subject: [PATCH] 地磅单增加字段
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 13 +++++++++++--
igds-protocol-block/src/main/java/com/ld/igds/protocol/quantity/shuhan/server/ShuhanServerEngine.java | 2 +-
2 files changed, 12 insertions(+), 3 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 d04efe0..757202e 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
@@ -144,6 +144,11 @@
htmlStr = htmlStr.replace("remark", bill.getRemark());
htmlStr = htmlStr.replace("moneyName", bill.getMoneyName());
+ htmlStr = htmlStr.replace("unitName", bill.getUnitName());
+ htmlStr = htmlStr.replace("time", bill.getRegisterTime());
+ htmlStr = htmlStr.replace("handleStart", "");
+ htmlStr = htmlStr.replace("handleEnd", "");
+
htmlStr = htmlStr.replaceAll("weightUser",
bill.getWeightUser() == null ? "" : bill.getWeightUser());
htmlStr = htmlStr.replaceAll("handleUser",
@@ -243,6 +248,11 @@
htmlStr = htmlStr.replace("settleMoney", bill.getSettleMoney() + "");
htmlStr = htmlStr.replace("wet", bill.getWet() + "");
htmlStr = htmlStr.replace("impurity", bill.getImpurity() + "");
+
+ htmlStr = htmlStr.replace("unitName", bill.getUnitName());
+ htmlStr = htmlStr.replace("time", bill.getRegisterTime());
+ htmlStr = htmlStr.replace("handleStart", "");
+ htmlStr = htmlStr.replace("handleEnd", "");
htmlStr = htmlStr.replaceAll("weightUser",
bill.getWeightUser() == null ? "" : bill.getWeightUser());
@@ -347,7 +357,7 @@
}
bill.setSettleMoney(data.getSettleMoney() == null ? "" : data.getSettleMoney() + "");
bill.setRemark(data.getRemarks() == null ? "" : data.getRemarks());
-
+ bill.setDeSum(data.getDeCheck() + data.getDeOther() + data.getDeHandle() + data.getDePackage());
if(InoutConstant.TYPE_IN.equals(data.getType())){
bill.setWeightUser(data.getFullWeightUser());
@@ -839,6 +849,5 @@
List<String> strings3 = result.subList(6, 8);
System.out.println(strings3);
}
-
}
\ No newline at end of file
diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/quantity/shuhan/server/ShuhanServerEngine.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/quantity/shuhan/server/ShuhanServerEngine.java
index fe073c9..3891502 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/quantity/shuhan/server/ShuhanServerEngine.java
+++ b/igds-protocol-block/src/main/java/com/ld/igds/protocol/quantity/shuhan/server/ShuhanServerEngine.java
@@ -50,7 +50,7 @@
log.info("* ========================");
log.info("* ");
- log.info("* 鏁伴噺鐩戞祴鏈嶅姟鍚姩锛岀鍙ｅ彿={}", port);
+ log.info("* 铚�姹夋暟閲忕洃娴嬫湇鍔″惎鍔紝绔彛鍙�={}", port);
log.info("* ");
log.info("* ========================");
--
Gitblit v1.9.3