From 852a9ee80fe79ac87854b8b46ad67ac857a56fc6 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 20 七月 2023 21:05:57 +0800
Subject: [PATCH] 出入库单据模板
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 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 9023442..1eadec8 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
@@ -84,6 +84,14 @@
if ("5322".equals(data.getCompanyId())) {
htmlStr = InoutBill.IN_WEIGHT_5322;
}
+ // 鐪夊北甯傚簱浣跨敤
+ if ("5005".equals(data.getCompanyId())) {
+ htmlStr = InoutBill.IN_WEIGHT_5005;
+ }
+ // 涓规１搴撲娇鐢�
+ if ("5012".equals(data.getCompanyId())) {
+ htmlStr = InoutBill.IN_WEIGHT_5012;
+ }
htmlStr = htmlStr.replace("billTitle", bill.getBillTitle());
@@ -104,6 +112,7 @@
htmlStr = htmlStr.replace("foodVariety", bill.getFoodVariety());
htmlStr = htmlStr.replace("depotName", bill.getDepotName());
htmlStr = htmlStr.replace("foodLocation", bill.getFoodLocation());
+
htmlStr = htmlStr.replace("plateNum", bill.getPlateNum());
htmlStr = htmlStr.replace("fullWeight",
@@ -135,8 +144,12 @@
htmlStr = htmlStr.replace("remark", bill.getRemark());
htmlStr = htmlStr.replace("moneyName", bill.getMoneyName());
- htmlStr = htmlStr.replace("handleUser", bill.getHandleUser());
-
+ htmlStr = htmlStr.replaceAll("weightUser",
+ bill.getWeightUser() == null ? "" : bill.getWeightUser());
+ htmlStr = htmlStr.replaceAll("handleUser",
+ bill.getHandleUser() == null ? "" : bill.getHandleUser());
+ htmlStr = htmlStr.replaceAll("keeperName",
+ bill.getKeeperUser() == null ? "" : bill.getKeeperUser());
return htmlStr;
}
@@ -182,7 +195,14 @@
if ("5322".equals(data.getCompanyId())) {
htmlStr = InoutBill.OUT_WEIGHT_5322;
}
-
+ // 鐪夊北甯傚簱浣跨敤
+ if ("5005".equals(data.getCompanyId())) {
+ htmlStr = InoutBill.OUT_WEIGHT_5005;
+ }
+ // 涓规１搴撲娇鐢�
+ if ("5012".equals(data.getCompanyId())) {
+ htmlStr = InoutBill.OUT_WEIGHT_5012;
+ }
htmlStr = htmlStr.replace("billTitle", bill.getBillTitle());
htmlStr = htmlStr.replace("registerTime", bill.getRegisterTime());
@@ -224,6 +244,12 @@
htmlStr = htmlStr.replace("wet", bill.getWet() + "");
htmlStr = htmlStr.replace("impurity", bill.getImpurity() + "");
+ htmlStr = htmlStr.replaceAll("weightUser",
+ bill.getWeightUser() == null ? "" : bill.getWeightUser());
+ htmlStr = htmlStr.replaceAll("handleUser",
+ bill.getHandleUser() == null ? "" : bill.getHandleUser());
+ htmlStr = htmlStr.replaceAll("keeperName",
+ bill.getKeeperUser() == null ? "" : bill.getKeeperUser());
return htmlStr;
}
@@ -322,6 +348,15 @@
bill.setSettleMoney(data.getSettleMoney() == null ? "" : data.getSettleMoney() + "");
bill.setRemark(data.getRemarks() == null ? "" : data.getRemarks());
+
+ if(InoutConstant.TYPE_IN.equals(data.getType())){
+ bill.setWeightUser(data.getFullWeightUser());
+ }
+ if(InoutConstant.TYPE_OUT.equals(data.getType())){
+ bill.setWeightUser(data.getEmptyWeightUser());
+ }
+ bill.setHandleUser(data.getHandleUser());
+ bill.setKeeperUser(depot.getStoreKeeperName());
return bill;
}
--
Gitblit v1.9.3