From 93bd5784309145cd20cd9e2641c0753c5db4eae8 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 28 六月 2023 15:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 45 ++--
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 8
igds-web/src/main/resources/static/admin/inout/in-check.js | 39 ++++
igds-web/src/main/resources/static/admin/inout/inout-print.js | 6
igds-web/src/main/resources/static/img/aerial-5326_001.png | 0
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 7
igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java | 2
igds-web/src/main/resources/static/admin/inout/in-weight.js | 37 +++
igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java | 10
igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java | 2
igds-web/src/main/resources/static/admin/inout/in-card-back.js | 255 ++++++++++++++--------------
igds-web/src/main/resources/application-pro5326.yml | 80 ++++++++
12 files changed, 328 insertions(+), 163 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>";
/**
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 8f53a96..db7a478 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -321,7 +321,7 @@
param.setIntelCard(data.getIntelCard());
param.setUserId(data.getCompleteUser());
param.setDepotId(data.getDepotId());
- param.setCompleteTime(data.getCompleteTime());
+ param.setCompleteTime(new Date());
param.setProgress(InoutConstant.PROGRESS_RECORD);
String msg = inoutService.toComplete(param);
@@ -838,6 +838,11 @@
curData.setProgress(curData.getProgress());
curData.setType(curData.getType());
+ curData.setFoodLevel(data.getFoodLevel());
+ curData.setFoodVariety(data.getFoodVariety());
+ curData.setPrice(data.getPrice());
+ curData.setRemarks(data.getRemarks());
+ curData.setCheckItems(data.getCheckItems());
if (StringUtils.isEmpty(data.getCheckUser())) {
curData.setCheckUser(ContextUtil.getLoginUserCName());
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 866b61a..4abd844 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
@@ -93,7 +93,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());
@@ -261,7 +261,7 @@
bill.setFullTime(DateFormatUtils.format(data.getFullWeightTime(),
"yyyy-MM-dd HH:mm:ss"));
bill.setSerId(data.getId());
-// bill.setSpecType(StringUtils.isEmpty(data.getSpecType())?"鏁ｇ伯":data.getSpecType());
+// bill.setSpecType(StringUtils.isEmpty(data.getSpecType()) ? "鏁ｇ伯" : data.getSpecType());
if ("5016".equals(data.getCompanyId())) {
bill.setCompleteTime(DateFormatUtils.format(data.getCompleteTime(), "yyyy-MM-dd"));
bill.setSerId(data.getId().substring(2));
@@ -269,7 +269,7 @@
}
//瀹㈡埛淇℃伅
- // bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());
+ // bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());
bill.setCustomerName(data.getCustomerName() == null ? "" : data.getCustomerName());
bill.setUserId(data.getUserId() == null ? "" : data.getUserId());
bill.setUserAddress(data.getUserAddress() == null ? "" : data.getUserAddress());
@@ -277,7 +277,7 @@
//浠庨�氱煡鍗曚腑鑾峰彇鏀跺彂璐у崟浣嶄俊鎭�
NoticeDto noticeDto = noticeService.queryNoticeById(data.getNoticeId(), data.getType());
- if(null != noticeDto && StringUtils.isNotEmpty(noticeDto.getUnitName())){
+ if (null != noticeDto && StringUtils.isNotEmpty(noticeDto.getUnitName())) {
bill.setUnitName(noticeDto.getUnitName());
}
@@ -315,13 +315,13 @@
// bill.setImpurity(data.getImpurity()+"");
// }
- bill.setPrice(data.getPrice()== null ? "" :data.getPrice() + "");
- if(data.getSettleMoney() <= 0){
- if(null != data.getPrice() && null != data.getRecordWeight()){
- data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice()*data.getRecordWeight(),2));
+ bill.setPrice(data.getPrice() == null ? "" : data.getPrice() + "");
+ if (data.getSettleMoney() <= 0) {
+ if (null != data.getPrice() && null != data.getRecordWeight()) {
+ data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice() * data.getRecordWeight(), 2));
}
}
- bill.setSettleMoney(data.getSettleMoney()== null ? "" :data.getSettleMoney()+"");
+ bill.setSettleMoney(data.getSettleMoney() == null ? "" : data.getSettleMoney() + "");
bill.setRemark(data.getRemarks() == null ? "" : data.getRemarks());
return bill;
@@ -373,7 +373,7 @@
String key;
for (CheckItemData item : checkLst) {
key = item.getStandardId() + "_ST";
- // checkBillItems.put(key, item.getStandardValue());
+ // checkBillItems.put(key, item.getStandardValue());
key = item.getStandardId() + "_VAL";
checkBillItems.put(key, item.getValue());
}
@@ -449,7 +449,7 @@
public String inSettleBill(InoutData data, InoutSettle settle) {
if (null != data) {
- // settle.setCompleteTime(data.getCompleteTime());
+ // settle.setCompleteTime(data.getCompleteTime());
settle.setDepotId(data.getDepotId());
settle.setDeptId(data.getDeptId());
// settle.setUserName(data.getUserName());
@@ -614,18 +614,18 @@
}
String htmlStr;
- if(list.size() <= 30){
+ if (list.size() <= 30) {
//鍙湁涓�椤垫椂
- htmlStr = getShipBill(data, list, true,0);
+ htmlStr = getShipBill(data, list, true, 0);
result.add(htmlStr);
- }else {
+ } else {
//鏈夊椤垫椂
- int page = list.size()/30 + 1;
+ int page = list.size() / 30 + 1;
for (int i = 1; i <= page; i++) {
- if(i == page){
- htmlStr = getShipBill(data, list.subList((i-1)*30, list.size()),true, i);
- }else {
- htmlStr = getShipBill(data, list.subList((i-1)*30, i*30),false, i);
+ if (i == page) {
+ htmlStr = getShipBill(data, list.subList((i - 1) * 30, list.size()), true, i);
+ } else {
+ htmlStr = getShipBill(data, list.subList((i - 1) * 30, i * 30), false, i);
}
result.add(htmlStr);
}
@@ -636,6 +636,7 @@
/**
* 鑾峰彇鑸硅繍鎵撳嵃妯℃澘鏁版嵁
+ *
* @param data 娴佹按淇℃伅
* @param list 杞﹁締淇℃伅锛屾暟閲忎笉澶т簬30
* @param moreTag 缁撶畻鏍囩锛宼rue-浠ｈ〃缁撶畻椤碉紱false-涓嶆槸缁撶畻椤�
@@ -646,7 +647,7 @@
//璋冩暣妯＄増鏁版嵁骞惰繑鍥�
String htmlStr = InoutBill.SHIP_WEIGHT_DEFAULT_MORE;
- if(moreTag){
+ if (moreTag) {
htmlStr = InoutBill.SHIP_WEIGHT_DEFAULT;
}
@@ -654,7 +655,7 @@
//琛ㄥご
String billTitle = (dept == null ? "鑸硅繍杩囩鍗�" : dept.getName() + "鑸硅繍杩囩鍗�");
- if(0 != pageNum){
+ if (0 != pageNum) {
billTitle += " - 绗�" + pageNum + "椤�";
}
htmlStr = htmlStr.replace("billTitle", billTitle);
@@ -695,7 +696,7 @@
}
//娣诲姞缁撶畻淇℃伅
- if(moreTag){
+ if (moreTag) {
htmlStr = htmlStr.replace("handleUser", depot == null ? "" : (depot.getStoreKeeperName() == null ? "" : depot.getStoreKeeperName()));
htmlStr = htmlStr.replace("remarks", data.getRemarks() == null ? "" : data.getRemarks());
htmlStr = htmlStr.replace("fullWeight", new DecimalFormat("0").format(data.getFullWeight()));
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
index 2e7fb3d..f086af0 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
@@ -107,7 +107,7 @@
args.put("startTime", DateUtil.getCurZero(date));
args.put("endTime", DateUtil.getNextZero(date));
}
- hql += " order by updateTime desc";
+ hql += " order by updateTime desc limit 20";
return this.query(hql, args);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
index 22610d9..6ffe9db 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
@@ -123,7 +123,7 @@
args.put("endTime", DateUtil.getNextZero(date));
}
- hql += " order by updateTime desc";
+ hql += " order by updateTime desc limit 20";
return this.query(hql, args);
}
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index efad670..f4beaba 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -156,7 +156,7 @@
</if>
</where>
AND RECORD_STATUS_ != 'DEL'
- ORDER BY COMPLETE_TIME_ DESC
+ ORDER BY UPDATE_TIME_ DESC
LIMIT 1
</select>
@@ -220,6 +220,7 @@
<if test="data.checkStatus != null">CHECK_STATUS_ = #{data.checkStatus},</if>
<if test="data.checkId != null">CHECK_ID_ = #{data.checkId},</if>
<if test="data.checkUser != null">CHECK_USER_ = #{data.checkUser},</if>
+ <if test="data.checkTime != null">CHECK_TIME_ = #{data.checkTime},</if>
<if test="data.registerTime != null">REGISTER_TIME_ = #{data.registerTime},</if>
<if test="data.registerUser != null">REGISTER_USER_ = #{data.registerUser},</if>
<if test="data.userName != null">USER_NAME_ = #{data.userName},</if>
@@ -235,10 +236,12 @@
<if test="data.customerName != null">CUSTOMER_NAME_ = #{data.customerName},</if>
<if test="data.foodVariety != null">FOOD_VARIETY_ = #{data.foodVariety},</if>
<if test="data.foodLevel != null">FOOD_LEVEL_ = #{data.foodLevel},</if>
+ <if test="data.foodLocationId != null">FOOD_LOCATION_ID_ = #{data.foodLocationId},</if>
<if test="data.foodLocation != null">FOOD_LOCATION_ = #{data.foodLocation},</if>
<if test="data.foodYear != null">FOOD_YEAR_ = #{data.foodYear},</if>
<if test="data.deHandle != null">DE_HANDLE_ = #{data.deHandle},</if>
<if test="data.deOther != null">DE_OTHER_ = #{data.deOther},</if>
+ <if test="data.deOtherInfo != null">DE_OTHER_INTO_ = #{data.deOtherInfo},</if>
<if test="data.fullWeight != null">FULL_WEIGHT_ = #{data.fullWeight},</if>
<if test="data.fullWeightTime != null">FULL_WEIGHT_TIME_ = #{data.fullWeightTime},</if>
<if test="data.fullWeightUser != null">FULL_WEIGHT_USER_ = #{data.fullWeightUser},</if>
@@ -246,6 +249,7 @@
<if test="data.emptyWeightTime != null">EMPTY_WEIGHT_TIME_ = #{data.emptyWeightTime},</if>
<if test="data.emptyWeightUser != null">EMPTY_WEIGHT_USER_ = #{data.emptyWeightUser},</if>
<if test="data.netWeight != null">NET_WEIGHT_ = #{data.netWeight},</if>
+ <if test="data.settleId != null">SETTLE_ID_ = #{data.settleId},</if>
<if test="data.settleWeight != null">SETTLE_WEIGHT_ = #{data.settleWeight},</if>
<if test="data.recordWeight != null">RECORD_WEIGHT_ = #{data.recordWeight},</if>
<if test="data.handleUser != null">HANDLE_USER_ = #{data.handleUser},</if>
@@ -254,6 +258,8 @@
<if test="data.remarks != null">REMARKS_ = #{data.remarks},</if>
<if test="data.foodType != null">FOOD_TYPE_ = #{data.foodType},</if>
<if test="data.price != null">PRICE_ = #{data.price},</if>
+ <if test="data.bzw != null">bzw = #{data.bzw},</if>
+ <if test="data.dbz != null">dbz = #{data.dbz},</if>
<if test="data.settleMoney != null">SETTLE_MONEY_ = #{data.settleMoney},</if>
PROGRESS_ = #{data.progress}
where
diff --git a/igds-web/src/main/resources/application-pro5326.yml b/igds-web/src/main/resources/application-pro5326.yml
new file mode 100644
index 0000000..8fd7582
--- /dev/null
+++ b/igds-web/src/main/resources/application-pro5326.yml
@@ -0,0 +1,80 @@
+########################## 骞夸笢鎯犲窞鎯犳柊绮簱椤圭洰 ##########################
+server:
+ port: 8888
+ context-path: /
+ connection-timeout: 5000
+ tomcat:
+ uri-encoding: UTF-8
+
+########################## datasourcec ##########################
+spring:
+ datasource:
+ db-base:
+ name: db-base
+ type: com.alibaba.druid.pool.DruidDataSource
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
+ public-key:
+ config-decrypt: true
+ initial-size: 5
+ min-idle: 5
+ max-active: 50
+ max-wait: 60000
+ time-between-eviction-runs-millis: 60000
+ min-evictable-idle-time-millis: 300000
+ validation-query: select 1 from dual
+ test-whileIdle: true
+ test-on-borrow: false
+ test-on-return: false
+ pool-prepared-statements: true
+ max-pool-prepared-statement-per-connection-size: 20
+ filters: stat
+ connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+ use-global-data-source-stat: true
+ removeAbandoned: true
+ removeAbandonedTimeout: 90
+ logAbandoned: true
+ poolPreparedStatements: true
+ maxPoolPreparedStatementPerConnectionSize: 20
+ db-sqlite:
+ name: db-sqlite
+ url: jdbc:sqlite:D:/app/igds/db/iot_cfg.db
+ driver-class-name: org.sqlite.JDBC
+ type: com.alibaba.druid.pool.DruidDataSource
+ username:
+ password:
+
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 0
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+
+license:
+ subject: ld_license
+ publicAlias: publicCert
+ storePass: PUBLICFZZYXXJSGFYXGS888888
+ licensePath: D:/IGDS/license/license.lic
+ publicKeysStorePath: D:/IGDS/license/publicCerts.keystore
+
+########################## IGDS ##########################
+## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
+igds:
+ default:
+ companyId: 5326
+ sys-name: 鏅烘収绮簱绠＄悊绯荤粺
+ logo: logo-default.png
+ logo-title: logo-title-default.png
+ support: 鏅烘収绮儏绮儏浜戠鐞嗗钩鍙�
+ grian-add-point: N
+ file-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/in-card-back.js b/igds-web/src/main/resources/static/admin/inout/in-card-back.js
index d80f771..dfc09e3 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-card-back.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-card-back.js
@@ -2,161 +2,162 @@
var layer;
var form;
var recordData = null;
-$(function() {
- layui.use([ 'layer', 'laydate', 'form' ], function() {
- layer = layui.layer;
- form = layui.form;
- layui.laydate.render({
- elem : '#test1',
- theme : '#7b8e9f'
- });
+$(function () {
+ layui.use(['layer', 'laydate', 'form'], function () {
+ layer = layui.layer;
+ form = layui.form;
+ layui.laydate.render({
+ elem: '#test1',
+ theme: '#7b8e9f'
+ });
- });
+ });
- showProgress();
+ showProgress();
});
//浣跨敤鎻掍欢璇诲彇鏅烘収鍗″彿
function flushICCard() {
- var index = layer.load();
- $("#intelCard").val(null);
- $.ajax({
- type: "GET",
- async: true,
- url: "http://127.0.0.1:9111/ICCARD",
- data: {},
- dataType: "jsonp",
- jsonp: "callback",
- jsonpCallback: "jsonpCallback",
- success: function (json) {
- layer.close(index);
- var data = json.no;
- if (data === "not found") {
- alertError("璇烽噸鏂拌鍗★紒");
- } else {
- $("#intelCard").val(data);
+ var index = layer.load();
+ $("#intelCard").val(null);
+ $.ajax({
+ type: "GET",
+ async: true,
+ url: "http://127.0.0.1:9111/ICCARD",
+ data: {},
+ dataType: "jsonp",
+ jsonp: "callback",
+ jsonpCallback: "jsonpCallback",
+ success: function (json) {
+ layer.close(index);
+ var data = json.no;
+ if (data === "not found") {
+ alertError("璇烽噸鏂拌鍗★紒");
+ } else {
+ $("#intelCard").val(data);
- //鐩存帴鍒锋柊鏁版嵁
- flushData();
- }
- },
- error: function () {
- layer.close(index);
- alertError("IC鍗¤鍙栧嚭閿欙紒");
- }
- });
+ //鐩存帴鍒锋柊鏁版嵁
+ flushData();
+ }
+ },
+ error: function () {
+ layer.close(index);
+ alertError("IC鍗¤鍙栧嚭閿欙紒");
+ }
+ });
}
//浣跨敤鎻掍欢璇诲彇韬唤璇�
function flushIdCard() {
- var index = layer.load();
- $.ajax({
- type: "GET",
- async: true,
- url: "http://127.0.0.1:9111/IDCARD",
- data: {},
- dataType: "jsonp",
- jsonp: "callback",
- jsonpCallback: "jsonpCallback",
- success: function (json) {
- layer.close(index);
- var data = json.content;
- if (data === "not found") {
- alertError("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�");
- return;
- }
- $("#userId").val(data.idNum);
- flushData();
- },
- error: function () {
- layer.close(index);
- alertError("韬唤璇佽鍙栧け璐ワ紒");
- }
- });
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ async: true,
+ url: "http://127.0.0.1:9111/IDCARD",
+ data: {},
+ dataType: "jsonp",
+ jsonp: "callback",
+ jsonpCallback: "jsonpCallback",
+ success: function (json) {
+ layer.close(index);
+ var data = json.content;
+ if (data === "not found") {
+ alertError("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�");
+ return;
+ }
+ $("#userId").val(data.idNum);
+ console.log(data)
+ flushData();
+ },
+ error: function () {
+ layer.close(index);
+ alertError("韬唤璇佽鍙栧け璐ワ紒");
+ }
+ });
}
// 琛ㄥ崟娓呯┖
function resetForm() {
- $("#form-data")[0].reset();
- $("#form-basic")[0].reset();
+ $("#form-data")[0].reset();
+ $("#form-basic")[0].reset();
- form.render();
+ form.render();
- recordData = null;
+ recordData = null;
}
// 鏇存柊鏁版嵁淇℃伅
function flushData() {
- var index = layer.load();
- var plateNum = $("#plateNum").val();
- var userId2 = $("#userId").val();
- var intelCard = $("#intelCard").val();
+ var index = layer.load();
+ var plateNum = $("#plateNum").val();
+ var userId2 = $("#userId").val();
+ var intelCard = $("#intelCard").val();
- var param = {
- type : type,
- progress : progress,
- userId: userId2,
- intelCard: intelCard,
- plateNum : plateNum
- };
+ var param = {
+ type: type,
+ progress: progress,
+ userId: userId2,
+ intelCard: intelCard,
+ plateNum: plateNum
+ };
- $.ajax({
- type : "POST",
- url : "../../basic/inout/inout-query-back",
- dataType : "json",
- contentType : "application/json;charset=UTF-8",
- data : JSON.stringify(param),
- success : function(result) {
- if (result.code != "0000") {
- layer.alert(result.msg);
- } else {
- recordData = result.data;
- // 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
- form.val("form-data", recordData);
- form.val("form-basic", recordData);
- form.render();
- }
- layer.close(index);
- },
- error : function() {
- layer.close(index);
- alertError("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛�")
- }
- });
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/inout-query-back",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(param),
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.alert(result.msg);
+ } else {
+ recordData = result.data;
+ // 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
+ form.val("form-data", recordData);
+ form.val("form-basic", recordData);
+ form.render();
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ alertError("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛�")
+ }
+ });
}
// 褰撳墠瀹屾垚
function submitData() {
- if (!recordData) {
- alertError("娌℃湁鏁版嵁鍙互鎻愪氦锛�");
- return;
- }
+ if (!recordData) {
+ alertError("娌℃湁鏁版嵁鍙互鎻愪氦锛�");
+ return;
+ }
- // 鎻愪氦鏁版嵁姣旇緝鐗规畩锛屼笉鐢ㄨ�冭檻鍩烘湰淇℃伅鎻愪氦
- var index = layer.load();
- var data = form.val("form-data");
- Object.assign(recordData, data);
+ // 鎻愪氦鏁版嵁姣旇緝鐗规畩锛屼笉鐢ㄨ�冭檻鍩烘湰淇℃伅鎻愪氦
+ var index = layer.load();
+ var data = form.val("form-data");
+ Object.assign(recordData, data);
- $.ajax({
- type : "POST",
- url : "../../basic/inout/submit-card-back",
- dataType : "json",
- contentType : "application/json;charset=UTF-8",
- data : JSON.stringify(recordData),
- success : function(result) {
- if (result.code != "0000") {
- layer.msg(result.msg);
- } else {
- layer.alert("鍗＄墖鍥炴敹鎴愬姛锛�");
- // 閲嶇疆椤甸潰
- resetForm();
- }
- layer.close(index);
- },
- error : function() {
- layer.close(index);
- layer.msg("鍗＄墖鍥炴敹澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
- }
- });
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/submit-card-back",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(recordData),
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.msg(result.msg);
+ } else {
+ layer.alert("鍗＄墖鍥炴敹鎴愬姛锛�");
+ // 閲嶇疆椤甸潰
+ resetForm();
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ layer.msg("鍗＄墖鍥炴敹澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ }
+ });
}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/in-check.js b/igds-web/src/main/resources/static/admin/inout/in-check.js
index 249ebe0..39ab7d8 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-check.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-check.js
@@ -288,6 +288,7 @@
}
});
};
+
// 鎵︽牱鏈鸿В闄ゆ�ュ仠
function checkResetStop() {
var param = JSON.stringify(checkDto);
@@ -312,6 +313,7 @@
}
});
};
+
//闅愯棌淇℃伅--鏇挎崲涓�*
function replaceStr(str) {
if (!str) {
@@ -332,7 +334,7 @@
curCheckData = obj.data;
curSampleData = obj.data;
- if(!curCheckData.checkTime){
+ if (!curCheckData.checkTime) {
curCheckData.checkTime = dateFtt("yyyy-MM-dd hh:mm:ss", new Date());
}
curCheckData.checkUser = checkUser;
@@ -786,4 +788,39 @@
});
};
+/**
+ * 寮瑰嚭鎻愰啋妗�
+ * @param msg 鎻愰啋淇℃伅
+ * @param data 鏁版嵁淇℃伅锛屽彲鑳戒负绌�
+ */
+function notify(msg, data) {
+ if (data) {
+ //璧嬪��
+ $("#resultMsg").text(msg);
+ $("#resultUserName").text(data.userName);
+ $("#resultPlateNum").text(data.plateNum);
+ if ("IN" == data.type) {
+ $("#resultType").text("鍏ュ簱-" + INOUT_PROGRESS_MSG(data.progress));
+ } else {
+ $("#resultType").text("鍑哄簱-" + INOUT_PROGRESS_MSG(data.progress));
+ }
+ $("#resultIntelCard").text(data.intelCard);
+
+ layer.open({
+ type: 1,
+ offset: ['150px', '200px'],
+ area: '450px;',
+ shade: 0.8,
+ id: 'dialog_notify_info',
+ btn: ['纭畾'],
+ content: $('#dialog-from-notify'),
+ yes: function (index) {
+ layer.closeAll();
+ }
+ });
+ } else {
+ layer.alert(msg, {offset: ['300px', '300px']});
+ }
+}
+
// ---------------------------绮浜у湴 -缁撴潫 -------------------//
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/in-weight.js b/igds-web/src/main/resources/static/admin/inout/in-weight.js
index 50fc731..df5b067 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-weight.js
@@ -145,11 +145,9 @@
alertError("鍚庡彴璋冪敤鎴浘澶辫触锛岃閲嶆柊灏濊瘯");
}
});
- console.log(recordData.progress, "绌鸿溅绉伴噸")
//濡傛灉鏄浜屾绉伴噸锛岄粯璁ゆ墽琛岃嚜鍔ㄨ绠�
if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
deAutoByIn("emptyWeight");
- console.log("绌鸿溅绉伴噸")
}
}
@@ -546,6 +544,41 @@
}
/**
+ * 寮瑰嚭鎻愰啋妗�
+ * @param msg 鎻愰啋淇℃伅
+ * @param data 鏁版嵁淇℃伅锛屽彲鑳戒负绌�
+ */
+function notify(msg, data) {
+ if (data) {
+ //璧嬪��
+ $("#resultMsg").text(msg);
+ $("#resultUserName").text(data.userName);
+ $("#resultPlateNum").text(data.plateNum);
+ if ("IN" == data.type) {
+ $("#resultType").text("鍏ュ簱-" + INOUT_PROGRESS_MSG(data.progress));
+ } else {
+ $("#resultType").text("鍑哄簱-" + INOUT_PROGRESS_MSG(data.progress));
+ }
+ $("#resultIntelCard").text(data.intelCard);
+
+ layer.open({
+ type: 1,
+ offset: ['150px', '200px'],
+ area: '450px;',
+ shade: 0.8,
+ id: 'dialog_notify_info',
+ btn: ['纭畾'],
+ content: $('#dialog-from-notify'),
+ yes: function (index) {
+ layer.closeAll();
+ }
+ });
+ } else {
+ layer.alert(msg, {offset: ['300px', '300px']});
+ }
+}
+
+/**
* 娓叉煋琛ㄦ牸
*/
function renderTableCheckItem() {
diff --git a/igds-web/src/main/resources/static/admin/inout/inout-print.js b/igds-web/src/main/resources/static/admin/inout/inout-print.js
index 8855dc5..3b36a16 100644
--- a/igds-web/src/main/resources/static/admin/inout/inout-print.js
+++ b/igds-web/src/main/resources/static/admin/inout/inout-print.js
@@ -2,9 +2,13 @@
* 鎵撳嵃杩囩鍗�
*/
printWeight = function (htmlStr) {
- var LODOP = CLODOP;
+ // var LODOP = CLODOP
+ var LODOP = getLodop();
if ("5016" == companyId) {
LODOP.PRINT_INIT("绉伴噸鍗�");
+ //鍊间负1--绾靛悜鎵撳嵃锛屽浐瀹氱焊寮�;
+ // 鍊间负2--妯悜鎵撳嵃锛屽浐瀹氱焊寮�;
+ // 鍊间负3--绾靛悜鎵撳嵃锛屽浐瀹氬搴︼紝楂樺害鎸夋墦鍗板唴瀹圭殑楂樺害鑷�傚簲;
LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "");
LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
LODOP.PREVIEW();
diff --git a/igds-web/src/main/resources/static/img/aerial-5326_001.png b/igds-web/src/main/resources/static/img/aerial-5326_001.png
new file mode 100644
index 0000000..9bfa615
--- /dev/null
+++ b/igds-web/src/main/resources/static/img/aerial-5326_001.png
Binary files differ
--
Gitblit v1.9.3