From 1369c87ddcc0e76e17d01208ef66261ee0cd27da Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 二月 2026 18:13:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java | 4
fzzy-igdss-web/src/main/resources/templates/index-static.html | 2
fzzy-igdss-web/src/main/resources/templates/group/index.html | 6
fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java | 3
fzzy-igdss-web/src/main/resources/templates/index-topnav.html | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java | 6
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/ApiV1Controller.java | 4
fzzy-igdss-web/src/main/resources/templates/inout/weight3.html | 834 ++++++++++++++++++++++++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FileService.java | 14
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/Param3033.java | 23
fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java | 95 +-
fzzy-igdss-web/src/main/resources/static/ruoyi/css/ry-ui.css | 9
fzzy-igdss-web/src/main/resources/templates/login.html | 8
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java | 29
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3033.java | 87 ++
fzzy-igdss-web/src/main/resources/static/inout/inout-weight3.js | 694 ++++++++++++++++++++++
fzzy-igdss-web/src/main/resources/templates/index.html | 2
fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html | 4
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/util/ApiV1Constant.java | 4
fzzy-igdss-web/src/main/resources/templates/print/pay.html | 8
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
22 files changed, 1,781 insertions(+), 68 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/EventInfoService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
index e0cf3c9..dd96491 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
@@ -63,8 +63,12 @@
queryWrapper.le("time", param.getEnd());
}
//浜嬩欢鍚嶇О
+// if (StringUtils.isNotBlank(param.getName())) {
+// queryWrapper.like("name", param.getName());
+// }
+ //浜嬩欢鏍囩
if (StringUtils.isNotBlank(param.getName())) {
- queryWrapper.like("name", param.getName());
+ queryWrapper.like("tags", param.getName());
}
queryWrapper.orderByDesc("create_time");
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FileService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FileService.java
index 8702908..c2f37cc 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FileService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FileService.java
@@ -158,6 +158,7 @@
if("TEMPLATE".equals(pathTag)) return getTemplateFilePath();
if("QUANTITY".equals(pathTag)) return getQuantityPath();
if("WORD".equals(pathTag)) return getWordPath();
+ if("WEIGHTNAP".equals(pathTag)) return getWeightSnapPath();
return getCommonFilePath();
}
@@ -179,6 +180,19 @@
* 鑾峰彇浜嬩欢鏂囦欢璺緞
* @return
*/
+ public String getWeightSnapPath() {
+ String basePath = FrameworkConfig.getProfile() + "WEIGHTNAP/" + DateFormatUtils.format(new Date(), "yyyyMM") + "/";
+ File file = new File(basePath);
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+ return basePath;
+ }
+
+ /**
+ * 鑾峰彇浜嬩欢鏂囦欢璺緞
+ * @return
+ */
public String getEventFilePath() {
String basePath = FrameworkConfig.getProfile() + "EVENT/" + DateFormatUtils.format(new Date(), "yyyyMM") + "/";
File file = new File(basePath);
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 e3ae15f..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
@@ -24,7 +24,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -137,13 +136,13 @@
queryWrapper.eq("settle_tag", param.getSettleTag());
}
if (null != param.getStart()) {
- queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
+ queryWrapper.ge("complete_time", DateUtil.getCurZero(param.getStart()));
}
if (null != param.getEnd()) {
- queryWrapper.le("create_time", DateUtil.getNextZero(param.getEnd()));
+ queryWrapper.le("complete_time", DateUtil.getNextZero(param.getEnd()));
}
queryWrapper.ne("record_status", Constant.RECORD_STATUS_DEL); //涓嶆槸鍒犻櫎鐨勫崟瀛愶紝鍗虫甯哥殑鍗曞瓙
- queryWrapper.orderByDesc("create_time");
+ queryWrapper.orderByDesc("complete_time");
return queryWrapper;
}
@@ -688,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());
@@ -749,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());
@@ -757,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;
}
@@ -770,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());
@@ -822,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;
}
@@ -862,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"));
@@ -922,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-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java
index 7913bef..85bd8f7 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java
@@ -116,8 +116,8 @@
per = sumMoney / backMoney;
- if (per > 1.2) {
- log.error("-----褰撳墠鍚堝悓={}涓嬭川鎶间粨搴�={}搴撳瓨鏈埌寰呰繕娆剧殑120%锛屼笉鐢熸垚杩樻鎻愰啋宸ュ崟-----", pledgeContract.getName(), pledgeContract.getDepotNames());
+ if (per > 1.1) {
+ log.error("-----褰撳墠鍚堝悓={}涓嬭川鎶间粨搴�={}搴撳瓨鏈埌寰呰繕娆剧殑110%锛屼笉鐢熸垚杩樻鎻愰啋宸ュ崟-----", pledgeContract.getName(), pledgeContract.getDepotNames());
continue;
}
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/ApiV1Controller.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/ApiV1Controller.java
index 0148b11..9ca74d6 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/ApiV1Controller.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/ApiV1Controller.java
@@ -49,6 +49,8 @@
private ApiV1Service3031 apiV1Service3031;
@Resource
private ApiV1Service3032 apiV1Service3032;
+ @Resource
+ private ApiV1Service3033 apiV1Service3033;
@PostMapping
@ResponseBody
@@ -93,6 +95,8 @@
return apiV1Service3031.analysis(req, gatewaySer);
case ApiV1Constant.API_FUNCTION_3032:
return apiV1Service3032.analysis(req, gatewaySer);
+ case ApiV1Constant.API_FUNCTION_3033:
+ return apiV1Service3033.analysis(req, gatewaySer);
}
return ApiV1Resp.error("鎺ュ彛缂栫爜<" + functionId + ">涓嶅瓨鍦紝璇锋牳鏌ワ紒", req);
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/Param3033.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/Param3033.java
new file mode 100644
index 0000000..b8e2a7c
--- /dev/null
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/data/Param3033.java
@@ -0,0 +1,23 @@
+package com.fzzy.igds.api.v1.data;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author CZT
+ * @Date 2026/1/7 10:21
+ */
+@Data
+public class Param3033 implements Serializable {
+
+ private String cameraId;
+ private String cameraName;
+ private String name;
+ private Double weight;
+ private String time;
+ private String tags;
+ private String imgBase64;
+
+}
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3033.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3033.java
new file mode 100644
index 0000000..2ed4272
--- /dev/null
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3033.java
@@ -0,0 +1,87 @@
+package com.fzzy.igds.api.v1.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fzzy.igds.api.v1.data.ApiV1Req;
+import com.fzzy.igds.api.v1.data.ApiV1Resp;
+import com.fzzy.igds.api.v1.data.Param3033;
+import com.fzzy.igds.domain.GatewaySer;
+import com.fzzy.igds.domain.WeighbridgeSnap;
+import com.fzzy.igds.service.FileService;
+import com.fzzy.igds.service.WeighbridgeSnapService;
+import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.config.FrameworkConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+
+/**
+ * @Description AI浜嬩欢瑙ｆ瀽
+ * @Author CZT
+ * @Date 2026/1/7 11:09
+ */
+@Slf4j
+@Component
+public class ApiV1Service3033 {
+
+ @Resource
+ private WeighbridgeSnapService weighbridgeSnapService;
+ @Resource
+ private FileService fileService;
+
+ /**
+ * @param req
+ * @param gatewaySer
+ * @return
+ */
+ public ApiV1Resp<Object> analysis(ApiV1Req<Object> req, GatewaySer gatewaySer) throws Exception {
+
+ //杞寲涓哄璞�
+ Param3033 param = JSONObject.parseObject(JSONObject.toJSONString(req.getData()), Param3033.class);
+
+ if (null == param) {
+ return ApiV1Resp.error("鎶撴媿淇℃伅涓虹┖锛屼笉瑙ｆ瀽锛�", req);
+ }
+
+ step1(param, gatewaySer);
+
+ return ApiV1Resp.success(null, req);
+
+ }
+
+ /**
+ * 寮傛瑙ｆ瀽
+ *
+ * @param param
+ */
+ @Async
+ public void step1(Param3033 param, GatewaySer gatewaySer) throws Exception {
+
+ WeighbridgeSnap info = new WeighbridgeSnap();
+ info.setId(ContextUtil.generateId());
+ info.setCompanyId(gatewaySer.getCompanyId());
+ info.setDeptId(gatewaySer.getDeptId());
+ info.setSerId(param.getCameraId());
+ info.setName(param.getName());
+ info.setWeight(param.getWeight());
+
+ info.setTime(DateUtils.parseDate(param.getTime(), "yyyy-MM-dd HH:mm:ss"));
+ info.setTags(param.getTags());
+
+ //base64杞寲涓哄浘鐗囦繚瀛�
+ String savePath = fileService.getFileSavePath("WEIGHTNAP");
+ String fileName = ContextUtil.UUID() + ".jpg";
+ String filePath = savePath + fileName;
+ fileService.baseImg2Disk(filePath, param.getImgBase64());
+
+ //璁剧疆淇濆瓨鍥剧墖璺緞
+ info.setImgName(filePath.replace(FrameworkConfig.getProfile(), "/profile/"));
+
+ weighbridgeSnapService.addData(info);
+
+ log.info("璐ㄦ娂鐩戠鎺ュ彛V1锛�3033鎺ュ彛瑙ｆ瀽瀹屾垚");
+
+ }
+
+}
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/util/ApiV1Constant.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/util/ApiV1Constant.java
index 0da9321..cbd4c79 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/util/ApiV1Constant.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/util/ApiV1Constant.java
@@ -36,6 +36,10 @@
* 鎺ㄩ�佸嚭鍏ュ簱鎶撳浘鎺ュ彛缂栫爜
*/
public static final String API_FUNCTION_3032 = "3032";
+ /**
+ * 鍦扮鐩戞祴鎶撴媿鎺ュ彛缂栫爜
+ */
+ public static final String API_FUNCTION_3033 = "3033";
}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
index bd051f9..6bb065f 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
@@ -17,7 +17,10 @@
import javax.annotation.Resource;
import java.text.DecimalFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
/**
* @Description
@@ -128,6 +131,7 @@
/**
* 鑾峰彇搴撳尯灏佽淇℃伅
+ *
* @param companyId
* @return
*/
@@ -153,14 +157,14 @@
for (Depot depot : depotList) {
deptData.setDepotNumber(deptData.getDepotNumber() + 1);
- if(StringUtils.isNotBlank(depot.getPledgeBank())){
+ if (StringUtils.isNotBlank(depot.getPledgeBank())) {
deptData.setDepotBankNumber(deptData.getDepotBankNumber() + 1);
}
- if(null == depot.getStorageReal()){
+ if (null == depot.getStorageReal()) {
depot.setStorageReal(0.0);
}
- deptData.setStorageNum(deptData.getStorageNum() + depot.getStorageReal()/1000);
+ deptData.setStorageNum(deptData.getStorageNum() + depot.getStorageReal() / 1000);
}
}
@@ -176,7 +180,7 @@
if (Constant.TYPE_IN.equals(inoutRecord.getType())) {
deptData.setInNum(deptData.getInNum() + 1);
}
- if (Constant.TYPE_OUT.equals(inoutRecord.getType())){
+ if (Constant.TYPE_OUT.equals(inoutRecord.getType())) {
deptData.setOutNum(deptData.getOutNum() + 1);
}
@@ -192,16 +196,17 @@
/**
* 鑾峰彇搴撳尯涓嬬洃鎺т俊鎭�
+ *
* @param param
* @return
*/
public PageResponse<List<Camera>> cameraList(IgdsBaseParam param) {
- if(StringUtils.isBlank(param.getDeptId())){
+ if (StringUtils.isBlank(param.getDeptId())) {
return new PageResponse<>(RespCodeEnum.CODE_2000, null);
}
- if (StringUtils.isBlank(param.getCompanyId())){
+ if (StringUtils.isBlank(param.getCompanyId())) {
param.setCompanyId(ContextUtil.getCompanyId());
}
@@ -240,26 +245,26 @@
//鐢ㄤ簬缁熻鍒嗗搧绉嶅簱瀛�
LinkedHashMap<String, Double> varietyMap = new LinkedHashMap<>();
for (Depot depot : depotList) {
- if(StringUtils.isNotBlank(depot.getPledgeBank())){
+ if (StringUtils.isNotBlank(depot.getPledgeBank())) {
indexData.setDepotBankNum(indexData.getDepotBankNum() + 1);
}
- if(null == depot.getStorageReal()){
+ if (null == depot.getStorageReal()) {
depot.setStorageReal(0.0);
}
- if(StringUtils.isNotBlank(depot.getStoreType()) && "2".equals(depot.getStoreType())){
- packFoodSum += depot.getStorageReal()/1000;
- }else {
- foodSum += depot.getStorageReal()/1000;
+ if (StringUtils.isNotBlank(depot.getStoreType()) && "2".equals(depot.getStoreType())) {
+ packFoodSum += depot.getStorageReal() / 1000;
+ } else {
+ foodSum += depot.getStorageReal() / 1000;
}
- if(depot.getStorageReal() > 0){
- if(StringUtils.isBlank(depot.getFoodVariety())){
+ if (depot.getStorageReal() > 0) {
+ if (StringUtils.isBlank(depot.getFoodVariety())) {
//璁剧疆涓哄叾浠栧搧绫�
depot.setFoodVariety("9999000");
}
varietyMap.putIfAbsent(depot.getFoodVariety(), 0.000);
- varietyMap.put(depot.getFoodVariety(), varietyMap.get(depot.getFoodVariety()) + NumberUtil.keepPrecision(depot.getStorageReal()/1000, 3));
+ varietyMap.put(depot.getFoodVariety(), varietyMap.get(depot.getFoodVariety()) + NumberUtil.keepPrecision(depot.getStorageReal() / 1000, 3));
}
}
@@ -279,6 +284,7 @@
/**
* 澶у睆棣栭〉-搴撳尯淇℃伅缁熻
+ *
* @param param
* @return
*/
@@ -304,14 +310,14 @@
for (Depot depot : depotList) {
deptData.setDepotNumber(deptData.getDepotNumber() + 1);
- if(StringUtils.isNotBlank(depot.getPledgeBank())){
+ if (StringUtils.isNotBlank(depot.getPledgeBank())) {
deptData.setDepotBankNumber(deptData.getDepotBankNumber() + 1);
}
- if(null == depot.getStorageReal()){
+ if (null == depot.getStorageReal()) {
depot.setStorageReal(0.0);
}
- deptData.setStorageNum(deptData.getStorageNum() + depot.getStorageReal()/1000);
+ deptData.setStorageNum(deptData.getStorageNum() + depot.getStorageReal() / 1000);
}
}
@@ -327,7 +333,7 @@
if (Constant.TYPE_IN.equals(inoutRecord.getType())) {
deptData.setInNum(deptData.getInNum() + 1);
}
- if (Constant.TYPE_OUT.equals(inoutRecord.getType())){
+ if (Constant.TYPE_OUT.equals(inoutRecord.getType())) {
deptData.setOutNum(deptData.getOutNum() + 1);
}
@@ -341,10 +347,19 @@
igdsParam.setStart(DateUtil.getNewByDay(new Date(), -6));
igdsParam.setEnd(DateUtil.getNextZero(new Date()));
List<EventInfo> enevtList = eventInfoService.getListByParam(igdsParam);
- if (null != enevtList && !enevtList.isEmpty()) {
- deptData.setWarnNum7(enevtList.size());
- for (EventInfo eventInfo : enevtList) {
- if(DateFormatUtils.format(new Date(), "yyyyMMdd").equals(DateFormatUtils.format(eventInfo.getTime(), "yyyyMMdd"))){
+ List<EventInfo> resultEnevtList = new ArrayList<>();
+ for (EventInfo info : enevtList) {
+ //褰撴爣绛惧寘鍚� 鍗¤溅锛� 鎴栬�呭寘鍚ぇ鍐欑殑鑻辨枃瀛楁瘝锛堜唬琛ㄦ湁杞︾墝锛夋椂锛屾坊鍔犺繘result
+ if (StringUtils.isNotBlank(info.getTags())) {
+ if (info.getTags().contains("鍗¤溅") || info.getTags().matches(".*[A-Z].*")) {
+ resultEnevtList.add(info);
+ }
+ }
+ }
+ if (null != resultEnevtList && !resultEnevtList.isEmpty()) {
+ deptData.setWarnNum7(resultEnevtList.size());
+ for (EventInfo eventInfo : resultEnevtList) {
+ if (DateFormatUtils.format(new Date(), "yyyyMMdd").equals(DateFormatUtils.format(eventInfo.getTime(), "yyyyMMdd"))) {
deptData.setDailyTotal(deptData.getDailyTotal() + 1);
}
}
@@ -385,7 +400,7 @@
groupGisData.setDeptNum(deptList.size());
for (Dept dept : deptList) {
if (StringUtils.isBlank(dept.getXzqhdm()) || null == valuePieChart.get(dept.getXzqhdm())) {
- if(null == valuePieChart.get("999999")){
+ if (null == valuePieChart.get("999999")) {
valuePieChart.put("999999", 0);
namePieChart.put("999999", "鍏朵粬鍖哄幙");
}
@@ -395,9 +410,9 @@
}
}
- if(groupGisData.getDeptNum() > 0){
+ if (groupGisData.getDeptNum() > 0) {
for (String mapKey : valuePieChart.keySet()) {
- groupGisData.getDeptList().add(new ChartPie(valuePieChart.get(mapKey) + "", namePieChart.get(mapKey), new DecimalFormat("0.0").format((double)valuePieChart.get(mapKey) / groupGisData.getDeptNum() * 100)));
+ groupGisData.getDeptList().add(new ChartPie(valuePieChart.get(mapKey) + "", namePieChart.get(mapKey), new DecimalFormat("0.0").format((double) valuePieChart.get(mapKey) / groupGisData.getDeptNum() * 100)));
}
}
@@ -405,18 +420,18 @@
List<Depot> depotList = depotService.getData(ContextUtil.getCompanyId(), ContextUtil.subDeptId(null), false);
if (null != depotList && !depotList.isEmpty()) {
for (Depot depot : depotList) {
- if(null == depot.getStorageReal()){
+ if (null == depot.getStorageReal()) {
depot.setStorageReal(0.0);
}
groupGisData.setSum(groupGisData.getSum() + depot.getStorageReal());
- if(StringUtils.isNotBlank(depot.getPledgeBank())){
+ if (StringUtils.isNotBlank(depot.getPledgeBank())) {
groupGisData.setBankSum(groupGisData.getBankSum() + depot.getStorageReal());
- }else{
+ } else {
groupGisData.setNormalSum(groupGisData.getNormalSum() + depot.getStorageReal());
}
}
}
- if(groupGisData.getSum() > 0){
+ if (groupGisData.getSum() > 0) {
groupGisData.setSumPer(new DecimalFormat("0.00").format(groupGisData.getSum() / groupGisData.getSum() * 100L));
groupGisData.setBankSumPer(new DecimalFormat("0.00").format(groupGisData.getBankSum() / groupGisData.getSum() * 100L));
groupGisData.setNormalSumPer(new DecimalFormat("0.00").format(groupGisData.getNormalSum() / groupGisData.getSum() * 100L));
@@ -427,6 +442,7 @@
/**
* 澶у睆棣栭〉-鎶撴媿璺熻釜淇℃伅
+ *
* @param param
* @return
*/
@@ -436,13 +452,22 @@
param.setEnd(new Date());
List<SnapRecord> listSnap = snapRecordService.getListByParam(param);
- if (null != listSnap && !listSnap.isEmpty()) {
+ List<SnapRecord> resultListSnap = new ArrayList<>();
+ for (SnapRecord info : listSnap) {
+ //褰撴爣绛惧寘鍚� 鍗¤溅锛� 鎴栬�呭寘鍚ぇ鍐欑殑鑻辨枃瀛楁瘝锛堜唬琛ㄦ湁杞︾墝锛夋椂锛屾坊鍔犺繘result
+ if (StringUtils.isNotBlank(info.getTags())) {
+ if (info.getTags().contains("鍗¤溅") || info.getTags().matches(".*[A-Z].*")) {
+ resultListSnap.add(info);
+ }
+ }
+ }
+ if (null != resultListSnap && !resultListSnap.isEmpty()) {
//鍒ゆ柇鏂囦欢鏄惁瀛樺湪
- for (SnapRecord record : listSnap) {
- record.setImgName(commonManager.isImgExit( record.getImgName(), null));
+ for (SnapRecord record : resultListSnap) {
+ record.setImgName(commonManager.isImgExit(record.getImgName(), null));
}
}
- return new PageResponse<>(RespCodeEnum.CODE_0000, listSnap);
+ return new PageResponse<>(RespCodeEnum.CODE_0000, resultListSnap);
}
}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java b/fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java
index 3c38737..c0c8e49 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java
@@ -300,6 +300,9 @@
if ("2".equals(viewTag)) {
viewStr = prefix + "/weight2";
}
+ if ("3".equals(viewTag)) {
+ viewStr = prefix + "/weight3";
+ }
return viewStr;
}
diff --git a/fzzy-igdss-web/src/main/resources/static/inout/inout-weight3.js b/fzzy-igdss-web/src/main/resources/static/inout/inout-weight3.js
new file mode 100644
index 0000000..d1a58bb
--- /dev/null
+++ b/fzzy-igdss-web/src/main/resources/static/inout/inout-weight3.js
@@ -0,0 +1,694 @@
+//绉伴噸-鍖呮嫭绌鸿溅鍜屾弧杞︾О閲�
+var layer;
+var form;
+var table;
+var page = 1;
+var limit = 10;
+var recordData = null;// 涓氬姟鏁版嵁淇℃伅
+var snapData;//绯荤粺鎶撴媿瀵硅薄淇℃伅
+var timerWeight;
+var curProgress = null;
+
+$(function () {
+ layui.use(['layer', 'laydate', 'form', 'table', 'util'], function () {
+ layer = layui.layer;
+ form = layui.form;
+ table = layui.table;
+ layui.laydate.render({
+ elem: '#test1',
+ theme: '#7b8e9f'
+ });
+
+ //鐩戝惉閫夋嫨鏁版嵁浜嬩欢
+ table.on('tool(tableListProgressData)', function (obj) {
+ var data = obj.data;
+ if (obj.event === 'select') {
+ //娓呯┖琛ㄥ崟
+ resetForm();
+ flushData(data.id, null);
+ // $("#listProgressData").css("display", "none");
+ // layer.closeAll();
+ }
+ });
+
+
+ //鐩戝惉浠撳簱閫夋嫨,閫夋嫨鍚庤嚜鍔ㄨ皟鐢ㄤ粨搴撶殑绮鍝佺淇℃伅
+ form.on('select(select_depotId)', function (obj) {
+ updateFoodVarietyByDepot(obj.value);
+ })
+
+ selectByHand();
+ });
+
+ //鏄剧ず娴佺▼鐜妭
+ updateEditAndProgress();
+
+ // 鐩戝惉閲嶉噺鍙樺寲
+ $(".weight").blur(function () {
+ deAuto(this.name);
+ });
+});
+
+window.onload = function () {
+ //鑷姩杩炴帴鍦扮淇℃伅锛�2.5绉掕幏鍙栦竴娆″湴纾呴噸閲忎俊鎭�
+ clearInterval(timerWeight);
+ timerWeight = setInterval(function () {
+ flushWeight();
+ }, 2500);
+
+ // 鍔犺浇瑙嗛
+ initVideo(snapDto1, snapDto2, snapDto3);
+
+ //璁剧疆鍦扮
+ $("#scaleName").val(weightDto.sort);
+
+ //鐩戝惉鍦扮閫夋嫨
+ $("#scaleName").change(function () {
+ layer.confirm('璋冩暣鍦扮闇�閲嶆柊鍔犺浇椤甸潰锛岀‘瀹氳皟鏁达紵', {
+ btn: ['纭畾', '鍙栨秷']
+ }, function () {
+ updateWeight();
+ });
+ });
+};
+
+//鏍规嵁閫夋嫨鐨勪粨搴撲俊鎭�,鏇存柊绮鍝佺
+function updateFoodVarietyByDepot(selectId) {
+ var selectDepot;
+ $.each(listDepot, function (index, data) {
+ if (data.id === selectId) {
+ selectDepot = data;
+ return false;
+ }
+ });
+
+ if (selectDepot) {
+ form.val("form-data", {
+ foodVariety: selectDepot.foodVariety
+ });
+ form.render();
+ }
+}
+
+/**
+ * 绉伴噸鍙婃姄鎷�
+ */
+function weight() {
+ // 濡傛灉鏄┖杞︾О閲�
+ if (InoutProgress.WEIGHT_EMPTY === curProgress) {
+ form.val("form-data", {
+ emptyWeight: weightDto.weight
+ });
+ form.render();
+ }
+ // 濡傛灉鏄弧杞︾О閲�
+ if (InoutProgress.WEIGHT_FULL === curProgress) {
+ form.val("form-data", {
+ fullWeight: weightDto.weight
+ });
+ form.render();
+ }
+
+ var data = form.val("form-data");
+ if (!data.plateNum) {
+ alertError("鎻愮ず锛氬～鍐欑櫥璁拌溅鐗屼俊鎭�");
+ return;
+ }
+
+ // 鐐瑰嚮绉伴噸鑷姩璋冪敤鎶撴媿
+ snapData = {
+ companyId: companyId,
+ deptId: deptId,
+ progress: curProgress,
+ bizType: type,
+ id1: snapDto1.id,
+ id2: snapDto2.id,
+ id3: snapDto3.id,
+ sort: $("#scaleName").val()
+ };
+ if (!gatewaySer) {
+ layer.msg("鏈幏鍙栧埌搴撳尯缃戝叧淇℃伅锛屾姄鍥惧け璐ワ紒");
+ return;
+ }
+ var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.snapUrl;
+ //褰撳墠AJAX鏈嶅姟涓哄悓姝ユ湇鍔★紝杩斿洖鏁版嵁鍖呰鐓х墖淇℃伅
+ var index = layer.load();
+ $.ajax({
+ sync: false,
+ type: "POST",
+ url: url,
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(snapData),
+ success: function (result) {
+ layer.close(index);
+ if (result.code != "0000") {
+ alertError(result.msg);
+ } else {
+ layer.msg("鎶撴媿鎴愬姛");
+ snapData = result.data;
+ }
+ },
+ error: function () {
+ layer.close(index);
+ alertError("鍚庡彴璋冪敤鎴浘澶辫触锛岃閲嶆柊灏濊瘯");
+ }
+ });
+}
+
+/**
+ * 绉伴噸鎻愪氦
+ */
+function submit() {
+
+ var data = form.val("form-data");
+ if (!data.depotId) {
+ alertError("鎻愮ず锛氳鍗镐粨搴撳繀濉�");
+ return;
+ }
+ if (!data.customerName) {
+ alertError("鎻愮ず锛氶�氱煡鍗曚俊鎭繀濉�");
+ return;
+ }
+ if (!data.foodVariety) {
+ alertError("鎻愮ず锛氱伯椋熷搧绉嶅繀濉�");
+ return;
+ }
+
+ // 鏍￠獙-鍏ュ簱婊¤溅绉伴噸
+ if (InoutProgress.WEIGHT_FULL === curProgress) {
+ if (data.fullWeight <= 0.0) {
+ alertError("鎻愮ず锛氭弧杞︾О閲嶄俊鎭繀濉�");
+ return;
+ }
+ }
+ if (InoutProgress.WEIGHT_EMPTY === curProgress) {
+ if (data.emptyWeight <= 0.0) {
+ alertError("鎻愮ず锛氱┖杞︾О閲嶄俊鎭繀濉�");
+ return;
+ }
+ }
+
+ if(recordData){
+ //鍚堝苟鏁版嵁
+ Object.assign(recordData, data);
+ }else {
+ recordData = data;
+ }
+ recordData.progress = curProgress;
+
+ // 鑾峰彇鐓х墖
+ var files = [{
+ fileName: snapData.fileName1
+ }, {
+ fileName: snapData.fileName2
+ }, {
+ fileName: snapData.fileName3
+ }];
+ recordData.files = files;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: "/basic/inout/submit-weight",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(recordData),
+ success: function (result) {
+ if (result.code != "0000") {
+ alertError(result.msg);
+ } else {
+ selectByHand();
+ notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
+ //绗竴娆＄О閲嶅悗锛屽埛鏂伴〉闈�
+ if (recordData.recordWeight <= 0.0) {
+ resetForm();
+ }
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ alertError("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯");
+ }
+ });
+}
+
+/**
+ * 鐐瑰嚮鎵撳嵃锛岀郴缁熷垽鏂槸鍚﹀凡缁忔墽琛屽畬鎴愶紝濡傛灉宸茬粡瀹屾垚锛岀洿鎺ユ墦鍗帮紝濡傛灉鏈畬鎴愬垯鍏堟墽琛屽畬鎴�
+ */
+function printBill() {
+ if (!recordData) {
+ alertError("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝鎵撳嵃琚嫆缁濓紒");
+ return;
+ }
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: "/basic/print/bill-weight",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(recordData),
+ success: function (result) {
+ layer.close(index);
+ if (result.code != "0000") {
+ alertError(result.msg);
+ } else {
+ layer.msg("寮�濮嬫覆鏌撴墦鍗板崟鈥︹��");
+ printWeight(result.data);
+ }
+ },
+ error: function () {
+ layer.close(index);
+ alertError("鑾峰彇鎵撳嵃妯＄増澶辫触锛岃鑱旂郴绠＄悊鍛樻煡鐪嬪師鍥�");
+ }
+ });
+}
+
+/**
+ * 鍦扮鏁版嵁鍒锋柊
+ */
+function flushWeight() {
+ var ip = "127.0.0.1";
+ if (weightDto.ip) {
+ ip = weightDto.ip;
+ }
+ var port = "9111";
+ if (weightDto.port) {
+ port = weightDto.port;
+ }
+ var sn = "WEIGHT";
+ if (weightDto.sn) {
+ sn = weightDto.sn;
+ }
+ var url = "http://" + ip + ":" + port + "/" + sn;
+ $.ajax({
+ type: "GET",
+ async: true,
+ timeout: 2000,
+ url: url,
+ data: {},
+ dataType: "json",
+ success: function (json) {
+ var data = json.content;
+ if (!data) data = 0.0;
+ weightDto.weight = data;
+ $("#weightValue").text(data);
+ $("#img_scale_statule").attr("src", "/img/web/inout/icon-gree.png");
+ },
+ error: function () {
+ weightDto.weight = 0.0;
+ $("#weightValue").text("0.0");
+ $("#img_scale_statule").attr("src", "/img/web/inout/icon-red.png");
+ }
+ });
+}
+
+/**
+ * 璇诲彇韬唤璇�
+ */
+function flushIdCard() {
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ async: true,
+ url: "http://127.0.0.1:9111/IDCARD",
+ data: {},
+ dataType: "json",
+ success: function (json) {
+ layer.close(index);
+ var data = json;
+ if (data.code === "200" || data.code == 200) {
+ // 涓存椂璧嬪��
+ $("#userName").val(data.cnName);
+ $("#userAddress").val(data.address);
+ $("#userId").val(data.idNum);
+ } else {
+ alertError("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�");
+ return;
+ }
+ },
+ error: function () {
+ layer.alert("韬唤璇佽鍙栧け璐ワ紒", {
+ offset: ['300px', '300px']
+ });
+ layer.close(index);
+ }
+ });
+}
+
+/**
+ * 璇诲彇杞︾墝鍙�
+ */
+function flushPlateNum() {
+ if (!gatewaySer) {
+ layer.msg("鏈幏鍙栧埌搴撳尯缃戝叧淇℃伅锛岃溅鐗岃鍙栧け璐ワ紒");
+ return;
+ }
+ var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.plateNumUrl;
+ var param = JSON.stringify(snapDto1);
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: url,
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: param,
+ success: function (result) {
+ if (result.code != "0000") {
+ alertError(result.msg);
+ } else {
+ $("#plateNum").val(result.data.plateNum);
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ alertError("杞︾墝璇嗗埆澶辫触锛�");
+ }
+ });
+}
+
+/**
+ * 鎵嬪姩閫夋嫨锛岃幏鍙栧緟绉伴噸鐨勬暟鎹紝寮瑰嚭閫夋嫨
+ */
+// function selectByHand() {
+// var param = {
+// deptId: deptId,
+// type: type,
+// timer: Math.random()
+// };
+// $.ajax({
+// type: "POST",
+// url: "/basic/inout/list-weight-data",
+// dataType: "json",
+// contentType: "application/json;charset=UTF-8",
+// data: JSON.stringify(param),
+// success: function (result) {
+// if (result.code != "0000") {
+// layer.msg(result.msg);
+// } else {
+// renderTableProgressData(result.data);
+// }
+// },
+// error: function () {
+// layer.msg("绯荤粺鑾峰彇鏁版嵁鍑虹幇寮傚父锛岄噸鏂板皾璇�");
+// }
+// });
+// }
+
+/**
+ * 琛ㄥ崟鏁版嵁閲嶇疆
+ */
+function resetForm() {
+
+ $("#form-data")[0].reset();
+ form.render();
+ recordData = null;
+ curProgress = null;
+ weightDto.weight = 0.0;
+ $("#weightValue").text("0.0");
+ $("#img_scale_statule").attr("src", "/img/web/inout/icon-red.png");
+
+ $("#text-param").val(null);
+}
+
+/**
+ * 椤甸潰鍒锋柊
+ */
+function flushPage() {
+ layer.confirm('纭畾瑕佸埛鏂伴〉闈㈠悧锛�', {icon: 3, title: '鎻愮ず'}, function (index) {
+ resetForm();
+ selectByHand();
+ layer.close(index);
+ });
+}
+
+/**
+ * 鏌ヨ鏁版嵁
+ * @param id
+ * @param plateNum
+ */
+function flushData(id, plateNum) {
+ var index = layer.load();
+ var param = {
+ type: type,
+ progress: curProgress,
+ id: id,
+ plateNum: plateNum
+ };
+ $.ajax({
+ type: "POST",
+ url: "/basic/inout/inout-query",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(param),
+ success: function (result) {
+ layer.close(index);
+ if (result.code != "0000") {
+ notifyProgress(result.msg, result.data);
+ } else {
+ recordData = result.data;
+ curProgress = recordData.progress;
+ // 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
+ form.val("form-data", recordData);
+ form.render();
+
+ updateEditAndProgress();
+ }
+ },
+ error: function () {
+ layer.close(index);
+ alertError("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯");
+ }
+ });
+}
+
+/**
+ * 鏍规嵁涓氬姟鏁版嵁鏇存柊椤甸潰涓殑鐘舵��
+ */
+function updateEditAndProgress() {
+ //褰撳墠娴佺▼鑺傜偣
+ if (curProgress == null) {
+ if (type === "IN") {
+ curProgress = "WEIGHT_FULL";
+ }
+ if (type === "OUT") {
+ curProgress = "WEIGHT_EMPTY";
+ }
+ }
+ //鏄剧ず褰撳墠娴佺▼
+ if (type === "IN") {
+ $("#rk-progress-register").addClass("active");
+ if (curProgress === InoutProgress.WEIGHT_FULL) {
+ $("#rk-progress-fullWeight").addClass("active");
+ $("#rk-progress-hand").removeClass("active");
+ $("#rk-progress-emptyWeight").removeClass("active");
+
+ //婊¤溅閲嶉噺鍙紪杈�
+ $("#fullWeight").removeClass("rkbk-search-input");
+ $("#fullWeight").attr("disabled", false);
+
+ //绌鸿溅閲嶉噺涓嶈兘缂栬緫
+ $("#emptyWeight").addClass("rkbk-search-input");
+ $("#emptyWeight").attr("disabled", true);
+ }
+ if (curProgress === InoutProgress.WEIGHT_EMPTY) {
+ $("#rk-progress-fullWeight").addClass("active");
+ $("#rk-progress-hand").addClass("active");
+ $("#rk-progress-emptyWeight").addClass("active");
+
+ //婊¤溅閲嶉噺涓嶈兘缂栬緫
+ $("#fullWeight").addClass("rkbk-search-input");
+ $("#fullWeight").attr("disabled", true);
+
+ //绌鸿溅閲嶉噺鍙紪杈�
+ $("#emptyWeight").removeClass("rkbk-search-input");
+ $("#emptyWeight").attr("disabled", false);
+ }
+ }
+ if (type === "OUT") {
+ $("#ck-progress-register").addClass("active");
+ if (curProgress === InoutProgress.WEIGHT_EMPTY) {
+ $("#ck-progress-emptyWeight").addClass("active");
+ $("#ck-progress-hand").removeClass("active");
+ $("#ck-progress-fullWeight").removeClass("active");
+
+ //婊¤溅閲嶉噺涓嶈兘缂栬緫
+ $("#fullWeight").addClass("rkbk-search-input");
+ $("#fullWeight").attr("disabled", true);
+
+ //绌鸿溅閲嶉噺鍙紪杈�
+ $("#emptyWeight").removeClass("rkbk-search-input");
+ $("#emptyWeight").attr("disabled", false);
+ }
+ if (curProgress === InoutProgress.WEIGHT_FULL) {
+ $("#ck-progress-emptyWeight").addClass("active");
+ $("#ck-progress-hand").addClass("active");
+ $("#ck-progress-fullWeight").addClass("active");
+
+ //婊¤溅閲嶉噺鍙紪杈�
+ $("#fullWeight").removeClass("rkbk-search-input");
+ $("#fullWeight").attr("disabled", false);
+
+ //绌鸿溅閲嶉噺涓嶈兘缂栬緫
+ $("#emptyWeight").addClass("rkbk-search-input");
+ $("#emptyWeight").attr("disabled", true);
+ }
+ }
+ //娴佺▼鏄剧ず
+ if (inoutProgress) {
+ if (inoutProgress.indexOf("REGISTER") === -1) {
+ $("#rk-progress-register").css("display", "none");
+ $("#ck-progress-register").css("display", "none");
+ }
+ if (inoutProgress.indexOf("WEIGHT_FULL") === -1) {
+ $("#rk-progress-fullWeight").css("display", "none");
+ $("#ck-progress-fullWeight").css("display", "none");
+ }
+ if (inoutProgress.indexOf("HANDLE") === -1) {
+ $("#rk-progress-hand").css("display", "none");
+ $("#ck-progress-hand").css("display", "none");
+ }
+ if (inoutProgress.indexOf("WEIGHT_EMPTY") === -1) {
+ $("#rk-progress-emptyWeight").css("display", "none");
+ $("#ck-progress-emptyWeight").css("display", "none");
+ }
+ if (inoutProgress.indexOf("CARD_BACK") === -1) {
+ $("#rk-progress-cardBack").css("display", "none");
+ $("#ck-progress-cardBack").css("display", "none");
+ }
+
+ if (type === "IN") {
+ $("#rk_progress").css("display", "block");
+ $("#ck_progress").css("display", "none");
+ }
+ if (type === "OUT") {
+ $("#ck_progress").css("display", "block");
+ $("#rk_progress").css("display", "none");
+ }
+ }
+ //鏍规嵁閰嶇疆淇℃伅璁剧疆鍦扮鏄惁鍙紪杈�
+ if (weightEditTag && weightEditTag == 'N') {
+ $("#fullWeight").addClass("rkbk-search-input");
+ $("#fullWeight").attr("disabled", true);
+
+ $("#emptyWeight").addClass("rkbk-search-input");
+ $("#emptyWeight").attr("disabled", true);
+ }
+}
+
+/**
+ * 寮瑰嚭鎻愰啋妗�
+ * @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']});
+ }
+}
+
+/**
+ * 杞﹁締閫夋嫨寮圭獥
+ * @param list
+ */
+function selectByHand() {
+ var param = {
+ deptId: deptId,
+ type: type,
+ timer: Math.random()
+ };
+ // 娓呯┖鏁版嵁
+ $("#tableListProgressData").empty();
+ table.render({
+ elem: '#tableListProgressData',
+ url: '/basic/inout/page-inout-data',
+ page: false,
+ limit: 1000,
+ even: true,
+ method: 'POST',
+ contentType: "application/json;charset=UTF-8",
+ cols: [[
+ {
+ type: 'numbers',
+ title: '搴忓彿',
+ width: '15%'
+ }, {
+ field: 'id',
+ title: '鍗曟嵁鍙�',
+ align: 'center',
+ width: '25%'
+ }, {
+ field: 'userName',
+ title: '鎵胯繍浜�',
+ align: 'center',
+ width: '15%'
+ }, {
+ field: 'plateNum',
+ title: '杞︾墝鍙�',
+ align: 'center',
+ width: '15%'
+ }, {
+ field: 'progress',
+ title: '鐘舵��',
+ align: 'center',
+ width: '15%',
+ style: 'font-weight: bold',
+ templet: function (item) {
+ return INOUT_PROGRESS_MSG(item.progress);
+ }
+ }, {
+ fixed: 'right',
+ title: '閫夋嫨杞﹁締',
+ align: 'center',
+ width: '15%',
+ toolbar: '#barSelectProgress'
+ }
+ ]],
+ where: param,
+ parseData: function (res) {
+ if ("0000" === res.code) {
+ return {
+ "code": "0",
+ "msg": res.msg,
+ "count": res.data.total,
+ "data": res.data.records
+ }
+ } else {
+ return {
+ "code": "1",
+ "msg": res.msg
+ }
+ }
+ }
+ });
+ $("thead tr").css({
+ "border-bottom": "2px solid #53adce",
+ "background": "#eff4f6"
+ });
+}
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/static/ruoyi/css/ry-ui.css b/fzzy-igdss-web/src/main/resources/static/ruoyi/css/ry-ui.css
index 28a1f48..5eb17e6 100644
--- a/fzzy-igdss-web/src/main/resources/static/ruoyi/css/ry-ui.css
+++ b/fzzy-igdss-web/src/main/resources/static/ruoyi/css/ry-ui.css
@@ -4,6 +4,15 @@
*/
/** 鍩虹閫氱敤 **/
+/* 绂佺敤 dropdown 鐨勬偓鍋滄晥鏋� */
+.dropdown:hover .dropdown-menu {
+ display: none !important;
+}
+
+.dropdown.open .dropdown-menu {
+ display: block !important;
+}
+
.pt5 {
padding-top: 5px;
}
diff --git a/fzzy-igdss-web/src/main/resources/templates/group/index.html b/fzzy-igdss-web/src/main/resources/templates/group/index.html
index 5dddee8..fcc789d 100644
--- a/fzzy-igdss-web/src/main/resources/templates/group/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/group/index.html
@@ -458,9 +458,9 @@
<script th:src="@{/common/igds-common.js}"></script>
<script th:src="@{/group/mapList.js}"></script>
<script th:src="@{/group/index.js}"></script>
-<script th:inline="javascript"> var userId = [[${loginUser.loginName}]];
-var companyId = [[${loginUser.companyId}]];
-
+<script th:inline="javascript">
+ var userId = [[${loginUser.loginName}]];
+ var companyId = [[${loginUser.companyId}]];
var deptId = [[${deptId}]];
var dicSlogan = [[${dicSlogan}]];
var deptAllList = [[${deptAllList}]];
diff --git a/fzzy-igdss-web/src/main/resources/templates/index-static.html b/fzzy-igdss-web/src/main/resources/templates/index-static.html
index 3efb481..ba7987c 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index-static.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index-static.html
@@ -229,7 +229,7 @@
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="鍏ㄥ睆鏄剧ず"
href="javascript:;" id="fullScreen"><i class="fa fa-arrows-alt"></i> 鍏ㄥ睆</a></li>
<li class="dropdown user-menu">
- <a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">
+ <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img src="../static/img/profile.jpg" class="user-image">
<span class="hidden-xs">绠＄悊鍛�</span>
</a>
diff --git a/fzzy-igdss-web/src/main/resources/templates/index-topnav.html b/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
index 2906f13..8fbc7b3 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
@@ -285,7 +285,7 @@
href="javascript:;" id="fullScreen"><i class="fa fa-arrows-alt"></i> 鍏ㄥ睆</a></li>
<li class="dropdown user-menu">
- <a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">
+ <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img th:src="(${#strings.isEmpty(user.avatar)}) ? @{/img/profile.jpg} : @{${user.avatar}}"
th:onerror="this.src='img/profile.jpg'" class="user-image">
<span class="hidden-xs">[[${#strings.defaultString(user.userName, '-')}]]</span>
diff --git a/fzzy-igdss-web/src/main/resources/templates/index.html b/fzzy-igdss-web/src/main/resources/templates/index.html
index c673d44..21842f0 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index.html
@@ -124,7 +124,7 @@
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="鍏ㄥ睆鏄剧ず"
href="javascript:;" id="fullScreen"><i class="fa fa-arrows-alt"></i> 鍏ㄥ睆</a></li>
<li class="dropdown user-menu">
- <a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">
+ <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img th:src="(${#strings.isEmpty(user.avatar)}) ? @{/img/profile.jpg} : @{${user.avatar}}"
th:onerror="this.src='img/profile.jpg'" class="user-image">
<span class="hidden-xs">[[${#strings.defaultString(user.userName, '-')}]]</span>
diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/weight3.html b/fzzy-igdss-web/src/main/resources/templates/inout/weight3.html
new file mode 100644
index 0000000..45fcf66
--- /dev/null
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/weight3.html
@@ -0,0 +1,834 @@
+<!DOCTYPE html>
+<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="renderer" content="webkit">
+ <title>鍑哄叆搴撶鐞�-鍏ュ簱绉伴噸</title>
+
+ <link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui/css/layui.css}"/>
+ <link rel="stylesheet" type="text/css" th:href="@{/inout/inout-style.css}">
+
+ <!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
+ <script th:src="@{/js/plugins/lodop/LodopFuncs.js}"></script>
+
+ <style>
+ .kccz-r-btnbox {
+ width: 86px !important;
+ }
+
+ .layui-table-body {
+ max-height: 400px;
+ }
+
+ .kccz-r-btn {
+ width: 86px !important;
+ }
+
+ #text-param {
+ font-size: 14px;
+ color: red;
+ padding-left: 10px;
+ }
+
+ .display-none {
+ display: none;
+ }
+
+ .cursor {
+ cursor: pointer;
+ }
+
+ .kccz-czxx-dl dt {
+ width: 25px;
+ height: 24px;
+ color: #000;
+ font-size: 18px;
+ }
+
+ .kccz-left-box2 {
+ height: 570px;
+ }
+
+ .color-red {
+ color: red !important;
+ }
+
+ .layui-table td {
+ font-weight: bold;
+ }
+
+ .layui-select-disabled .layui-disabled {
+ color: #000 !important;
+ }
+
+ .depot-food input {
+ line-height: 34px;
+ padding-right: 10px;
+ font-size: 16px;
+ color: #666;
+ background: #eff4f6;
+ }
+
+ .rk-step-wrap {
+ padding: 0px;
+ border-bottom: 0px;
+ text-align: center;
+ }
+
+ .rkbk-quick {
+ margin-top: 15px !important;
+ }
+
+ .kccz-con {
+ margin: 10px 0px;
+ }
+
+ .border-no {
+ border: 0px;
+ }
+
+ .qyzj-btnbox {
+ margin-top: 10px;
+ }
+
+ .kccz-data-btnbox {
+ min-height: 38px;
+ padding-top: 2px;
+ }
+
+ .layui-layer-title {
+ font-weight: bold;
+ }
+
+ .rkbk-search-btn {
+ width: 100px;
+ height: 30px;
+ line-height: 30px;
+ font-size: 16px;
+ }
+
+ .r-360 {
+ right: 360px;
+ }
+
+ .r-240 {
+ right: 240px;
+ }
+
+ .r-120 {
+ right: 120px;
+ }
+
+ .rkbk-search-input {
+ background: #e7eaec !important;
+ }
+
+ #scaleName {
+ width: 130px;
+ height: 28px;
+ }
+
+ .layui-table, .layui-table-view {
+ margin: 0 0;
+ }
+
+ .layui-table-body {
+ max-height: 430px;
+ }
+
+ .video {
+ width: 100%;
+ height: 100%;
+ }
+
+ .layui-form-radio {
+ margin: unset;
+ margin-top: 5px;
+ padding-right: unset;
+ }
+
+ .rk-step li {
+ width: 60px;
+ height: 40px;
+ display: inline-block;
+ margin: 0 20px;
+ position: relative;
+ }
+
+ .kccz-r-con {
+ height: 160px;
+ position: relative;
+ }
+
+ .kccz-r-vedio {
+ width: 100%;
+ height: 100%;
+ background: #5f5f5f;
+ }
+
+ .kccz-r-item {
+ height: 210px;
+ width: 33.333%;
+ float: left;
+ background: unset;
+ }
+ .kccz-left {
+ width: 52%;
+ }
+ .kccz-right {
+ width: 47.4%;
+ }
+ .kccz-r-box {
+ padding: 0 5px;
+ }
+ .rkbk-quick-btn {
+ height: 55px;
+ min-width: 100px;
+ display: inline-block;
+ line-height: 40px;
+ font-size: 20px;
+ margin-top: -15px;
+ }
+ </style>
+
+</head>
+
+<body>
+
+<div class="l-container layui-clear">
+ <div class="rk-main">
+ <div class="qyzj-btnbox layui-clear">
+
+ <div class="rkbk-quick fl">
+ <button id="btn-weight" class="rkbk-quick-btn layui-btn btn-blue"
+ onclick="weight()">
+ <i><img th:src="@{/img/web/inout/icon-chengzhong.png}"/></i>姝ラ1锛氱О閲�
+ </button>
+ <button id="btn-submit"
+ class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
+ <i><img th:src="@{/img/web/inout/icon-ok.png}"/></i>姝ラ2锛氭彁浜�
+ </button>
+ <button id="btn-printBill"
+ class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
+ <i><img th:src="@{/img/web/inout/icon-dayin.png}"/></i>鎵撳嵃纾呭崟
+ </button>
+ <button class="rkbk-quick-btn layui-btn btn-violet"
+ onclick="flushPage()">
+ <i><img th:src="@{/img/web/inout/icon-shuaxin2.png}"/></i>鍒锋柊椤甸潰
+ </button>
+ </div>
+ <!-- 娴佺▼寮曞 -->
+ <div class="rk-step-wrap fr">
+ <ul class="rk-step" id="rk_progress" style="display: none;">
+ <li id="rk-progress-register" class="rk-step-first">
+ <span class="rk-step-span">
+ <img th:src="@{/img/web/inout/icon-dengji.png}"/>
+ </span>
+ <p>鍏ュ簱鐧昏</p>
+ </li>
+ <li id="rk-progress-fullWeight">
+ <span class="rk-step-span">
+ <img th:src="@{/img/web/inout/icon-chengzhong.png}"/>
+ </span>
+ <p>婊¤溅绉伴噸</p>
+ </li>
+ <li id="rk-progress-hand">
+ <span class="rk-step-span">
+ <img th:src="@{/img/web/inout/icon-xiehuo.png}"/>
+ </span>
+ <p>鍏ュ簱鍊间粨</p>
+ </li>
+ <li id="rk-progress-emptyWeight">
+ <span class="rk-step-span">
+ <img th:src="@{/img/web/inout/icon-chengzhong.png}"/>
+ </span>
+ <p>绌鸿溅绉伴噸</p>
+ </li>
+ <li id="rk-progress-cardBack">
+ <span class="rk-step-span">
+ <img th:src="@{/img/web/inout/icon-banli.png}"/>
+ </span>
+ <p>绂诲簱纭</p>
+ </li>
+ </ul>
+ <ul class="rk-step" id="ck_progress" style="display: none;">
+ <li id="ck-progress-register" class="rk-step-first">
+ <span class="rk-step-span">
+ <img th:src="@{/img/web/inout/icon-dengji.png}"/>
+ </span>
+ <p>鍑哄簱鐧昏</p>
+ </li>
+ <li id="ck-progress-emptyWeight">
+ <span class="rk-step-span">
+ <img th:src="@{/img/web/inout/icon-chengzhong.png}"/>
+ </span>
+ <p>绌鸿溅绉伴噸</p>
+ </li>
+ <li id="ck-progress-hand">
+ <span class="rk-step-span">
+ <img th:src="@{/img/web/inout/icon-xiehuo.png}"/>
+ </span>
+ <p>鍑哄簱鍊间粨</p>
+ </li>
+ <li id="ck-progress-fullWeight">
+ <span class="rk-step-span">
+ <img th:src="@{/img/web/inout/icon-chengzhong.png}"/>
+ </span>
+ <p>婊¤溅绉伴噸</p>
+ </li>
+ <li id="ck-progress-cardBack">
+ <span class="rk-step-span">
+ <img th:src="@{/img/web/inout/icon-banli.png}"/>
+ </span>
+ <p>绂诲簱纭</p>
+ </li>
+ </ul>
+ </div>
+ <!-- 娴佺▼寮曞EDN -->
+ </div>
+ <div class="kccz-con">
+ <div class="kccz-left fl">
+ <div class="kccz-left-box1 radius-6">
+ <div class="rkbk-tit">
+ <i></i>
+ <div>
+ <h3 style="width: 150px; float: left;">绉伴噸淇℃伅</h3>
+ <div style="float: right;">
+ <div class="kccz-czxx-left fl">
+ <div class="layui-form-item">
+ <label class="layui-form-label">褰撳墠鍦扮</label>
+ <div class="layui-input-block">
+ <select name="depotId" id="scaleName" lay-filter="select_scaleName">
+ <option th:each="dto,weightSet:${listWeight}"
+ th:value="${dto.sort}" th:text="${dto.name}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="kccz-czxx-right fr">
+ <dl class="kccz-czxx-dl" style="padding-left: 15px;">
+ <dt>
+ <i><img id="img_scale_statule"
+ th:src="@{/img/web/inout/icon-red.png}"/></i>
+ </dt>
+ </dl>
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="kccz-czxx-wrap">
+ <div class="kccz-czxx-num">
+ <span id="weightValue">0.00</span><em>KG</em>
+ </div>
+
+ </div>
+ <!--kccz-czxx-wrap end-->
+
+ </div>
+ <!--kccz-left-box1 end-->
+
+ <div class="kccz-left-box2 mt-10 radius-6">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>涓氬姟鏁版嵁<span id="text-param"></span></h3>
+ </div>
+ <div class="kccz-data-form layui-row">
+ <form class="layui-form" action="" id="form-data"
+ lay-filter="form-data">
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌-鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" name="id" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌-娴佺▼鑺傜偣</label>
+ <div class="layui-input-block">
+ <input type="text" name="progress" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌-閫氱煡鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" name="noticeId" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌-浜у湴</label>
+ <div class="layui-input-block">
+ <input type="text" name="foodLocationId"
+ autocomplete="off" class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌-绫诲瀷</label>
+ <div class="layui-input-block">
+ <input type="text" name="type" th:value="${type}"
+ autocomplete="off" class="layui-input rkbk-search-input">
+ </div>
+ </div>
+
+ <div class="layui-col-xs8">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">閫氱煡鍗�</label>
+ <div class="layui-input-block">
+ <input type="text" name="customerName" placeholder="璇烽�夋嫨"
+ autocomplete="off" class="layui-input" disabled="disabled"> <em
+ class="kccz-data-dw cursor" onclick="showNotice()">鈥︹��</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label" id="depotIdLabel">瑁呭嵏浠撳簱</label>
+ <div class="layui-input-block">
+ <select name="depotId" id="depotId" lay-filter="select_depotId">
+ <option value=""></option>
+ <option th:each="depot,depotSet:${listDepot}"
+ th:value="${depot.id}" th:text="${depot.name}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">姣涢噸(婊¤溅)</label>
+ <div class="layui-input-block">
+ <input type="text" name="fullWeight" id="fullWeight" autocomplete="off"
+ placeholder="鍦扮鑷姩甯﹀叆" class="layui-input weight rkbk-search-input"
+ disabled>
+ <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">鐨噸(绌鸿溅)</label>
+ <div class="layui-input-block">
+ <input type="text" name="emptyWeight" id="emptyWeight" autocomplete="off"
+ placeholder="鍦扮鑷姩甯﹀叆" class="layui-input weight rkbk-search-input"
+ disabled>
+ <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑� 閲�</label>
+ <div class="layui-input-block">
+ <input type="text" name="netWeight" autocomplete="off"
+ placeholder="鑷姩璁＄畻" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">绮鍝佺</label>
+ <div class="layui-input-block">
+ <select name="foodVariety" id="foodVariety">
+ <option value=""></option>
+ <option th:each="dic,dicSet:${listFoodVariety}"
+ th:value="${dic.dictValue}" th:text="${dic.dictLabel}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">姘� 鍒�</label>
+ <div class="layui-input-block">
+ <input id="perWet" type="text" name="perWet" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input weight"> <em
+ class="kccz-data-dw">%</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵� 閲�</label>
+ <div class="layui-input-block">
+ <input id="deOther" type="text" name="deOther" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input weight"> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗� 浠�</label>
+ <div class="layui-input-block">
+ <input id="price" type="text" name="price" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input weight"> <em
+ class="kccz-data-dw">鍏�</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏉� 璐�</label>
+ <div class="layui-input-block">
+ <input id="perImpurity" type="text" name="perImpurity" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input weight"> <em
+ class="kccz-data-dw">%</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4 display-none">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏ュ簱閲嶉噺</label>
+ <div class="layui-input-block">
+ <input type="text" name="recordWeight" placeholder="鑷姩璁＄畻"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">缁撶畻閲嶉噺</label>
+ <div class="layui-input-block">
+ <input type="text" name="settleWeight" placeholder="鑷姩璁＄畻"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="line-container" style="margin: 10px 0 0 0;">
+ <div class="line"></div>
+ <div class="line-text" style="font-size: 16px">浠ヤ笅涓虹櫥璁颁俊鎭�</div>
+ <div class="line"></div>
+ </div>
+
+ </div>
+ <div class="layui-col-xs12">
+ <div style="height: 40px">
+ <input type="button" value="璇昏韩浠借瘉"
+ style="height: 34px;line-height: 34px;right: 120px;"
+ class="rkbk-search-btn layui-btn" onclick="flushIdCard()">
+ <input type="button" value="璇昏溅鐗�" style="height: 34px;line-height: 34px"
+ class="rkbk-search-btn layui-btn" onclick="flushPlateNum()">
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">鎵胯繍浜�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userName" placeholder="璇疯緭鍏�" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">韬唤璇佸彿</label>
+ <div class="layui-input-block">
+ <input type="text" name="userId" id="userId" placeholder="璇疯緭鍏�"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">杞︾墝鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" name="plateNum" id="plateNum" placeholder="璇疯緭鍏�"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
+ <div class="layui-input-block">
+ <input type="text" name="userContact" id="userContact" placeholder="璇疯緭鍏�"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs8">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍦� 鍧�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userAddress" id="userAddress" placeholder="璇疯緭鍏�"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs12" style="padding-left: 50px;color: #2ab5ad;">
+ 璇存槑锛�
+ <span style="color: #2ab5ad;">
+ 1. 鍑�閲�=姣涢噸-鐨噸锛涘叆搴撻噸閲�=缁撶畻閲嶉噺=鍑�閲�-鎵ｉ噸锛�
+ </span>
+ <br>
+ <span style="padding-left: 46px;color: #2ab5ad;">
+ 2. 娴佺▼涓溅杈嗗彲鐐瑰嚮杞﹁締閫夋嫨锛岃繘琛岀О閲嶏紱鏈櫥璁拌溅杈嗭紝鍙～鍐欑浉鍏充俊鎭紝鐩存帴绉伴噸锛�
+ </span>
+ </div>
+ </form>
+ </div>
+ </div>
+ <!--kccz-left-box2 end-->
+
+ </div>
+ <!--kccz-left end-->
+ <div class="kccz-right fr">
+ <div class="kccz-left-box2 radius-6" style="height: 515px;padding: 1px 5px 0px 10px;">
+ <div class="rkbk-tit" style="margin-left: 15px;">
+ <i></i>
+ <h3>绉伴噸鏁版嵁<span></span></h3>
+ </div>
+ <!-- 娴佺▼鏁版嵁淇℃伅 -->
+ <div class="layui-tab-content" id="listProgressData" style="padding: 0">
+ <table class="layui-table tableListProgressData" id="tableListProgressData"
+ lay-filter="tableListProgressData">
+ <thead>
+ <tr class="qyzj-table-tit">
+ <th>鍗曟嵁鍙�</th>
+ <th>鎵胯繍浜�</th>
+ <th>杞︾墝鍙�</th>
+ <th>鐘舵��</th>
+ <th>閫夋嫨杞﹁締</th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="kccz-left-box2 mt-10 radius-6" style="height: 210px;padding: 5px;">
+ <div class="kccz-r-item radius-6">
+ <div class="kccz-r-box">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>杩囩▼瑙嗛1</h3>
+ </div>
+ <div class="kccz-r-con">
+ <div class="kccz-r-vedio" id="kccz-r-video1">
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--kccz-r-item end-->
+
+ <div class="kccz-r-item radius-6">
+ <div class="kccz-r-box">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>杩囩▼瑙嗛2</h3>
+ </div>
+ <div class="kccz-r-con">
+ <div class="kccz-r-vedio" id="kccz-r-video2">
+
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--kccz-r-item end-->
+
+ <div class="kccz-r-item radius-6">
+ <div class="kccz-r-box">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>杩囩▼瑙嗛3</h3>
+ </div>
+ <div class="kccz-r-con">
+ <div class="kccz-r-vedio" id="kccz-r-video3">
+
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--kccz-r-item end-->
+<!-- <div class="kccz-r-item radius-6">-->
+<!-- <div class="kccz-r-box">-->
+<!-- <div class="rkbk-tit">-->
+<!-- <i style="margin: 8px 3px 0 3px"></i>-->
+<!-- <h3>杞︾墝璇嗗埆瑙嗛</h3>-->
+<!-- </div>-->
+<!-- <div class="kccz-r-con">-->
+<!-- <div class="kccz-r-vedio" id="kccz-r-video1">-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- </div>-->
+
+<!-- </div>-->
+<!-- <!–kccz-r-item end–>-->
+
+<!-- <div class="kccz-r-item radius-6 mt-10">-->
+<!-- <div class="kccz-r-box">-->
+<!-- <div class="rkbk-tit">-->
+<!-- <i style="margin: 8px 3px 0 3px"></i>-->
+<!-- <h3>杞﹂《鎶撴媿瑙嗛</h3>-->
+<!-- </div>-->
+<!-- <div class="kccz-r-con">-->
+<!-- <div class="kccz-r-vedio" id="kccz-r-video2">-->
+
+
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- </div>-->
+
+<!-- </div>-->
+<!-- <!–kccz-r-item end–>-->
+
+<!-- <div class="kccz-r-item radius-6 mt-10">-->
+<!-- <div class="kccz-r-box">-->
+<!-- <div class="rkbk-tit">-->
+<!-- <i style="margin: 8px 3px 0 3px"></i>-->
+<!-- <h3>杞﹀熬鎶撴媿瑙嗛</h3>-->
+<!-- </div>-->
+<!-- <div class="kccz-r-con">-->
+<!-- <div class="kccz-r-vedio" id="kccz-r-video3">-->
+
+
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- </div>-->
+
+<!-- </div>-->
+ </div>
+
+ <!--kccz-r-item end-->
+
+ </div>
+ </div>
+ <!--kccz-con end-->
+
+ </div>
+ <!--rk-main end-->
+
+</div>
+<!--l-container end-->
+
+<script th:inline="javascript">
+ //娴佺▼鐜妭
+ var inoutProgress = [[${inoutProgress}]];
+ var progress = [[${progress}]];
+ var deptId = [[${deptId}]];
+ var listDepot = [[${listDepot}]];
+ var weightEditTag = [[${weightEditTag}]];
+ //userId
+ var userId = [[${loginUser.loginName}]];
+ //鍑哄叆搴撶被鍨�
+ var type = [[${type}]];
+ var companyId = [[${loginUser.companyId}]];
+
+ //鍦扮淇℃伅
+ var weightDto = [[${weightDto}]];
+
+ //杩囩▼鎽勫儚澶�
+ var snapDto1 = [[${snapDto1}]];
+ var snapDto2 = [[${snapDto2}]];
+ var snapDto3 = [[${snapDto3}]];
+ //缃戝叧淇℃伅
+ var gatewaySer = [[${gatewaySer}]];
+
+</script>
+
+<script th:src="@{/ajax/libs/layui/layui.js}"></script>
+<script th:src="@{/js/jquery.min.js}"></script>
+<script th:src="@{/common/constant.js}"></script>
+<script th:src="@{/common/igds-common.js}"></script>
+<script th:src="@{/inout/inout-common.js}"></script>
+<script th:src="@{/inout/inout-print.js}"></script>
+<script th:src="@{/inout/video-play.js}"></script>
+<script th:src="@{/inout/weight.js}"></script>
+<script th:src="@{/inout/inout-weight3.js}"></script>
+
+</body>
+
+<!-- 寮瑰嚭閫氱煡鍗� -->
+<div class="layui-tab-content" id="listNotice" style="display: none;">
+ <table class="layui-table" lay-skin="nob" id="tableNotice"
+ lay-filter="tableNotice" style="margin: 0px;"></table>
+</div>
+
+<!-- 寮瑰嚭绮浜у湴 -->
+<div class="layui-tab-content" id="listFoodLocation" style="display: none;">
+ <table class="layui-table" lay-skin="nob" id="tableFoodLoaction"
+ lay-filter="tableFoodLoaction" style="margin: 0px;"></table>
+</div>
+
+<!--<!– 娴佺▼鏁版嵁淇℃伅 –>-->
+<!--<div class="layui-tab-content" id="listProgressData" style="display: none;">-->
+<!-- <table class="layui-table tableListProgressData" id="tableListProgressData"-->
+<!-- lay-filter="tableListProgressData">-->
+<!-- <thead>-->
+<!-- <tr class="qyzj-table-tit">-->
+<!-- <th>鍗曟嵁鍙�</th>-->
+<!-- <th>鎵胯繍浜�</th>-->
+<!-- <th>杞︾墝鍙�</th>-->
+<!-- <th>鎿嶄綔</th>-->
+<!-- </tr>-->
+<!-- </thead>-->
+<!-- <tbody>-->
+<!-- </tbody>-->
+<!-- </table>-->
+<!--</div>-->
+
+<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
+<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
+ <table class="layui-table">
+ <colgroup>
+ <col>
+ </colgroup>
+ <tbody>
+ <tr>
+ <td>杩斿洖淇℃伅</td>
+ <td id="resultMsg" style="color: red;font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>鎵胯繍浜�</td>
+ <td id="resultUserName" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>杞︾墝鍙�</td>
+ <td id="resultPlateNum" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>涓嬩竴姝�</td>
+ <td id="resultType" style="font-weight: bold;"></td>
+ </tr>
+ </tbody>
+ </table>
+</div>
+
+<script type="text/html" id="toolbarFoodLocaton">
+ <div class="">
+ <div class="layui-col-xs6">
+ <input type="text" id="key2" placeholder="杈撳叆缂栫爜鎴栬�呭悕绉扳�︹��" class="layui-input">
+ </div>
+ <div class="layui-col-xs6" style="padding-left: 10px;">
+ <button class="layui-btn layui-btn-sm" onclick="flushFoodLocation()">鏌ヨ</button>
+ </div>
+ </div>
+</script>
+
+<script type="text/html" id="barSelectProgress">
+ <a class="layui-btn layui-btn-xs" style="width: 80px;height: 30px;line-height: 30px;border-radius: 6px;" lay-event="select">閫夋嫨</a>
+</script>
+
+</html>
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/templates/login.html b/fzzy-igdss-web/src/main/resources/templates/login.html
index 9afde1b..4a9ed17 100644
--- a/fzzy-igdss-web/src/main/resources/templates/login.html
+++ b/fzzy-igdss-web/src/main/resources/templates/login.html
@@ -122,14 +122,14 @@
</div>
<!--鎵嬫満APP-->
- <div class="login2-ewm css-hand">
+ <div class="login2-ewm css-hand" onClick="showCode()">
<h3>
<i class="i-icon"><img th:src="@{/login/images/login-app.png}"/></i>涓嬭浇APP
</h3>
</div>
<div class="login2-ewm-img dis-none" id="ewm">
- <img th:src="@{/login/images/login-app.png}"/>
+ <img th:src="@{/login/images/login-app.png}" style="width: 100%;height: 100%"/>
</div>
<h1 class="login-tit">
@@ -226,6 +226,10 @@
<script th:inline="javascript">
var ctx = [[@{/}]] ;
var captchaType = [[${captchaType}]];
+
+ function showCode() {
+ $("#ewm").css("display", "block");
+ }
</script>
<script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
<script src="../static/ajax/libs/validate/jquery.validate.min.js"
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..15333bf 100644
--- a/fzzy-igdss-web/src/main/resources/templates/print/pay.html
+++ b/fzzy-igdss-web/src/main/resources/templates/print/pay.html
@@ -2,7 +2,7 @@
<html lang='zh-cn'>
<head>
- <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
+ <meta content='text/html;charset=UTF-8' http-equiv='Content-Type'>
<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;}
@@ -12,16 +12,16 @@
<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'>
+<table cellpadding='0' cellspacing='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 colspan='3' width='37.5%'>[userName]</td>
<td width='12.5%'>鑱旂郴鐢佃瘽</td>
- <td width='37.5%' colspan='3'>[userContact]</td>
+ <td colspan='3' width='37.5%'>[userContact]</td>
</tr>
<tr>
<td>韬唤璇佸彿鐮�</td>
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
index 68f7f7e..85ddda1 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
@@ -40,8 +40,8 @@
</select>
</li>
<li th:if="${viewType == '1'}" style="display: flex">
- <label>浜嬩欢鍚嶇О锛�</label>
- <input class="form-control" type="text" name="name" placeholder="璇疯緭鍏ヤ簨浠跺悕绉�">
+ <label>浜嬩欢鏍囩锛�</label>
+ <input class="form-control" type="text" name="name" placeholder="璇疯緭鍏ヤ簨浠舵爣绛�">
</li>
<li class="select-time">
<label style="width: 100px">浜嬩欢鏃堕棿锛� </label>
--
Gitblit v1.9.3