From 7ad4b3cb3848a8a3ee18f117f453060b9530bfba Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 31 七月 2023 09:46:24 +0800
Subject: [PATCH] 新增贝博粮情协议--整体框架提交
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 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 39ad1ad..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;
}
@@ -148,7 +161,7 @@
*/
public String outWeightBill(InoutData data) {
// 鑾峰彇琛ㄥ崟鏁版嵁
- WeightBill bill = this.createBillData(data, "鍑哄簱绉伴噸鍗�");
+ WeightBill bill = this.createBillData(data, "鍑哄簱鍒掔爜鍗�");
//榛樿妯＄増
String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT;
@@ -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());
@@ -190,7 +210,7 @@
htmlStr = htmlStr.replace("fullTime", bill.getFullTime());
htmlStr = htmlStr.replace("emptyTime", bill.getEmptyTime());
htmlStr = htmlStr.replace("serId", bill.getSerId());
- htmlStr = htmlStr.replace("specType", bill.getSpecType());
+// htmlStr = htmlStr.replace("specType", bill.getSpecType());
htmlStr = htmlStr.replace("customerName", bill.getCustomerName());
htmlStr = htmlStr.replace("deptName", bill.getUnitName());
@@ -212,18 +232,24 @@
new DecimalFormat("0").format(bill.getNetWeight()));
htmlStr = htmlStr.replace("remark", bill.getRemark());
- htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");
+// htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");
htmlStr = htmlStr.replace("settleWeight",
new DecimalFormat("0").format(bill.getSettleWeight()));
-
+ htmlStr = htmlStr.replace("deHandle", bill.getDeHandle() + "");
htmlStr = htmlStr.replace("handleUser", bill.getHandleUser());
htmlStr = htmlStr.replace("deSum", bill.getDeSum() + "");
-
+ htmlStr = htmlStr.replace("deOther", bill.getDeOther() + "");
htmlStr = htmlStr.replace("price", bill.getPrice());
htmlStr = htmlStr.replace("settleMoney", bill.getSettleMoney() + "");
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