From 58f63e3a124680d0b1f571f5d0a1e3ed308d43be Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 20 三月 2026 14:45:34 +0800
Subject: [PATCH] 质押合同页面重构
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/bill/InoutBill.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 05d4221..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
@@ -10,14 +10,20 @@
/**
* 榛樿鍏ュ簱杩囩鍗�
*/
- 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><div style=\"text-align: left;font-size: 12px\"><span>娉細</span></div><div style=\"text-align: left;font-size: 12px\"><span>1.鍑�閲�=姣涢噸-鐨噸锛涜川妫�澧炴墸閲嶆牴鎹川妫�璇︾粏濉啓锛�</span></div><div style=\"text-align: left;font-size: 12px\"><span>2.鍏ュ簱閲嶉噺=鍑�閲�-鎵ｉ噸锛涚粨绠楅噸閲�=鍏ュ簱閲嶉噺+璐ㄦ澧為噸锛�</span></div><div style=\"text-align: left;font-size: 12px\"><span>3.鐧借仈锛堝瓨鏍癸級锛岀孩鑱旓紙璁拌处锛夛紝榛勮仈锛堝鎴蜂繚鐣欙級</span></div></body></html>";
+ 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><div style=\"text-align: left;font-size: 12px\"><span>娉細</span></div><div style=\"text-align: left;font-size: 12px\"><span>1.鍑�閲�=姣涢噸-鐨噸锛�</span></div><div style=\"text-align: left;font-size: 12px\"><span>2.鍑哄簱閲嶉噺=鍑�閲�-鎬绘墸閲嶏紱缁撶畻閲嶉噺=鍑�閲�-鎬绘墸閲嶏紱</span></div><div style=\"text-align: left;font-size: 12px\"><span>3.鐧借仈锛堝瓨鏍癸級锛岀孩鑱旓紙璁拌处锛夛紝榛勮仈锛堝鎴蜂繚鐣欙級</span></div></html>";
+ 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>";
/**
* 榛樿缁撶畻鍗�
*/
- public static String IN_SETTLE_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:50%;float:left;text-align:center}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>缁撶畻鏃堕棿锛歱ayTime</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 colspan='3'width='37.5%'>bank</td><td>姣涢噸(KG)</td><td>fullWeight</td><td>鐨噸(KG)</td><td>emptyWeight</td></tr><tr><td width='12.5%'>閾惰鍗″彿</td><td colspan='3'width='37.5%'>banNum</td><td>鍑�閲�(KG)</td><td>netWeight</td><td>鎬绘墸閲�(KG)</td><td>deSum</td></tr><tr><td>鍏ュ簱浠撳簱</td><td>depotName</td><td>绮鍝佺</td><td>foodVariety</td><td>绮鍗曚环</td><td>payPrice</td><td>缁撶畻閲嶉噺</td><td>settleWeight</td></tr><tr><td>淇濈鍛�</td><td>keeperName</td><td>鎵胯繍浜�</td><td>driverName</td><td>鍏朵粬璐圭敤</td><td>otherSum</td><td>缁撶畻璐圭敤</td><td>paySum</td></tr><tr><td>澶囨敞</td><td colspan='3'>remark</td><td>澶у啓閲戦</td><td colspan='3'>moneyName</td></tr></table><div class='div-tit'><span class=\"sp2\">鏀惰揣鍗曚綅绛惧瓧锛�</span><span class=\"sp2\">瀹㈡埛绛惧瓧锛�</span></div></body></html>";
+ public static String IN_SETTLE_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;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><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'><tr><td>瀹㈡埛鍚嶇О</td><td colspan='7'>[customerName]</td></tr><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><tr><td>韬唤璇佸彿鐮�</td><td colspan='3'>[userId]</td><td>杞︾墝鍙�</td><td colspan='3'>[plateNum]</td></tr><tr><td>浠撳簱</td><td colspan='3'>[depotId]</td><td>绮鍚嶇О</td><td colspan='3'>[foodVariety]</td></tr><tr><td>澶囨敞</td><td colspan=\"7\">[remark]</td></tr><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></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>";
+
}
--
Gitblit v1.9.3