From 995b0d803cad76839d2d3e2308d9725cdeee4145 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 27 六月 2023 20:02:49 +0800
Subject: [PATCH] 入库问题修改2
---
igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java b/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
index 2bc8b8a..c5f3c45 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
@@ -8,14 +8,13 @@
/**
* 榛樿鍏ュ簱杩囩鍗�
*/
- 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:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>鐧昏鏃堕棿锛歳egisterTime</span><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%'>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>deWet</td><td>鏉傝川鎵ｉ噸(KG)</td><td>deImpurity</td><td>鍊间粨鎵ｉ噸(KG)</td><td>deHandle</td><td>鍏朵粬鎵ｉ噸(KG)</td><td>deOther</td></tr><tr><td>澶囨敞</td><td colspan='3'>remark</td><td>鎬绘墸閲�(KG)</td><td>deSum</td><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</td></tr></table><div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>鐩戠鍛橈細</span><span class='sp2'>淇濈鍛橈細handleUser</span><span class='sp2'>鎵胯繍浜猴細</span></div><div style=\"text-align: left;font-size: 12px\"><span>娉細姘村垎鎵ｉ噸銆佹潅璐ㄦ墸閲嶄负璐熸暟鏃讹紝琛ㄧず澧為噸銆�</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:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>鐧昏鏃堕棿锛歳egisterTime</span><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%'>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>deWet</td><td>鏉傝川鎵ｉ噸(KG)</td><td>deImpurity</td><td>鍊间粨鎵ｉ噸(KG)</td><td>deHandle</td><td>鍏朵粬鎵ｉ噸(KG)</td><td>deOther</td></tr><tr><td>澶囨敞</td><td colspan='3'>remark</td><td>鎬绘墸閲�(KG)</td><td>deSum</td><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</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><div style=\"text-align: left;font-size: 12px\"><span>娉細姘村垎鎵ｉ噸銆佹潅璐ㄦ墸閲嶄负璐熸暟鏃讹紝琛ㄧず澧為噸銆�</span></div></body></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:33%;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'>鐧昏鏃堕棿锛歳egisterTime</span><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>澶囨敞</td><td colspan='3'>remark</td><td>姘村垎澧為噸(KG)</td><td>deWet</td><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</td></tr></table><div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>鐩戠鍛橈細</span><span class='sp2'>淇濈鍛橈細handleUser</span><span class='sp2'>鎵胯繍浜猴細</span></div></body></html>";
/**
- *
* 榛樿楠屾鍗�
*/
public static String IN_CHECK_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}h1{font-weight:400;font-size:24px;margin:5px}span{padding-bottom:10px}.div-tit{padding-top:10px}.div-tit2{padding-top:30px}.fl{float:left}.fr{float:right}.fp{margin-left:145px}.f2{float:left}table{width:100%;border-right:1px solid;border-bottom:1px solid}table td{border-left:1px solid;border-top:1px solid;height:30px;font-size:14px}</style></head><body><h1>billTitle</h1><div class='div-tit'><span class='fl'>鍙戣揣鍗曚綅锛歝ustomerName</span><span>鏃堕棿锛歵ime</span><span class='fr'>鍏ュ簱鍗曞彿锛歴erId</span></div><table cellspacing='0'cellpadding='0'><tr><td>鍝佺</td><td>foodVariety</td><td>鏍峰搧鏉ユ簮</td><td>鐜板満鎵︽牱</td><td>杞︾墝鍙�</td><td>plateNum</td><td>鎵胯繍浜�</td><td>userName</td><td></td></tr><tr><td>鏀惰揣骞翠唤</td><td>foodYear</td><td>鑹叉辰姘斿懗</td><td>姝ｅ父</td><td>鍏ュ簱浠撳彿</td><td>depotName</td><td>绮鎬ц川</td><td>鍟嗗搧绮�</td><td></td></tr><tr><td>妫�楠岄」鐩�</td><td>鏍囧噯鍊�</td><td>妫�楠屽��</td><td>妫�楠岄」鐩�</td><td>鏍囧噯鍊�</td><td>妫�楠屽��</td><td>妫�楠岄」鐩�</td><td>鏍囧噯鍊�</td><td>妫�楠屽��</td></tr><tr><td>瀹归噸g/l</td><td>C03_ST</td><td>C03_VAL</td><td>姘村垎</td><td>C01_ST</td><td>C01_VAL</td><td>鏉傝川</td><td>C02_ST</td><td>C02_VAL</td></tr><tr><td>鍑虹硻鐜�%</td><td>C09_ST</td><td>C09_VAL</td><td>閰稿��</td><td>C22_ST</td><td>C22_VAL</td><td>杩囨哀鍖栧��</td><td>C23_ST</td><td>C23_VAL</td></tr><tr><td>鏁寸簿绫崇巼%</td><td>C10_ST</td><td>C10_VAL</td><td>涓嶅畬鍠勭矑%</td><td>C04_ST</td><td>C04_VAL</td><td>婧跺墏娈嬬暀閲�</td><td>C24_ST</td><td>C24_VAL</td></tr><tr><td>闈㈢瓔鍚告按閲�</td><td>C08_ST</td><td>C08_VAL</td><td>璋峰绯欑背%</td><td>C12_ST</td><td>C12_VAL</td><td>閲嶉噾灞�(闀�)</td><td>C25_ST</td><td>C25_VAL</td></tr><tr><td>鑴傝偑閰稿��</td><td>C14_ST</td><td>C14_VAL</td><td>鐢熼湁鐜�%</td><td>C29_ST</td><td>C29_VAL</td><td>榛勭矑绫�%</td><td>C11_ST</td><td>C11_VAL</td></tr><tr><td>鍛曞悙姣掔礌</td><td>C27_ST</td><td>C27_VAL</td><td>榛勬洸闇夋瘨绱燘1</td><td>C28_ST</td><td>C28_VAL</td><td>閲嶉噾灞�(鐮�)</td><td>C30_ST</td><td>C30_VAL</td></tr><tr><td>鐜夌背璧ら湁鐑叜</td><td>C31_ST</td><td>C31_VAL</td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td colspan=鈥�2鈥�>妫�楠岀粨璁哄強寤鸿</td><td rowspan='8'colspan='8'></td></tr></table><div class='div-tit'><span class='fl'>妫�楠屽憳锛歝heckUser</span><span class='fr'>鎵胯繍浜虹瀛楋細 </span></div></body></html>";
@@ -68,7 +67,6 @@
public static String IN_WEIGHT_5322 = "<!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:5px;font-size:24px;font-family:'瀹嬩綋';padding-top:10px}.div-tit{padding-top:6px}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:32px}.sp1{width:33%;float:left;padding-bottom:5px}.sp2{width:25%;float:left;text-align:center}.txt-left{text-align:left}.txt-center{text-align:center}.txt-right{text-align:right}.bot{margin-bottom:10px}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1 txt-left'>鐧昏鏃堕棿锛歳egisterTime</span><span class='sp1 txt-center'>瀹屾垚鏃堕棿锛歝ompleteTime</span><span class='sp1 txt-right'>鍗曞彿锛歴erId</span></div><table cellspacing='0'cellpadding='0'><tr><td>杞︾墝鍙�</td><td>plateNum</td><td>鐨噸(鍏枻)</td><td>emptyWeight</td></tr><tr><td>澶ч粍鍌ㄥ搴�</td><td>depotName</td><td>姣涢噸(鍏枻)</td><td>fullWeight</td></tr><tr><td>渚涜揣鍗曚綅</td><td>customerName</td><td>鍑�閲�(鍏枻)</td><td>netWeight</td></tr><tr><td>鏀惰揣鍗曚綅</td><td>deptName</td><td>鎬绘墸閲�</td><td>deSum</td></tr><tr><td>璐х墿鍚嶇О</td><td>foodVariety</td><td>鏉傝川(%)</td><td>impurity</td></tr><tr><td>鍖呰瑙勬牸</td><td></td><td>姘村垎(%)</td><td>wet</td></tr><tr><td>鍖呮暟</td><td></td><td>缁撶畻閲嶉噺(鍏枻)</td><td>settleWeight</td></tr><tr><td>椹鹃┒鍛�</td><td>driverName</td><td>鍗曚环(鍏�/鍏枻)</td><td>price</td></tr><tr><td>杩囩鏃堕棿</td><td>emptyTime</td><td>閲戦(鍏�)</td><td>settleMoney</td></tr><tr><td>澶囨敞</td><td colspan='3'>remark</td></tr></table><div class='div-tit'><span class='sp2 txt-left bot'>鍙哥鍛橈細</span><span class='sp2 txt-left bot'>淇濈鍛橈細</span><span class='sp2 txt-left bot'>浠樻鍛橈細</span><span class='sp2 txt-left bot'>鎵胯繍浜猴細</span></div><div class='div-tit'style=\"margin-top: 10px\"><span class='sp2'>1.浠撳簱锛堢櫧锛�</span><span class='sp2'>2.浠樻锛堢孩锛�</span><span class='sp2'>3.瀹㈡埛锛堣摑锛�</span><span class='sp2'>4.鍐滃彂琛岋紙榛勶級</span></div></body></html>";
-
/**
* 闈掔绮簱鍑哄簱杩囩鍗�
*/
@@ -78,7 +76,7 @@
/**
* 涔変箤甯備腑蹇冪伯搴撳嚭搴撶О閲嶅崟
*/
- public static String OUT_WEIGHT_5013 ="<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>鍑哄簱杩囩鍗�</title>"
+ public static String OUT_WEIGHT_5013 = "<!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;} "
+ "span {padding-bottom:10px;} "
@@ -94,7 +92,7 @@
/**
* 涔変箤甯備腑蹇冪伯搴撳叆搴撶О閲嶅崟
*/
- public static String IN_WEIGHT_5013 ="<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>鍏ュ簱杩囩鍗�</title>"
+ public static String IN_WEIGHT_5013 = "<!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;} "
+ "span {padding-bottom:10px;} "
@@ -105,7 +103,7 @@
+ "table td {border-left:1px solid;border-top:1px solid;height:38px;}"
+ ".td-bottom {border-bottom:1px solid;}"
+ "</style></head>" +
- "<body><h1>billTitle</h1><span>鏃堕棿锛歵ime</span><div class='div-tit'><span class='fl'>鍙戣揣鍗曚綅锛歝ustomerName</span> <span class=''>鍗曚綅缂栫爜锛歝ustomerId</span><span class='fr'>鍏ュ簱鍗曞彿锛歴erId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>鍝佺</td><td width='12.5%'>foodVariety</td><td width='12.5%'>鎵胯繍杞︾墝</td><td width='12.5%'>plateNum</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>transType</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>deHandle</td><td>鍖呰鎵ｉ噸(KG)</td><td>dePack</td><td>涓嶅畬鍠勯绮掓墸閲�(KG)</td><td>deBroken</td><td>鏉傝川鎵ｉ噸(KG)</td><td>deImpurity</td></tr><tr><td>姘村垎閲嶉噺(KG)</td><td>deWet</td><td>鍏朵粬鎵ｉ噸(KG)</td><td>deOther</td><td>鎬绘墸閲�(KG)</td><td>deSum</td><td>缁撶畻鍑�閲�(KG)</td><td>settleWeight</td></tr><tr><td>鍙戣揣鍖呮暟</td><td></td><td class='td-bottom'>鍚堝悓鏁伴噺(KG)</td><td class='td-bottom'>planWeight</td><td class='td-bottom'>宸蹭氦(KG)</td><td class='td-bottom'>completeWeight</td><td class='td-bottom'>瀹屾垚鐧惧垎姣�</td><td class='td-bottom'>completePer</td></tr><tr><td>澶囨敞</td><td rowspan='7' colspan='7'>remark</td></tr></table><div class='div-tit'><span class='fl'>鍙哥鍛橈細weightUser</span><span class=''>鏀惰揣鍛橈細handleUser</span><span class='fr'>鎵胯繍浜猴細driverName</span></div></body>"+
+ "<body><h1>billTitle</h1><span>鏃堕棿锛歵ime</span><div class='div-tit'><span class='fl'>鍙戣揣鍗曚綅锛歝ustomerName</span> <span class=''>鍗曚綅缂栫爜锛歝ustomerId</span><span class='fr'>鍏ュ簱鍗曞彿锛歴erId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>鍝佺</td><td width='12.5%'>foodVariety</td><td width='12.5%'>鎵胯繍杞︾墝</td><td width='12.5%'>plateNum</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>transType</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>deHandle</td><td>鍖呰鎵ｉ噸(KG)</td><td>dePack</td><td>涓嶅畬鍠勯绮掓墸閲�(KG)</td><td>deBroken</td><td>鏉傝川鎵ｉ噸(KG)</td><td>deImpurity</td></tr><tr><td>姘村垎閲嶉噺(KG)</td><td>deWet</td><td>鍏朵粬鎵ｉ噸(KG)</td><td>deOther</td><td>鎬绘墸閲�(KG)</td><td>deSum</td><td>缁撶畻鍑�閲�(KG)</td><td>settleWeight</td></tr><tr><td>鍙戣揣鍖呮暟</td><td></td><td class='td-bottom'>鍚堝悓鏁伴噺(KG)</td><td class='td-bottom'>planWeight</td><td class='td-bottom'>宸蹭氦(KG)</td><td class='td-bottom'>completeWeight</td><td class='td-bottom'>瀹屾垚鐧惧垎姣�</td><td class='td-bottom'>completePer</td></tr><tr><td>澶囨敞</td><td rowspan='7' colspan='7'>remark</td></tr></table><div class='div-tit'><span class='fl'>鍙哥鍛橈細weightUser</span><span class=''>鏀惰揣鍛橈細handleUser</span><span class='fr'>鎵胯繍浜猴細driverName</span></div></body>" +
"</html>";
/**
--
Gitblit v1.9.3