From abf0b44fe291299f8440b84cc185a1205ece7096 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 26 二月 2026 17:11:47 +0800
Subject: [PATCH] 出入库过磅单打印模板修改
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java | 22 +++--
fzzy-igdss-web/src/main/resources/templates/print/pay.html | 153 ++++++++++++++++++++++---------------
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutPrintBill.java | 6 +
fzzy-igdss-core/src/main/java/com/fzzy/igds/bill/InoutBill.java | 5 +
4 files changed, 111 insertions(+), 75 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/bill/InoutBill.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/bill/InoutBill.java
index 9236e64..d5da1c7 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/bill/InoutBill.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/bill/InoutBill.java
@@ -11,11 +11,16 @@
* 榛樿鍏ュ簱杩囩鍗�
*/
public static String IN_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>鍏ュ簱杩囩鍗�</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'瀹嬩綋';padding-top:15px}.div-tit{padding-top:10px}table{width:100%;border-right:1px solid;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}.sp1{width:50%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}</style></head><body><h1 class='tit'>billTitle</h1><div id=\"print_main\"class='div-tit'><span class='sp1'>瀹屾垚鏃堕棿锛�<a>completeTime</a></span><span class='sp1'>鍗曞彿锛歴erId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>鍙戣揣鍗曚綅</td><td colspan='3'width='37.5%'>customerName</td><td width='12.5%'>鏀惰揣鍗曚綅</td><td colspan='3'`width`='37.5%'>deptName</td></tr><tr><td width='12.5%'>鎵胯繍浜�</td><td width='12.5%'>driverName</td><td width='12.5%'>绮鍝佺</td><td width='12.5%'>foodVariety</td><td width='12.5%'>瑁呭嵏浠撳簱</td><td width='12.5%'>depotName</td><td width='12.5%'>绮浜у湴</td><td width='12.5%'>foodLocation</td></tr><tr><td>鎵胯繍杞︾墝</td><td>plateNum</td><td>姣涢噸(KG)</td><td>fullWeight</td><td>鐨噸(KG)</td><td>emptyWeight</td><td>鍑�閲�(KG)</td><td>netWeight</td></tr><tr><td>璐ㄦ鎵ｉ噸(KG)</td><td>deCheck</td><td>璐ㄦ澧為噸(KG)</td><td>addCheck</td><td>鍊间粨鎵ｉ噸(KG)</td><td>deHandle</td><td>鍏朵粬鎵ｉ噸(KG)</td><td>deOther</td></tr><tr><td>璐ㄦ缁撴灉</td><td colspan='3'>checkStatus</td><td>鍏ュ簱閲嶉噺(KG)</td><td>recordWeight</td><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</td></tr><tr><td>澶囨敞</td><td colspan='7'>remark</td></tr></table><div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>鐩戠鍛橈細</span><span class='sp2'>淇濈鍛橈細handleUser</span><span class='sp2'>鎵胯繍浜猴細driverName</span></div></br><div style=\"padding-top: 10px\"><span></span></div></body></html>";
+
+ //鏂扮枂瀹氬埗鍏ュ簱杩囩鍗�
+ public static String IN_WEIGHT_DEFAULT_NEW = "<!doctypehtml><html lang=zh-cn><meta content=\"text/html;charset=UTF-8\"http-equiv=Content-Type><title>鍏ュ簱杩囩鍗�</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'瀹嬩綋';padding-top:15px}.div-tit{padding-top:10px}table{width:100%;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}.sp1{width:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}.no-border td{border:none}.border_right{border-right:1px solid}</style><h1 class=tit>billTitle</h1><table cellpadding=0 cellspacing=0><tr class=no-border><td colspan=2>纾呭崟鍙凤細serId<td colspan=2>鍗曚綅锛欿G<td colspan=2>鎵撳嵃鏃ユ湡锛歱rintTime<tr><td>杞︾墝鍙�<td>plateNum<td>璐х墿鍚嶇О<td>foodVariety<td>鎵�灞炰粨搴�<td class=border_right>depotName<tr><td>姣涢噸鏃堕棿<td>fullTime<td>姣涢噸<td>fullWeight<td>鍗曚环(鍏�/KG)<td class=border_right>price<tr><td>鐨噸鏃堕棿<td>emptyTime<td>鐨噸<td>emptyWeight<td>缁撶畻閲戦<td class=border_right>settleMoney<tr><td>鎵ｉ噸锛堟潅锛�<td><td>鍑�閲�<td>netWeight<td>瀹㈡埛鍚嶇О<td class=border_right>customerName<tr><td>姘村垎<td><td>澶囨敞<td class=border_right colspan=3>remark<tr><td>鍒惰〃浜�<td>createUser<td>鍙告満绛惧悕<td><td>鍙告満鐢佃瘽<td class=border_right>userContact</table><div style=padding-top:10px><span></span></div>";
/**
* 榛樿鍑哄簱杩囩鍗�
*/
public static String OUT_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>鍑哄簱绉伴噸鍗�</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'瀹嬩綋';padding-top:15px}.div-tit{padding-top:10px}.sp1{width:50%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}table{width:100%;border-right:1px solid;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>瀹屾垚鏃堕棿锛歝ompleteTime</span><span class='sp1'>鍑哄簱鍗曞彿锛歴erId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>鍙戣揣鍗曚綅</td><td colspan='3'width='37.5%'>deptName</td><td width='12.5%'>鏀惰揣鍗曚綅</td><td colspan='3'width='37.5%'>customerName</td></tr><tr><td width='12.5%'>鎵胯繍浜�</td><td width='12.5%'>driverName</td><td width='12.5%'>绮鍝佺</td><td width='12.5%'>foodVariety</td><td width='12.5%'>鍑哄簱浠撳簱</td><td width='12.5%'>depotName</td><td width='12.5%'>绮浜у湴</td><td width='12.5%'>foodLocation</td></tr><tr><td>鎵胯繍杞︾墝</td><td>plateNum</td><td>姣涢噸(KG)</td><td>fullWeight</td><td>鐨噸(KG)</td><td>emptyWeight</td><td>鍑�閲�(KG)</td><td>netWeight</td></tr><tr><td>鍏朵粬鎵ｉ噸(KG)</td><td>deOther</td><td>鍊间粨鎵ｉ噸(KG)</td><td>deHandle</td><td>鍑哄簱閲嶉噺(KG)</td><td>recordWeight</td><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</td></tr><tr><td>澶囨敞</td><td colspan='7'>remark</td></tr></table><div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>鐩戠鍛橈細</span><span class='sp2'>淇濈鍛橈細handleUser</span><span class='sp2'>鎵胯繍浜猴細driverName</span></div><br></body><div style=\"padding-top: 10px\"><span></span></div></html>";
+ //鏂扮枂瀹氬埗鍑哄簱杩囩鍗�
+ public static String OUT_WEIGHT_DEFAULT_NEW = "<!doctypehtml><html lang=zh-cn><meta content=\"text/html;charset=UTF-8\"http-equiv=Content-Type><title>鍏ュ簱杩囩鍗�</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'瀹嬩綋';padding-top:15px}.div-tit{padding-top:10px}table{width:100%;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}.sp1{width:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}.no-border td{border:none}.border_right{border-right:1px solid}</style><h1 class=tit>billTitle</h1><table cellpadding=0 cellspacing=0><tr class=no-border><td colspan=2>纾呭崟鍙凤細serId<td colspan=2>鍗曚綅锛欿G<td colspan=2>鎵撳嵃鏃ユ湡锛歱rintTime<tr><td>杞︾墝鍙�<td>plateNum<td>璐х墿鍚嶇О<td>foodVariety<td>鎵�灞炰粨搴�<td class=border_right>depotName<tr><td>姣涢噸鏃堕棿<td>fullTime<td>姣涢噸<td>fullWeight<td>鍗曚环(鍏�/KG)<td class=border_right>price<tr><td>鐨噸鏃堕棿<td>emptyTime<td>鐨噸<td>emptyWeight<td>缁撶畻閲戦<td class=border_right>settleMoney<tr><td>鎵ｉ噸锛堟潅锛�<td><td>鍑�閲�<td>netWeight<td>瀹㈡埛鍚嶇О<td class=border_right>customerName<tr><td>姘村垎<td><td>澶囨敞<td class=border_right colspan=3>remark<tr><td>鍒惰〃浜�<td>createUser<td>鍙告満绛惧悕<td><td>鍙告満鐢佃瘽<td class=border_right>userContact</table><div style=padding-top:10px><span></span></div>";
/**
* 榛樿缁撶畻鍗�
*/
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutPrintBill.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutPrintBill.java
index 43c9f4e..34d3168 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutPrintBill.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutPrintBill.java
@@ -25,9 +25,9 @@
private String registerTime = "";
//瀹屾垚鏃堕棿
private String completeTime = "";
- //瀹屾垚鏃堕棿
+ //姣涢噸绉伴噸鏃堕棿
private String fullTime = "";
- //瀹屾垚鏃堕棿
+ //鐨噸绉伴噸鏃堕棿
private String emptyTime = "";
//娴佹按鍗曞彿
private String serId = "";
@@ -99,6 +99,8 @@
private String remark = "";
//淇濈鍛�
private String handleUser = "";
+ //鍒惰〃浜�
+ private String createUser = "";
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
index d52f37d..6413c9d 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
@@ -687,10 +687,10 @@
public String inWeightBill(InoutRecord data) {
// 鑾峰彇琛ㄥ崟鏁版嵁
- InoutPrintBill bill = this.createBillData(data, "-鍏ュ簱鍗�");
+ InoutPrintBill bill = this.createBillData(data, "鍏ュ簱鍗�");
// 璋冩暣妯＄増鏁版嵁骞惰繑鍥�
- String htmlStr = InoutBill.IN_WEIGHT_DEFAULT;
+ String htmlStr = InoutBill.IN_WEIGHT_DEFAULT_NEW;
htmlStr = htmlStr.replace("billTitle", bill.getBillTitle());
@@ -748,7 +748,7 @@
htmlStr = htmlStr.replace("handleEnd", "");
htmlStr = htmlStr.replace("noticeId", bill.getNoticeId() == null ? "" : bill.getNoticeId());
htmlStr = htmlStr.replace("phone", data.getUserContact() == null ? "" : data.getUserContact() + "");
- htmlStr = htmlStr.replace("printTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm"));
+ htmlStr = htmlStr.replace("printTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
htmlStr = htmlStr.replaceAll("weightUser",
bill.getWeightUser() == null ? "" : bill.getWeightUser());
@@ -756,7 +756,7 @@
bill.getHandleUser() == null ? "" : bill.getHandleUser());
htmlStr = htmlStr.replaceAll("keeperName",
bill.getKeeperUser() == null ? "" : bill.getKeeperUser());
-
+ htmlStr = htmlStr.replaceAll("createUser",ContextUtil.getLoginUserName());
return htmlStr;
}
@@ -769,10 +769,10 @@
*/
public String outWeightBill(InoutRecord data) {
// 鑾峰彇琛ㄥ崟鏁版嵁
- InoutPrintBill bill = this.createBillData(data, "-鍑哄簱鍗�");
+ InoutPrintBill bill = this.createBillData(data, "鍑哄簱鍗�");
//榛樿妯＄増
- String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT;
+ String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT_NEW;
htmlStr = htmlStr.replace("billTitle", bill.getBillTitle());
@@ -821,11 +821,13 @@
htmlStr = htmlStr.replace("handleEnd", "");
htmlStr = htmlStr.replace("noticeId", bill.getNoticeId() == null ? "" : bill.getNoticeId());
htmlStr = htmlStr.replace("phone", data.getUserContact() == null ? "" : data.getUserContact() + "");
- htmlStr = htmlStr.replace("printTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm"));
+ htmlStr = htmlStr.replace("printTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
htmlStr = htmlStr.replaceAll("weightUser", getValue(bill.getWeightUser()));
htmlStr = htmlStr.replace("handleUser", getValue(bill.getHandleUser()));
htmlStr = htmlStr.replaceAll("keeperName", getValue(bill.getKeeperUser()));
+ htmlStr = htmlStr.replaceAll("createUser",ContextUtil.getLoginUserName());
+
return htmlStr;
}
@@ -861,13 +863,13 @@
data.setRegisterTime(new Date());
}
bill.setRegisterTime(DateFormatUtils.format(data.getRegisterTime(),
- "yyyy-MM-dd HH:mm"));
+ "yyyy-MM-dd HH:mm:ss"));
if (null == data.getCompleteTime()) {
data.setCompleteTime(new Date());
}
bill.setCompleteTime(DateFormatUtils.format(data.getCompleteTime(),
- "yyyy-MM-dd HH:mm"));
+ "yyyy-MM-dd HH:mm:ss"));
bill.setEmptyTime(DateFormatUtils.format(data.getEmptyWeightTime(),
"yyyy-MM-dd HH:mm:ss"));
@@ -921,7 +923,7 @@
data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice() * data.getRecordWeight(), 2));
}
}
- bill.setSettleMoney(data.getSettleMoney() == null ? "" : data.getSettleMoney() + "");
+ bill.setSettleMoney(data.getSettleMoney() == null ? "" : String.format("%.2f", data.getSettleMoney()));
bill.setRemark(data.getRemarks() == null ? "" : data.getRemarks());
if (Constant.TYPE_IN.equals(data.getType())) {
diff --git a/fzzy-igdss-web/src/main/resources/templates/print/pay.html b/fzzy-igdss-web/src/main/resources/templates/print/pay.html
index 57a38a5..3a23159 100644
--- a/fzzy-igdss-web/src/main/resources/templates/print/pay.html
+++ b/fzzy-igdss-web/src/main/resources/templates/print/pay.html
@@ -1,72 +1,99 @@
-<!DOCTYPE html>
-<html lang='zh-cn'>
+<!doctypehtml>
+<html lang=zh-cn>
+<meta content="text/html;charset=UTF-8" http-equiv=Content-Type>
+<title>鍏ュ簱杩囩鍗�</title>
+<style>body {
+ text-align: center;
+ padding: 10px
+}
-<head>
- <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
- <title>缁撶畻鍗�</title>
- <style>
- body {text-align: center;padding: 10px;font-family: '瀹嬩綋';} .tit {font-size: 24px;flex-grow: 1;text-align: center;} .div-tit {padding-top: 6px;} table {width: 100%;border-right: 1px solid;border-bottom: 1px solid;font-size: 14px;border-collapse: collapse;} table td {border-left: 1px solid;border-top: 1px solid;height: 32px;} .sp1 {width: 33%;float: left;padding-bottom: 5px;} .sp2 {width: 25%;float: left;text-align: center;} .sp3 {width: 16.6%;float: left;text-align: center;} .txt-left {text-align: left;} .txt-center {text-align: center;} .txt-right {text-align: right;}
- </style>
-</head>
+.tit {
+ margin: 10px;
+ font-size: 24px;
+ font-family: '瀹嬩綋';
+ padding-top: 15px
+}
-<body>
-<h1 class='tit'><u>[billTitle]</u></h1>
-<div class='div-tit'><span class='sp1 txt-left'>搴撳尯鍚嶇О锛歔deptId]</span><span class='sp1 txt-center'>鍗曟嵁鍙�:[id]</span><span class='sp1 txt-right'>鎵撳嵃鏃堕棿锛歔payTime]</span></div>
-<table cellspacing='0' cellpadding='0'>
+.div-tit {
+ padding-top: 10px
+}
+
+table {
+ width: 100%;
+ border-bottom: 1px solid;
+ font-size: 14px
+}
+
+table td {
+ border-left: 1px solid;
+ border-top: 1px solid;
+ height: 38px
+}
+
+.sp1 {
+ width: 33%;
+ float: left;
+ padding-bottom: 10px
+}
+
+.sp2 {
+ width: 25%;
+ float: left;
+ text-align: center
+}
+
+.no-border td {
+ border: none
+}
+
+.border_right {
+ border-right: 1px solid
+}</style>
+<h1 class=tit>billTitle</h1>
+<table cellpadding=0 cellspacing=0>
+ <tr class=no-border>
+ <td colspan=2>纾呭崟鍙凤細serId
+ <td colspan=2>鍗曚綅锛欿G
+ <td colspan=2>鎵撳嵃鏃ユ湡锛歱rintTime
<tr>
- <td>瀹㈡埛鍚嶇О</td>
- <td colspan='7'>[customerName]</td>
- </tr>
+ <td>杞︾墝鍙�
+ <td>plateNum
+ <td>璐х墿鍚嶇О
+ <td>foodVariety
+ <td>鎵�灞炰粨搴�
+ <td class=border_right>depotName
<tr>
- <td width='12.5%'>鎵胯繍浜�</td>
- <td width='37.5%' colspan='3'>[userName]</td>
- <td width='12.5%'>鑱旂郴鐢佃瘽</td>
- <td width='37.5%' colspan='3'>[userContact]</td>
- </tr>
+ <td>姣涢噸鏃堕棿
+ <td>fullTime
+ <td>姣涢噸
+ <td>fullWeight
+ <td>鍗曚环(鍏�/KG)
+ <td class=border_right>price
<tr>
- <td>韬唤璇佸彿鐮�</td>
- <td colspan='3'>[userId]</td>
- <td>杞︾墝鍙�</td>
- <td colspan='3'>[plateNum]</td>
- </tr>
+ <td>鐨噸鏃堕棿
+ <td>emptyTime
+ <td>鐨噸
+ <td>emptyWeight
+ <td>缁撶畻閲戦
+ <td class=border_right>settleMoney
<tr>
- <td>浠撳簱</td>
- <td colspan='3'>[depotId]</td>
- <td>绮鍚嶇О</td>
- <td colspan='3'>[foodVariety]</td>
- </tr>
+ <td>鎵ｉ噸锛堟潅锛�
+ <td>
+ <td>鍑�閲�
+ <td>netWeight
+ <td>瀹㈡埛鍚嶇О
+ <td class=border_right>customerName
<tr>
- <td>澶囨敞</td>
- <td colspan="7">[remark]</td>
- </tr>
+ <td>姘村垎
+ <td>
+ <td>澶囨敞
+ <td class=border_right colspan=3>remark
<tr>
- <td colspan="8">璁￠噺淇℃伅</td>
- </tr>
- <tr>
- <td>姣涢噸</td>
- <td colspan='2'>[fullWeight]鍏枻</td>
- <td>鐨噸</td>
- <td colspan='2'>[emptyWeight]鍏枻</td>
- <td>鎵ｉ噸</td>
- <td colspan='2'>[deOther]鍏枻</td>
- </tr>
- <tr>
- <td colspan="8">缁撶畻淇℃伅</td>
- </tr>
- <tr>
- <td>鍗曚环</td>
- <td colspan='2'>[payPrice]鍏�/鍏枻</td>
- <td>缁撶畻閲嶉噺</td>
- <td colspan='2'>[settleWeight]鍏枻</td>
- <td>缁撶畻閲戦</td>
- <td colspan='2'>[payMoney]鍏�</td>
- </tr>
- <tr>
- <td>澶у啓閲戦</td>
- <td colspan="7">[payMoneyName]</td>
- </tr>
+ <td>鍒惰〃浜�
+ <td>createUser
+ <td>鍙告満绛惧悕
+ <td>
+ <td>鍙告満鐢佃瘽
+ <td class=border_right>userContact
</table>
-<div class='div-tit'><span class='sp2 txt-left '>缁撶畻鍛橈細_______</span><span class='sp2 txt-left '>淇濈鍛橈細_______</span><span class='sp2 txt-left '>瀹℃牳浜猴細_______</span><span class='sp2 txt-left '>鎵胯繍浜猴細_______</span></div>
-</body>
-
-</html>
\ No newline at end of file
+<div style=padding-top:10px><span></span></div>
\ No newline at end of file
--
Gitblit v1.9.3