From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 71 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 12 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..f1e57fb 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,17 @@
htmlStr = htmlStr.replace("remark", bill.getRemark());
htmlStr = htmlStr.replace("moneyName", bill.getMoneyName());
- htmlStr = htmlStr.replace("handleUser", bill.getHandleUser());
+ 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",
+ bill.getHandleUser() == null ? "" : bill.getHandleUser());
+ htmlStr = htmlStr.replaceAll("keeperName",
+ bill.getKeeperUser() == null ? "" : bill.getKeeperUser());
return htmlStr;
}
@@ -148,7 +166,7 @@
*/
public String outWeightBill(InoutData data) {
// 鑾峰彇琛ㄥ崟鏁版嵁
- WeightBill bill = this.createBillData(data, "鍑哄簱绉伴噸鍗�");
+ WeightBill bill = this.createBillData(data, "鍑哄簱鍒掔爜鍗�");
//榛樿妯＄増
String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT;
@@ -182,7 +200,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 +215,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,19 +237,33 @@
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.replace("unitName", getValue(bill.getUnitName()));
+ htmlStr = htmlStr.replace("time", bill.getRegisterTime());
+ htmlStr = htmlStr.replace("handleStart", "");
+ htmlStr = htmlStr.replace("handleEnd", "");
+
+ htmlStr = htmlStr.replaceAll("weightUser", getValue(bill.getWeightUser()));
+ htmlStr = htmlStr.replace("handleUser", getValue(bill.getHandleUser()));
+ htmlStr = htmlStr.replaceAll("keeperName", getValue(bill.getKeeperUser()));
return htmlStr;
+ }
+
+
+ public String getValue(String value) {
+ if (null == value) return "";
+ return value;
}
/**
@@ -321,7 +360,16 @@
}
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());
+ }
+ if (InoutConstant.TYPE_OUT.equals(data.getType())) {
+ bill.setWeightUser(data.getEmptyWeightUser());
+ }
+ bill.setHandleUser(data.getHandleUser());
+ bill.setKeeperUser(depot.getStoreKeeperName());
return bill;
}
@@ -364,8 +412,8 @@
(dept == null ? "鍏ュ簱鍖栭獙鍗�" : dept.getName() + "鍏ュ簱鍖栭獙鍗�"));
// 鏇挎崲鍩虹鏁版嵁
- String time = DateFormatUtils.format(data.getRegisterTime(),
- "yyyy-MM-dd");
+// String time = DateFormatUtils.format(data.getRegisterTime(),
+// "yyyy-MM-dd");
String checkTime = data.getCheckTime() == null ? "-" : DateFormatUtils.format(data.getCheckTime(), "yyyy-MM-dd HH:mm:ss");
String sampleTime = data.getSampleTime() == null ? "-" : DateFormatUtils.format(data.getSampleTime(), "yyyy-MM-dd HH:mm:ss");
String reportTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss");
@@ -575,12 +623,12 @@
}
// htmlStr = htmlStr.replace("driverName", settle.getUserName() + "");
// htmlStr = htmlStr.replace("otherSum", settle.getOtherSum() + "");
- htmlStr = htmlStr.replace("paySum", settle.getPaySum() + "");
+ htmlStr = htmlStr.replace("paySum", settle.getPayMoney() + "");
htmlStr = htmlStr.replace("remark", settle.getRemarks() == null ? ""
: settle.getRemarks());
htmlStr = htmlStr.replace("moneyName",
- MoneyUtil.formatToCN(new BigDecimal(settle.getPaySum())));
+ MoneyUtil.formatToCN(new BigDecimal(settle.getPayMoney())));
return htmlStr;
}
@@ -804,6 +852,5 @@
List<String> strings3 = result.subList(6, 8);
System.out.println(strings3);
}
-
}
\ No newline at end of file
--
Gitblit v1.9.3