From 5eb90395313f5d7232aad2fb1a821a0028ca7764 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 31 五月 2023 11:49:48 +0800
Subject: [PATCH] 出入库优化-称重页面
---
/dev/null | 958 -----------------------
igds-web/src/main/resources/templates/admin/inout/in-weight.html | 296 ++++---
igds-web/src/main/resources/templates/admin/inout/in-weight20230530.html | 221 ++--
igds-web/src/main/resources/static/admin/inout/in-weight20230530.js | 777 +++++++++++++++++++
igds-web/src/main/resources/static/admin/inout/in-weight.js | 107 -
igds-web/src/main/resources/templates/admin/inout/in-register.html | 3
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 4
igds-web/src/main/resources/static/admin/inout/style.css | 21
8 files changed, 1,118 insertions(+), 1,269 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
index c8483bc..3cc0bcb 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -679,9 +679,7 @@
* @param data
*/
private void setInoutCache(String deptId, InoutData data) {
- String key = this.buildInoutKey(deptId,
- InoutConstant.KEY_INOUT_LIST, data.getType(), data.getId());
-
+ String key = this.buildInoutKey(deptId, InoutConstant.KEY_INOUT_LIST, data.getType(), data.getId());
redisUtil.set(key, data, InoutConstant.KEY_INOUT_LIST_TIME);
}
diff --git a/igds-web/src/main/resources/static/admin/inout/in-weight-bak20221110.js b/igds-web/src/main/resources/static/admin/inout/in-weight-bak20221110.js
deleted file mode 100644
index e98b2c4..0000000
--- a/igds-web/src/main/resources/static/admin/inout/in-weight-bak20221110.js
+++ /dev/null
@@ -1,958 +0,0 @@
-//绉伴噸-鍖呮嫭绌鸿溅鍜屾弧杞︾О閲�
-var layer;
-var form;
-var table;
-var recordData = null;// 涓氬姟鏁版嵁淇℃伅
-var snapData;//绯荤粺鎶撴媿瀵硅薄淇℃伅
-var timerWeight;
-
-$(function () {
- layui.use(['layer', 'laydate', 'form', 'table', 'util'], function () {
- var util = layui.util;
- layer = layui.layer;
- form = layui.form;
- table = layui.table;
- layui.laydate.render({
- elem: '#test1',
- theme: '#7b8e9f'
- });
-
- // 鍙充笅瑙掓坊鍔犲浐瀹氫俊鎭�
- util.fixbar({
- bar1: true,
- css: {
- right: 10,
- bottom: 20
- },
- bgcolor: '#53adce',
- click: function (type) {
- if (type === 'bar1') {
- layer.closeAll();
- layer.open({
- type: 2,
- title: false,
- shadeClose: true,
- shade: 0.3,
- closeBtn: 2,
- area: ['1000px', '640px'],
- content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
- });
- }
- }
- });
-
- //鐩戝惉浠撳簱閫夋嫨,閫夋嫨鍚庤嚜鍔ㄨ皟鐢ㄤ粨搴撶殑绮鍝佺淇℃伅
- form.on('select(select_depotId)', function (obj) {
- updateFoodVarietyByDepot(obj.value);
- })
- });
-
- //鏄剧ず娴佺▼鐜妭
- showProgress();
-
- // 鐩戝惉姣斾緥鍊煎～鍐�
- $(".per").blur(function () {
- deAutoByPer();
- });
-
- // 鐩戝惉閲嶉噺鍙樺寲
- $(".weight").blur(function () {
- deAutoByWeight();
- });
-
- // 鍒濆鍖朩ebSocket
- initInoutWS(companyId, bizType, progress, userId);
-});
-
-window.onload = function () {
- //鑷姩杩炴帴鍦扮淇℃伅锛�2.5绉掕幏鍙栦竴娆″湴纾呴噸閲忎俊鎭�
- // clearInterval(timerWeight);
- // timerWeight = setInterval(function () {
- // flushWeight();
- // }, 2500);
-
- // 鍔犺浇瑙嗛
- initVideo(lprDto, snapDto1, snapDto2);
-};
-
-// socket淇℃伅杩斿洖铏曠悊
-function socketOnMessage(packet) {
- var packetData = packet.data;
- // 杞︾墝璇嗗埆-鏍规嵁Sn杩涜鍖归厤锛岃溅鐗岃繘琛屽尮閰嶏紝濡傛灉鍖归厤澶辫触鍒欏脊鍑烘彁绀轰俊鎭�
- if (packet.bizId == "PLATE_NUM") {
- if (packetData.sn == lprDto.sn) {
- if (recordData.plateNum && packetData.plateNum != recordData.plateNum) {
- layer.alert("璇锋敞鎰忥細绯荤粺妫�娴嬭溅鐗屼负锛�" + packetData.plateNum + "锛屼笌褰撳墠鍗＄墖淇℃伅涓嶇鍚堬紝璇锋牳瀵癸紒");
- }
- img1 = packetData.imgName;
- window.parent.sysNotify("杞︾墝璇嗗埆缁撴灉锛�" + packetData.plateNum);
- }
- }
-}
-
-// 鏍规嵁褰撳墠鎿嶄綔鐨勬寜閽甀D鏇存柊鍏朵粬鎸夐挳鐘舵��
-function flushBtn(btnId) {
- if ("btn-weight" == btnId) {// 绉伴噸鍚庡彲浠ョ偣鍑诲畬鎴愮О閲�
- $("#btn-submit").removeClass("layui-btn-disabled");
- $("#btn-submit").attr("disabled", false);
- }
-
- if ("btn-submit" == btnId) {
- $("#btn-submit").addClass("layui-btn-disabled");
- $("#btn-submit").attr("disabled", true);
- if (InoutProgress.WEIGHT_FULL == recordData.progress) {// 濡傛灉鏄弧杞︾О閲嶏紝鍒欑洿鎺ュ綋鍓嶈妭鐐瑰畬鎴�
- resetForm();
- } else {
- // 瀹屾垚绉伴噸鍚庢帶鍒舵寜閽�
- $("#btn-weight").addClass("layui-btn-disabled");
- $("#btn-weight").attr("disabled", true);
-
- $("#btn-printBill").removeClass("layui-btn-disabled");
- $("#btn-printBill").attr("disabled", false);
-
- addDisabled();
- }
- }
- if ("btn-printBill" == btnId) {// 鎵撳嵃杩囩鍗曪紝璇存槑涓氬姟瀹屾垚
- $("#btn-weight").removeClass("layui-btn-disabled");
- $("#btn-weight").attr("disabled", false);
-
- $("#btn-submit").addClass("layui-btn-disabled");
- $("#btn-submit").attr("disabled", true);
-
- $("#btn-printBill").addClass("layui-btn-disabled");
- $("#btn-printBill").attr("disabled", true);
-
- delDisabled();
- resetForm();
- }
-}
-
-//鎺у埗娴佺▼鐜妭鏄剧ず
-function showProgress() {
- if (!inoutProgress) {
- return;
- }
- if (inoutProgress.indexOf("REGISTER") == -1) {
- $("#progress-register").css("display", "none");
- }
- if (inoutProgress.indexOf("CHECK") == -1) {
- $("#progress-check").css("display", "none");
- }
- if (inoutProgress.indexOf("WEIGHT_FULL") == -1) {
- $("#progress-fullWeight").css("display", "none");
- }
- if (inoutProgress.indexOf("HANDLE") == -1) {
- $("#progress-hand").css("display", "none");
- }
- if (inoutProgress.indexOf("WEIGHT_EMPTY") == -1) {
- $("#progress-emptyWeight").css("display", "none");
- }
- if (inoutProgress.indexOf("CARD_BACK") == -1) {
- $("#progress-cardBack").css("display", "none");
- }
-}
-
-
-//鏇存敼鎵ｉ噸淇℃伅妗嗕笉鍙紪杈�
-function addDisabled() {
- //鏉傝川
- $("#impurity").attr("disabled", true);
- $("#deImpurity").attr("disabled", true);
- //姘村垎
- $("#wet").attr("disabled", true);
- $("#deWet").attr("disabled", true);
- //鍊间粨
- $("#deHandle").attr("disabled", true);
- //鍏朵粬
- $("#deOther").attr("disabled", true);
-}
-
-//鎭㈠鎵ｉ噸淇℃伅妗嗙紪杈戠姸鎬�
-function delDisabled() {
- //鏉傝川
- $("#impurity").attr("disabled", false);
- $("#deImpurity").attr("disabled", false);
- //姘村垎
- $("#wet").attr("disabled", false);
- $("#deWet").attr("disabled", false);
- //鍊间粨
- $("#deHandle").attr("disabled", false);
- //鍏朵粬
- $("#deOther").attr("disabled", false);
-}
-
-// 鐐瑰嚮绉伴噸
-function weight() {
- // 娌℃湁涓氬姟鏁版嵁涓嶅彲鎵ц
- if (!recordData) {
- layer.alert("娌℃湁鏌ヨ鍒颁笟鍔℃暟鎹紝鎵ц琚嫆缁濓紒锛�");
- return;
- }
-
- // 濡傛灉鏄┖杞︾О閲�
- if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
- form.val("form-data", {
- emptyWeight: weightDto.weight
- });
- }
-
- // 濡傛灉鏄弧杞︾О閲�
- if (InoutProgress.WEIGHT_FULL == recordData.progress) {
- form.val("form-data", {
- fullWeight: weightDto.weight
- });
- }
- form.render();
-
- // 鐐瑰嚮绉伴噸鏃跺�欒嚜鍔ㄦ姄鎷嶆暟鎹�
- layer.msg("绯荤粺鑷姩鎶撴媿淇濈暀璁板綍鈥︹��");
- snapData = {
- companyId: companyId,
- deptId: deptId,
- bizTag: recordData.progress,
- bizType: bizType,
- plateNum: recordData.plateNum,
-
- id1: (null != lprDto) ? lprDto.id : null,
- id2: (null != snapDto1) ? snapDto1.id : null,
- id3: (null != snapDto2) ? snapDto2.id : null
- };
- // console.log(snapData);
-
- //褰撳墠AJAX鏈嶅姟涓哄悓姝ユ湇鍔★紝杩斿洖鏁版嵁鍖呰鐓х墖淇℃伅
- var index = layer.load();
- $.ajax({
- sync: false,
- type: "POST",
- url: "../../basic/inout/snap-img",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: JSON.stringify(snapData),
- success: function (result) {
- layer.close(index);
- if (result.code != "0000") {
- layer.alert(result.msg);
- } else {
- snapData = result.data;
- }
- },
- error: function () {
- layer.close(index);
- layer.msg("鍚庡彴璋冪敤鎴浘澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
- }
- });
-
- //鍏ュ簱绗簩娆＄О閲嶆椂璋冪敤璁＄畻鏂规硶
- if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
- deAutoByPer();
- }
-
- flushBtn("btn-weight");
-}
-
-// 鑷姩璁＄畻锛屾敞鎰忥細姘村垎涓嶈鍏ョ粨绠楅噸閲�
-function deAutoByPer() {
- var curData = form.val("form-data");
-
- var netWeight = 0, deImpurity = 0, deWet = 0, deSum = 0, settleWeight = 0;
-
- if (curData.fullWeight == 0 || curData.emptyWeight == 0) {
- return;
- }
- // 璁＄畻鍑�閲�
- netWeight = curData.fullWeight - curData.emptyWeight;
-
- if (netWeight <= 0) {
- layer.msg("鍑�閲嶅皬浜庣瓑浜�0锛屽綋鍓嶈绠椾笉姝ｇ‘锛�");
- return;
- }
-
- //姘村垎鎵ｉ噸鍜屾潅璐ㄦ墸閲�
- var checkItems = recordData.checkItems;
- if (checkItems) {
- var deBase = 0, multiple = 0;
- $.each(checkItems, function (index, checkItem) {
- if (!checkItem.value) return;//璺冲嚭鏈寰幆
- if (null == checkItem.ruleNum) return;//娌℃湁閰嶇疆瑙勫垯 涓嶅鐞�
- if (null == checkItem.ruleReduce) return;//璺冲嚭鏈寰幆
-
- //姘村垎鎵ｉ噸
- if (CHECK_ST.C01 == checkItem.standardId) {
- deBase = Number(curData.wet) - checkItem.upperLimit;
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.ruleNum);//鍊嶆暟
- if (deBase > 0) {//鎵ｉ噸姝ｆ暟
- deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
- }
- }
-
- //鏉傝川鍙墸涓嶈ˉ
- if (CHECK_ST.C02 == checkItem.standardId) {
- deBase = Number(curData.impurity) - checkItem.upperLimit;
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.ruleNum);
- if (deBase > 0) {//鎵ｉ噸
- deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
- }
- }
- });
- }
-
- // 鎬绘墸閲嶏紝姘村垎涓嶈鍏�
- deSum = Number(deImpurity) + Number(curData.deOther) + Number(curData.deHandle) + Number(deWet);
-
- deSum = deSum.toFixed(0);
-
- // 缁撶畻鍑�閲�
- settleWeight = Number(netWeight) - Number(deSum);
- settleWeight = settleWeight.toFixed(0);
-
- form.val("form-data", {
- netWeight: netWeight,
- deImpurity: deImpurity,
- deWet: deWet,
- deSum: deSum,
- settleWeight: settleWeight
- });
- form.render();
-}
-
-// 鏍规嵁閲嶉噺淇℃伅鍙樺寲鑷姩璁＄畻锛屼笉鍦ㄥ弽鍚戣绠楃櫨鍒嗘瘮
-function deAutoByWeight() {
- var curData = form.val("form-data");
- var netWeight = 0, deSum = 0, settleWeight = 0, deImpurity = 0, deWet = 0;
-
- if (curData.fullWeight == 0 || curData.emptyWeight == 0) {
- return;
- }
- // 鍑�閲�
- netWeight = curData.fullWeight - curData.emptyWeight;
-
- if (netWeight <= 0) {
- layer.msg("鍑�閲嶅皬浜庣瓑浜�0锛屽綋鍓嶈绠椾笉姝ｇ‘锛�");
- return;
- }
-
- //姘村垎鎵ｉ噸鍜屾潅璐ㄦ墸閲�
- var checkItems = recordData.checkItems;
- if (checkItems) {
- var deBase = 0, multiple = 0;
- $.each(checkItems, function (index, checkItem) {
- if (!checkItem.value) return;//璺冲嚭鏈寰幆
- if (null == checkItem.ruleNum) return;//娌℃湁閰嶇疆瑙勫垯 涓嶅鐞�
- if (null == checkItem.ruleReduce) return;//璺冲嚭鏈寰幆
-
- //姘村垎鎵ｉ噸
- if (CHECK_ST.C01 == checkItem.standardId) {
- deBase = Number(curData.wet) - checkItem.upperLimit;
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.ruleNum);//鍊嶆暟
- if (deBase > 0) {//鎵ｉ噸姝ｆ暟
- deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
- }
- }
-
- //鏉傝川鍙墸涓嶈ˉ
- if (CHECK_ST.C02 == checkItem.standardId) {
- deBase = Number(curData.impurity) - checkItem.upperLimit;
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.ruleNum);
- if (deBase > 0) {//鎵ｉ噸
- deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
- }
- }
- });
- }
-
- // 鎬绘墸閲�
- deSum = Number(deImpurity) + Number(curData.deOther) + Number(curData.deHandle) + Number(deWet);
- deSum = deSum.toFixed(0);
-
- // 缁撶畻鍑�閲�
- settleWeight = Number(netWeight) - Number(deSum);
- settleWeight = settleWeight.toFixed(0);
-
- form.val("form-data", {
- deImpurity: deImpurity,
- deWet: deWet,
- netWeight: netWeight,
- deSum: deSum,
- settleWeight: settleWeight
- });
- form.render();
-}
-
-//鏂扮殑璇诲崱鏂瑰紡
-function flushICCard() {
- $("#intelCard").val(null);
- $("#form-data")[0].reset();
- form.render();
- recordData = null;
- $.ajax({
- type: "GET",
- async: true,
- url: "http://127.0.0.1:9111/ICCARD",
- data: {},
- dataType: "jsonp",
- jsonp: "callback",
- jsonpCallback: "jsonpCallback",
- success: function (json) {
- //console.log(json);
- var data = json.no;
- //console.log(data);
- if (data === "not found") {
- layer.alert("璇烽噸鏂拌鍗★紒", {offset: ['300px', '300px']});
- } else {
- $("#intelCard").val(data);
- flushData();
- }
- },
- error: function () {
- layer.alert("IC鍗¤鍙栧嚭閿欙紒", {offset: ['300px', '300px']});
- }
- });
-}
-
-// 浣跨敤鎻掍欢鑾峰彇鐪佷唤璇�
-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") {
- layer.alert("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛岃鎵嬪姩褰曞叆锛�", {
- offset: ['300px', '300px']
- });
- return;
- }
- $("#userId").val(data.idNum);
- flushData();
- },
- error: function () {
- layer.alert("韬唤璇佽鍙栧け璐ワ紝璇锋墜鍔ㄥ綍鍏ワ紒", {
- offset: ['300px', '300px']
- });
- layer.close(index);
- }
- });
-}
-
-function flushWeight() {
- $.ajax({
- type: "GET",
- async: true,
- timeout: 2000,
- url: "http://127.0.0.1:9111/WEIGHT",
- data: {},
- dataType: "jsonp",
- jsonp: "callback",
- jsonpCallback: "jsonpCallback",
- success: function (json) {
- var data = json.content;
- if (!data) data = 0.0;
- weightDto.weight = data;
- $("#weightValue").html(data + "<em>KG</em>");
- $("#img_scale_statule").attr("src", "../../static/images/icon-gree.png");
- },
- error: function () {
- weightDto.weight = 0.0;
- $("#weightValue").html("<em>0.0KG</em>");
- $("#img_scale_statule").attr("src", "../../static/images/icon-red.png");
- }
- });
-}
-
-
-// 鐐瑰嚮鎵撳嵃锛岀郴缁熷垽鏂槸鍚﹀凡缁忔墽琛屽畬鎴愶紝濡傛灉宸茬粡瀹屾垚锛岀洿鎺ユ墦鍗帮紝濡傛灉鏈畬鎴愬垯鍏堟墽琛屽畬鎴�
-function printBill() {
- if (!recordData) {
- layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝涓嶆敮鎸佹墦鍗帮紒");
- return;
- }
- // 浠庡悗鍙拌幏鍙栨ā鐗堝苟鎵撳嵃
- var data = form.val("form-data");
- // 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
- Object.assign(recordData, data);
-
- printBillStep2();
-}
-
-// 鐐瑰嚮鎵撳嵃锛屽厛鎵ц绯荤粺榛樿鎵ц瀹屾垚鍗″洖鏀�
-function printBillStep2() {
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: "../../basic/inout-report/inout-bill-weight",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: JSON.stringify(recordData),
- success: function (result) {
- layer.close(index);
- if (result.code != "0000") {
- layer.msg(result.msg);
- } else {
- layer.msg("寮�濮嬫覆鏌撴墦鍗板崟鈥︹��");
- if(companyId && companyId == "5016"){
- print5016Weight(result.data);
- console.log("5016");
- }else {
- printWeight(result.data);
- }
- // 鍒锋柊鎸夐挳
- flushBtn("btn-printBill");
- }
- },
- error: function () {
- layer.close(index);
- layer.msg("鑾峰彇鎵撳嵃妯＄増澶辫触锛岃鑱旂郴绠＄悊鍛樻煡鐪嬪師鍥狅紒锛�");
- }
- });
-}
-
-// 鎵撳嵃鎶芥牱鍗�
-function showCheck() {
- if (!recordData) {
- layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝鏃犳硶鏌ョ湅锛�");
- }
-}
-
-// 琛ㄥ崟娓呯┖
-function resetForm() {
- $("#form-data")[0].reset();
- form.render();
- recordData = null;
- weightDto.weight = 0.0;
-
- $("#weightValue").html("0.0<em>KG</em>");
- $("#img_scale_statule").attr("src", "../../static/images/icon-red.png");
-
- //绉伴噸鍙互澶嶇敤
- $("#btn-weight").removeClass("layui-btn-disabled");
- $("#btn-weight").attr("disabled", false);
-
- //绌鸿溅鍜屾弧杞﹁閲嶇疆
- updateEditAndProgress();
-
- //鎵ｉ噸淇℃伅妗嗘仮澶嶄负鍙紪杈�
- delDisabled();
-}
-
-function flushPage() {
- layer.confirm('纭畾瑕佸埛鏂伴〉闈㈠悧锛�', {icon: 3, title: '鎻愮ず'}, function (index) {
- resetForm();
- layer.msg("椤甸潰閲嶇疆瀹屾垚锛岃閲嶆柊鎿嶄綔鈥︹��");
- layer.close(index);
- });
-}
-
-// --鏌ヨ鏂规硶,鑾峰彇韬唤璇佸彿銆佸崱鍙枫�佽溅鐗屽彿锛岃繘琛屾煡璇�
-function flushData() {
- var index = layer.load();
- var userId2 = $("#userId").val();
- var intelCard = $("#intelCard").val();
- var plateNum = $("#plateNum").val();
- var param = {
- type: type,
- progress: progress,
- intelCard: intelCard,
- userId: userId2,
- 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) {
- if (result.code != "0000") {
- notify(result.msg, result.data);
- } else {
- recordData = result.data;
- // 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
- form.val("form-data", recordData);
- form.render();
- updateEditAndProgress();
- }
- layer.close(index);
- },
- error: function () {
- layer.close(index);
- layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
- }
- });
-}
-
-/**
- * 璺熸柊娴佺▼璇存槑鎻愬績淇℃伅
- */
-function updateEditAndProgress() {
- if (recordData) {
- if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
- $("#emptyWeight").removeClass("rkbk-search-input");
- $("#emptyWeight").attr("disabled", false);
-
- $("#progress-hand").addClass("active");
- $("#progress-emptyWeight").addClass("active");
-
- $("#fullWeight").addClass("rkbk-search-input");
- $("#fullWeight").attr("disabled", true);
- }
-
- if (InoutProgress.WEIGHT_FULL == recordData.progress) {
- $("#fullWeight").removeClass("rkbk-search-input");
- $("#fullWeight").attr("disabled", false);
-
- $("#progress-hand").removeClass("active");
- $("#progress-emptyWeight").removeClass("active");
-
- $("#emptyWeight").addClass("rkbk-search-input");
- $("#emptyWeight").attr("disabled", true);
- }
- } else {
- $("#fullWeight").addClass("rkbk-search-input");
- $("#fullWeight").attr("disabled", true);
-
- $("#emptyWeight").addClass("rkbk-search-input");
- $("#emptyWeight").attr("disabled", true);
-
- $("#progress-hand").removeClass("active");
- $("#progress-emptyWeight").removeClass("active");
- }
- //鏍规嵁閰嶇疆淇℃伅璁剧疆鍦扮鏄惁鍙紪杈�
- if(weightEditTag && weightEditTag == 'N'){
- $("#fullWeight").addClass("rkbk-search-input");
- $("#fullWeight").attr("disabled", true);
-
- $("#emptyWeight").addClass("rkbk-search-input");
- $("#emptyWeight").attr("disabled", true);
- }
-}
-
-// 褰撳墠瀹屾垚
-function submit() {
- if (null == recordData) {
- notify("娌℃湁鏁版嵁鍙互鎻愪氦", null);
- return;
- }
-
- var data = form.val("form-data");
- if (!data.depotId) {
- notify("瑁呭嵏浠撳簱蹇呴』濉啓", null);
- return;
- }
- // 鏍￠獙-鍏ュ簱婊¤溅绉伴噸
- if (InoutProgress.WEIGHT_FULL == recordData.progress) {
- if (data.fullWeight <= 0.0) {
- notify("婊¤溅绉伴噸淇℃伅蹇呭～", null);
- return;
- }
- if (!data.customerName) {
- notify("寰�鏉ュ崟浣嶄俊鎭繀濉�", null);
- return;
- }
- } else {
- if (data.emptyWeight <= 0.0) {
- notify("绌鸿溅绉伴噸淇℃伅蹇呭～", null);
- return;
- }
- if (!data.foodVariety) {
- notify("绮鍝佺蹇呭～", null);
- return;
- }
- if (!data.settleWeight || data.settleWeight <= 0.0) {
- notify("鎵ｉ噸鍚庡噣淇℃伅涓嶆纭紝璇锋牳瀹炶绠�", null);
- return;
- }
- }
-
- // 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
- Object.assign(recordData, data);
- // 鑾峰彇鐓х墖
- var files = [{
- fileName: snapData.fileName1
- }, {
- fileName: snapData.fileName2
- }, {
- fileName: snapData.fileName3
- }];
- recordData.files = files;
-
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: "../../basic/inout/inout-next-step",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: JSON.stringify(recordData),
- success: function (result) {
- if (result.code != "0000") {
- notify(result.msg, result.data);
- } else {
- notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
- // 鏇存柊鎸夐挳鏄剧ず
- flushBtn("btn-submit");
- }
- layer.close(index);
- },
- error: function () {
- layer.close(index);
- notify("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯", null);
- }
- });
-}
-
-//鏍规嵁閫夋嫨鐨勪粨搴撲俊鎭�,鏇存柊绮鍝佺
-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();
- }
-}
-
-/**
- * 寮瑰嚭鎻愰啋妗�
- * @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 showCustomer() {
- var index = layer.load();
- var param = {
- type: type,
- start: recordData == null ? null : recordData.registerTime
- };
- // 娓叉煋寰�鏉ュ崟浣嶅垪琛�
- table.render({
- elem: '#tableCustomer',
- url: '../../basic/inout/list-in-customer',
- page: false,
- // skin : "nob",
- // size : 'sm',
- toolbar: '#toolbarCustomer',
- even: true,
- method: 'POST',
- contentType: "application/json;charset=UTF-8",
- cols: [[{
- field: 'id',
- title: '缂栫爜'
- }, {
- field: 'name',
- title: '鍚嶇О',
- width: '75%'
- }]],
- where: param,
- parseData: function (res) {
- if ("0000" == res.code) {
- return {
- "code": "0",
- "msg": res.msg,
- "data": res.data
- }
- } else {
- return {
- "code": "1",
- "msg": res.msg
- }
- }
- },
- done: function (res) {
- layer.close(index);
- }
- });
-
- //鍙屽嚮鏄剧ず閫変腑鏁版嵁
- table.on('rowDouble(tableCustomer)', function (obj) {
- var data = obj.data;
- // 璧嬪��
- form.val("form-data", {
- customerId: data.id,
- customerName: data.name,
- noticeId: data.noticeId
- });
- // 鍏抽棴
- layer.closeAll();
- });
-
- // 寮瑰嚭瀵硅瘽妗�
- layer.open({
- type: 1,
- title: "閫夋嫨寰�鏉ュ崟浣�",
- area: ['600px', '600px'],
- shade: 0,
- content: $('#listCustomer'),
- btn: 0,
- btn: ['鍙栨秷'],
- yes: function () {
- layer.closeAll();
- },
- closeBtn: 0
- });
-}
-
-// 鍒锋柊寰�鏉ュ崟浣嶆暟鎹�
-function flushCustomer() {
- var key = $("#key").val();
- var param = {
- type: type,
- key: key,
- start: recordData == null ? null : recordData.registerTime
- };
- table.reload('tableCustomer', {
- url: "../../basic/inout/list-in-customer",
- where: param,
- done: function (res) {
- if (key) {
- $("#key").val(key);
- }
- }
- });
-}
-
-// ---------------------------寰�鏉ヤ汉鍛樻搷浣� -缁撴潫 -------------------//
-
-// ---------------------------绮浜у湴 -寮�濮� -------------------//
-// 寮瑰嚭寰�鏉ュ崟浣嶄笅鎷夋
-function showFoodLocation() {
- var index = layer.load();
- // 娓叉煋寰�鏉ュ崟浣嶅垪琛�
- table.render({
- elem: '#tableFoodLoaction',
- url: '../../basic/common/page-food-location',
- page: false,
- // limit : limit,
- // skin : "nob",
- // size : 'sm',
- toolbar: '#toolbarFoodLocaton',
- even: true,
- method: 'POST',
- contentType: "application/json;charset=UTF-8",
- cols: [[{
- field: 'code',
- title: '缂栫爜',
- }, {
- field: 'simple',
- title: '绠�鎷�',
- }, {
- field: 'name',
- title: '鍚嶇О',
- width: '60%'
- }]],
- where: {
- "page": 1,
- "limit": 100
- },
- 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
- }
- }
- },
- done: function (res) {
- layer.close(index);
- }
- });
-
- //鍙屽嚮鏄剧ず閫変腑鏁版嵁
- table.on('rowDouble(tableFoodLoaction)', function (obj) {
- var data = obj.data;
- // 璧嬪��
- form.val("form-data", {
- foodLocation: data.name,
- });
- // 鍏抽棴
- layer.closeAll();
- });
-
- // 寮瑰嚭瀵硅瘽妗�
- layer.open({
- type: 1,
- title: "閫夋嫨绮骇鍦�",
- area: ['600px', '600px'],
- shade: 0,
- content: $('#listFoodLocation'),
- btn: 0,
- btn: ['鍙栨秷'],
- yes: function () {
- layer.closeAll();
- },
- closeBtn: 0
- });
-}
-
-// 鍒锋柊
-function flushFoodLocation() {
- var key = $("#key2").val();
- table.reload('tableFoodLoaction', {
- url: "../../basic/common/page-food-location",
- where: {
- key: key
- },
- done: function (res) {
- if (key) {
- $("#key2").val(key);
- }
- }
- });
-}
-// ---------------------------绮浜у湴 -缁撴潫 -------------------//
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 e1ced5b..e5e5e36 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
@@ -5,6 +5,7 @@
var recordData = null;// 涓氬姟鏁版嵁淇℃伅
var snapData;//绯荤粺鎶撴媿瀵硅薄淇℃伅
var timerWeight;
+var textParam;//璁惧璇嗗埆缁撴灉
$(function () {
layui.use(['layer', 'laydate', 'form', 'table', 'util'], function () {
@@ -34,7 +35,7 @@
shadeClose: true,
shade: 0.3,
closeBtn: 2,
- offset: ['50px','120px'],
+ offset: ['50px', '120px'],
area: ['1000px', '640px'],
content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
});
@@ -122,32 +123,6 @@
resetForm();
}
}
-
-//鎺у埗娴佺▼鐜妭鏄剧ず
-function showProgress() {
- if (!inoutProgress) {
- return;
- }
- if (inoutProgress.indexOf("REGISTER") == -1) {
- $("#progress-register").css("display", "none");
- }
- if (inoutProgress.indexOf("CHECK") == -1) {
- $("#progress-check").css("display", "none");
- }
- if (inoutProgress.indexOf("WEIGHT_FULL") == -1) {
- $("#progress-fullWeight").css("display", "none");
- }
- if (inoutProgress.indexOf("HANDLE") == -1) {
- $("#progress-hand").css("display", "none");
- }
- if (inoutProgress.indexOf("WEIGHT_EMPTY") == -1) {
- $("#progress-emptyWeight").css("display", "none");
- }
- if (inoutProgress.indexOf("CARD_BACK") == -1) {
- $("#progress-cardBack").css("display", "none");
- }
-}
-
//鏇存敼鎵ｉ噸淇℃伅妗嗕笉鍙紪杈�
function addDisabled() {
@@ -249,13 +224,7 @@
//鏂扮殑璇诲崱鏂瑰紡
function flushICCard() {
- if(cardDto && cardDto.protocol != "TCP_DEFAULT"){
- //鍗忚鑾峰彇
- flushICCard2();
- }else {
- //鏈湴璇诲彇
- flushICCard1();
- }
+ flushICCard1();
}
/**
@@ -299,7 +268,7 @@
* 鏈湴璇诲彇鏅烘収鍗�
*/
function flushICCard1() {
- $("#intelCard").val(null);
+ $("#text-param").val(null);
$("#form-data")[0].reset();
form.render();
recordData = null;
@@ -312,18 +281,17 @@
jsonp: "callback",
jsonpCallback: "jsonpCallback",
success: function (json) {
- //console.log(json);
var data = json.no;
- //console.log(data);
if (data === "not found") {
- layer.alert("璇烽噸鏂拌鍗★紒", {offset: ['300px', '300px']});
+ alertError("璇烽噸鏂拌鍗★紒");
} else {
- $("#intelCard").val(data);
+ textParam = data;
+ $("#text-param").text("璇嗗埆鍗″彿锛�" + textParam);
flushData();
}
},
error: function () {
- layer.alert("IC鍗¤鍙栧嚭閿欙紒", {offset: ['300px', '300px']});
+ alertError("IC鍗¤鍙栧嚭閿欙紒");
}
});
}
@@ -661,7 +629,7 @@
field: 'name',
title: '閫氱煡鍗曞悕绉�',
width: '15%'
- },{
+ }, {
field: 'customerName',
title: '閫佽揣鍗曚綅'
}, {
@@ -743,35 +711,36 @@
});
}
-function controlGate(targetStatus){
- if(gateDto){
- var data = {"companyId":companyId
- ,"deptId":deptId
- ,"bizType":type
- ,"confId":gateDto.id
- ,"targetStatus":targetStatus
- ,"sort":gateDto.sort
- };
- $.ajax({
- type: "POST",
- url: "../../basic/inout/gate-ctrl",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: JSON.stringify(data),
- success: function (result) {
- if (result.code != "0000") {
- layer.msg("鎿嶄綔澶辫触锛�"+result.msg);
- } else {
- layer.msg("鎿嶄綔鎴愬姛");
- }
- },
- error: function () {
- layer.alert("鎿嶄綔澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+function controlGate(targetStatus) {
+ if (gateDto) {
+ var data = {
+ "companyId": companyId
+ , "deptId": deptId
+ , "bizType": type
+ , "confId": gateDto.id
+ , "targetStatus": targetStatus
+ , "sort": gateDto.sort
+ };
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/gate-ctrl",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(data),
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.msg("鎿嶄綔澶辫触锛�" + result.msg);
+ } else {
+ layer.msg("鎿嶄綔鎴愬姛");
}
- });
- }else{
- layer.msg("娌℃湁鑾峰彇鍒拌澶囷紒");
- }
+ },
+ error: function () {
+ layer.alert("鎿嶄綔澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ }
+ });
+ } else {
+ layer.msg("娌℃湁鑾峰彇鍒拌澶囷紒");
+ }
}
//-------------------------閬撻椄鎿嶄綔--------------------------//
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/in-weight20230530.js b/igds-web/src/main/resources/static/admin/inout/in-weight20230530.js
new file mode 100644
index 0000000..e1ced5b
--- /dev/null
+++ b/igds-web/src/main/resources/static/admin/inout/in-weight20230530.js
@@ -0,0 +1,777 @@
+//绉伴噸-鍖呮嫭绌鸿溅鍜屾弧杞︾О閲�
+var layer;
+var form;
+var table;
+var recordData = null;// 涓氬姟鏁版嵁淇℃伅
+var snapData;//绯荤粺鎶撴媿瀵硅薄淇℃伅
+var timerWeight;
+
+$(function () {
+ layui.use(['layer', 'laydate', 'form', 'table', 'util'], function () {
+ var util = layui.util;
+ layer = layui.layer;
+ form = layui.form;
+ table = layui.table;
+ layui.laydate.render({
+ elem: '#test1',
+ theme: '#7b8e9f'
+ });
+
+ // 鍙充笅瑙掓坊鍔犲浐瀹氫俊鎭�
+ util.fixbar({
+ bar1: true,
+ css: {
+ right: 10,
+ bottom: 20
+ },
+ bgcolor: '#53adce',
+ click: function (type) {
+ if (type === 'bar1') {
+ layer.closeAll();
+ layer.open({
+ type: 2,
+ title: false,
+ shadeClose: true,
+ shade: 0.3,
+ closeBtn: 2,
+ offset: ['50px','120px'],
+ area: ['1000px', '640px'],
+ content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
+ });
+ }
+ }
+ });
+ });
+
+ //鏄剧ず娴佺▼鐜妭
+ showProgress();
+
+ // 鐩戝惉閲嶉噺鍙樺寲
+ $(".weight").blur(function () {
+ var name = this.name;
+ deAutoByIn(name);
+ });
+
+ // 鍒濆鍖朩ebSocket
+ initInoutWS(companyId, bizType, progress, userId);
+});
+
+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();
+ });
+ });
+
+};
+
+// socket淇℃伅杩斿洖铏曠悊
+function socketOnMessage(packet) {
+ //鏆傛棤
+}
+
+// 鏍规嵁褰撳墠鎿嶄綔鐨勬寜閽甀D鏇存柊鍏朵粬鎸夐挳鐘舵��
+function flushBtn(btnId) {
+ if ("btn-weight" == btnId) {// 绉伴噸鍚庡彲浠ョ偣鍑诲畬鎴愮О閲�
+ $("#btn-submit").removeClass("layui-btn-disabled");
+ $("#btn-submit").attr("disabled", false);
+ }
+
+ if ("btn-submit" == btnId) {
+ $("#btn-submit").addClass("layui-btn-disabled");
+ $("#btn-submit").attr("disabled", true);
+ if (InoutProgress.WEIGHT_FULL == recordData.progress) {// 濡傛灉鏄弧杞︾О閲嶏紝鍒欑洿鎺ュ綋鍓嶈妭鐐瑰畬鎴�
+ resetForm();
+ } else {
+ // 瀹屾垚绉伴噸鍚庢帶鍒舵寜閽�
+ $("#btn-weight").addClass("layui-btn-disabled");
+ $("#btn-weight").attr("disabled", true);
+
+ $("#btn-printBill").removeClass("layui-btn-disabled");
+ $("#btn-printBill").attr("disabled", false);
+
+ addDisabled();
+ }
+ }
+ if ("btn-printBill" == btnId) {// 鎵撳嵃杩囩鍗曪紝璇存槑涓氬姟瀹屾垚
+ $("#btn-weight").removeClass("layui-btn-disabled");
+ $("#btn-weight").attr("disabled", false);
+
+ $("#btn-submit").addClass("layui-btn-disabled");
+ $("#btn-submit").attr("disabled", true);
+
+ $("#btn-printBill").addClass("layui-btn-disabled");
+ $("#btn-printBill").attr("disabled", true);
+
+ delDisabled();
+ resetForm();
+ }
+}
+
+//鎺у埗娴佺▼鐜妭鏄剧ず
+function showProgress() {
+ if (!inoutProgress) {
+ return;
+ }
+ if (inoutProgress.indexOf("REGISTER") == -1) {
+ $("#progress-register").css("display", "none");
+ }
+ if (inoutProgress.indexOf("CHECK") == -1) {
+ $("#progress-check").css("display", "none");
+ }
+ if (inoutProgress.indexOf("WEIGHT_FULL") == -1) {
+ $("#progress-fullWeight").css("display", "none");
+ }
+ if (inoutProgress.indexOf("HANDLE") == -1) {
+ $("#progress-hand").css("display", "none");
+ }
+ if (inoutProgress.indexOf("WEIGHT_EMPTY") == -1) {
+ $("#progress-emptyWeight").css("display", "none");
+ }
+ if (inoutProgress.indexOf("CARD_BACK") == -1) {
+ $("#progress-cardBack").css("display", "none");
+ }
+}
+
+
+//鏇存敼鎵ｉ噸淇℃伅妗嗕笉鍙紪杈�
+function addDisabled() {
+ //鏉傝川
+ $("#impurity").attr("disabled", true);
+ $("#deImpurity").attr("disabled", true);
+ //姘村垎
+ $("#wet").attr("disabled", true);
+ $("#deWet").attr("disabled", true);
+ //鍊间粨
+ $("#deHandle").attr("disabled", true);
+ //鍏朵粬
+ $("#deOther").attr("disabled", true);
+}
+
+//鎭㈠鎵ｉ噸淇℃伅妗嗙紪杈戠姸鎬�
+function delDisabled() {
+ //鏉傝川
+ $("#impurity").attr("disabled", false);
+ $("#deImpurity").attr("disabled", false);
+ //姘村垎
+ $("#wet").attr("disabled", false);
+ $("#deWet").attr("disabled", false);
+ //鍊间粨
+ $("#deHandle").attr("disabled", false);
+ //鍏朵粬
+ $("#deOther").attr("disabled", false);
+}
+
+// 鐐瑰嚮绉伴噸
+function weight() {
+ // 娌℃湁涓氬姟鏁版嵁涓嶅彲鎵ц
+ if (!recordData) {
+ layer.alert("娌℃湁鏌ヨ鍒颁笟鍔℃暟鎹紝鎵ц琚嫆缁濓紒锛�");
+ return;
+ }
+
+ // 濡傛灉鏄┖杞︾О閲�
+ if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
+ form.val("form-data", {
+ emptyWeight: weightDto.weight
+ });
+ }
+
+ // 濡傛灉鏄弧杞︾О閲�
+ if (InoutProgress.WEIGHT_FULL == recordData.progress) {
+ form.val("form-data", {
+ fullWeight: weightDto.weight
+ });
+ }
+ form.render();
+
+ // 鐐瑰嚮绉伴噸鏃跺�欒嚜鍔ㄦ姄鎷嶆暟鎹�--澧炲姞閫氱煡淇℃伅
+ layer.msg("绯荤粺鑷姩鎶撴媿淇濈暀璁板綍鈥︹��");
+ snapData = {
+ companyId: companyId,
+ deptId: deptId,
+ progress: recordData.progress,
+ bizType: bizType,
+ plateNum: recordData.plateNum,
+
+ id1: (null != snapDto1) ? snapDto1.id : null,
+ id2: (null != snapDto2) ? snapDto2.id : null,
+ id3: (null != snapDto3) ? snapDto3.id : null,
+
+ sort: $("#scaleName").val(),
+ weight: weightDto.weight
+ };
+
+ //褰撳墠AJAX鏈嶅姟涓哄悓姝ユ湇鍔★紝杩斿洖鏁版嵁鍖呰鐓х墖淇℃伅
+ var index = layer.load();
+ $.ajax({
+ sync: false,
+ type: "POST",
+ url: "../../inout/api/snap-img",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(snapData),
+ success: function (result) {
+ layer.close(index);
+ if (result.code != "0000") {
+ layer.alert(result.msg);
+ } else {
+ snapData = result.data;
+ }
+ },
+ error: function () {
+ layer.close(index);
+ layer.msg("鍚庡彴璋冪敤鎴浘澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ }
+ });
+
+ //鍏ュ簱绗簩娆＄О閲嶆椂璋冪敤璁＄畻鏂规硶
+ if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
+ deAutoByIn("emptyWeight");
+ }
+ flushBtn("btn-weight");
+}
+
+//鏂扮殑璇诲崱鏂瑰紡
+function flushICCard() {
+ if(cardDto && cardDto.protocol != "TCP_DEFAULT"){
+ //鍗忚鑾峰彇
+ flushICCard2();
+ }else {
+ //鏈湴璇诲彇
+ flushICCard1();
+ }
+}
+
+/**
+ * 鍗忚璇诲彇鏅烘収鍗�
+ */
+function flushICCard2() {
+ var param = JSON.stringify(cardDto);
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: "../../inout/api/ic-card-num",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: param,
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.alert(result.msg, {
+ offset: ['300px', '300px']
+ });
+ } else {
+ if (result.data.errorMsg) {
+ layer.alert(result.data.errorMsg, {
+ offset: ['300px', '300px']
+ });
+ } else {
+ $("#intelCard").val(result.data.icCardNo);
+ }
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ layer.alert("IC鍗¤鍙栧け璐ワ紒", {
+ offset: ['300px', '300px']
+ });
+ }
+ });
+}
+
+/**
+ * 鏈湴璇诲彇鏅烘収鍗�
+ */
+function flushICCard1() {
+ $("#intelCard").val(null);
+ $("#form-data")[0].reset();
+ form.render();
+ recordData = null;
+ $.ajax({
+ type: "GET",
+ async: true,
+ url: "http://127.0.0.1:9111/ICCARD",
+ data: {},
+ dataType: "jsonp",
+ jsonp: "callback",
+ jsonpCallback: "jsonpCallback",
+ success: function (json) {
+ //console.log(json);
+ var data = json.no;
+ //console.log(data);
+ if (data === "not found") {
+ layer.alert("璇烽噸鏂拌鍗★紒", {offset: ['300px', '300px']});
+ } else {
+ $("#intelCard").val(data);
+ flushData();
+ }
+ },
+ error: function () {
+ layer.alert("IC鍗¤鍙栧嚭閿欙紒", {offset: ['300px', '300px']});
+ }
+ });
+}
+
+// 浣跨敤鎻掍欢鑾峰彇鐪佷唤璇�
+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") {
+ layer.alert("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛岃鎵嬪姩褰曞叆锛�", {
+ offset: ['300px', '300px']
+ });
+ return;
+ }
+ $("#userId").val(data.idNum);
+ flushData();
+ },
+ error: function () {
+ layer.alert("韬唤璇佽鍙栧け璐ワ紝璇锋墜鍔ㄥ綍鍏ワ紒", {
+ offset: ['300px', '300px']
+ });
+ layer.close(index);
+ }
+ });
+}
+
+function flushWeight() {
+ $.ajax({
+ type: "GET",
+ async: true,
+ timeout: 2000,
+ url: "http://127.0.0.1:9111/WEIGHT",
+ data: {},
+ dataType: "jsonp",
+ jsonp: "callback",
+ jsonpCallback: "jsonpCallback",
+ success: function (json) {
+ var data = json.content;
+ if (!data) data = 0.0;
+ weightDto.weight = data;
+ $("#weightValue").text(data);
+ $("#img_scale_statule").attr("src", "../../static/images/icon-gree.png");
+ },
+ error: function () {
+ weightDto.weight = 0.0;
+ $("#weightValue").text("0.0");
+ $("#img_scale_statule").attr("src", "../../static/images/icon-red.png");
+ }
+ });
+}
+
+
+// 鐐瑰嚮鎵撳嵃锛岀郴缁熷垽鏂槸鍚﹀凡缁忔墽琛屽畬鎴愶紝濡傛灉宸茬粡瀹屾垚锛岀洿鎺ユ墦鍗帮紝濡傛灉鏈畬鎴愬垯鍏堟墽琛屽畬鎴�
+function printBill() {
+ if (!recordData) {
+ layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝涓嶆敮鎸佹墦鍗帮紒");
+ return;
+ }
+ // 浠庡悗鍙拌幏鍙栨ā鐗堝苟鎵撳嵃
+ var data = form.val("form-data");
+ // 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
+ Object.assign(recordData, data);
+
+ printBillStep2();
+}
+
+// 鐐瑰嚮鎵撳嵃锛屽厛鎵ц绯荤粺榛樿鎵ц瀹屾垚鍗″洖鏀�
+function printBillStep2() {
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout-report/inout-bill-weight",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(recordData),
+ success: function (result) {
+ layer.close(index);
+ if (result.code != "0000") {
+ layer.msg(result.msg);
+ } else {
+ layer.msg("寮�濮嬫覆鏌撴墦鍗板崟鈥︹��");
+ if (companyId && companyId == "5016") {
+ print5016Weight(result.data);
+ console.log("5016");
+ } else {
+ printWeight(result.data);
+ }
+ // 鍒锋柊鎸夐挳
+ flushBtn("btn-printBill");
+ }
+ },
+ error: function () {
+ layer.close(index);
+ layer.msg("鑾峰彇鎵撳嵃妯＄増澶辫触锛岃鑱旂郴绠＄悊鍛樻煡鐪嬪師鍥狅紒锛�");
+ }
+ });
+}
+
+// 琛ㄥ崟娓呯┖
+function resetForm() {
+ $("#form-data")[0].reset();
+ form.render();
+ recordData = null;
+ weightDto.weight = 0.0;
+
+ $("#weightValue").text("0.0");
+ $("#img_scale_statule").attr("src", "../../static/images/icon-red.png");
+
+ //绉伴噸鍙互澶嶇敤
+ $("#btn-weight").removeClass("layui-btn-disabled");
+ $("#btn-weight").attr("disabled", false);
+
+ //绌鸿溅鍜屾弧杞﹁閲嶇疆
+ updateEditAndProgress();
+
+ //鎵ｉ噸淇℃伅妗嗘仮澶嶄负鍙紪杈�
+ delDisabled();
+}
+
+function flushPage() {
+ layer.confirm('纭畾瑕佸埛鏂伴〉闈㈠悧锛�', {icon: 3, title: '鎻愮ず'}, function (index) {
+ resetForm();
+ layer.msg("椤甸潰閲嶇疆瀹屾垚锛岃閲嶆柊鎿嶄綔鈥︹��");
+ layer.close(index);
+ });
+}
+
+// --鏌ヨ鏂规硶,鑾峰彇韬唤璇佸彿銆佸崱鍙枫�佽溅鐗屽彿锛岃繘琛屾煡璇�
+function flushData() {
+ var index = layer.load();
+ var userId2 = $("#userId").val();
+ var intelCard = $("#intelCard").val();
+ var plateNum = $("#plateNum").val();
+ var param = {
+ type: type,
+ progress: progress,
+ intelCard: intelCard,
+ userId: userId2,
+ 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) {
+ if (result.code != "0000") {
+ notify(result.msg, result.data);
+ } else {
+ recordData = result.data;
+ // 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
+ form.val("form-data", recordData);
+ form.render();
+ updateEditAndProgress();
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ }
+ });
+}
+
+/**
+ * 璺熸柊娴佺▼璇存槑鎻愬績淇℃伅
+ */
+function updateEditAndProgress() {
+ if (recordData) {
+ if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
+ $("#emptyWeight").removeClass("rkbk-search-input");
+ $("#emptyWeight").attr("disabled", false);
+
+ $("#progress-hand").addClass("active");
+ $("#progress-emptyWeight").addClass("active");
+
+ $("#fullWeight").addClass("rkbk-search-input");
+ $("#fullWeight").attr("disabled", true);
+ }
+ if (InoutProgress.WEIGHT_FULL == recordData.progress) {
+ $("#fullWeight").removeClass("rkbk-search-input");
+ $("#fullWeight").attr("disabled", false);
+
+ $("#progress-hand").removeClass("active");
+ $("#progress-emptyWeight").removeClass("active");
+
+ $("#emptyWeight").addClass("rkbk-search-input");
+ $("#emptyWeight").attr("disabled", true);
+ }
+ } else {
+ $("#fullWeight").addClass("rkbk-search-input");
+ $("#fullWeight").attr("disabled", true);
+
+ $("#emptyWeight").addClass("rkbk-search-input");
+ $("#emptyWeight").attr("disabled", true);
+
+ $("#progress-hand").removeClass("active");
+ $("#progress-emptyWeight").removeClass("active");
+ }
+ //鏍规嵁閰嶇疆淇℃伅璁剧疆鍦扮鏄惁鍙紪杈�
+ if (weightEditTag && weightEditTag == 'N') {
+ $("#fullWeight").addClass("rkbk-search-input");
+ $("#fullWeight").attr("disabled", true);
+
+ $("#emptyWeight").addClass("rkbk-search-input");
+ $("#emptyWeight").attr("disabled", true);
+ }
+}
+
+// 褰撳墠瀹屾垚
+function submit() {
+ if (null == recordData) {
+ notify("娌℃湁鏁版嵁鍙互鎻愪氦", null);
+ return;
+ }
+ var data = form.val("form-data");
+
+ if (!data.depotId) {
+ notify("瑁呭嵏浠撳簱蹇呴』濉啓", null);
+ return;
+ }
+ // 鏍￠獙-鍏ュ簱婊¤溅绉伴噸
+ if (InoutProgress.WEIGHT_FULL == recordData.progress) {
+ if (data.fullWeight <= 0.0) {
+ notify("婊¤溅绉伴噸淇℃伅蹇呭～锛侊紒", null);
+ return;
+ }
+ if (!data.customerName) {
+ notify("瀹㈡埛鍚嶇О蹇呭～锛侊紒", null);
+ return;
+ }
+ } else {
+ if (data.emptyWeight <= 0.0) {
+ notify("绌鸿溅绉伴噸淇℃伅蹇呭～锛侊紒", null);
+ return;
+ }
+ if (!data.foodVariety) {
+ notify("绮鍝佺蹇呭～锛侊紒", null);
+ return;
+ }
+ if (!data.settleWeight || data.settleWeight <= 0.0) {
+ notify("缁撶畻閲嶉噺鍚堣锛岃鏍稿锛侊紒", null);
+ return;
+ }
+ }
+ // 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
+ Object.assign(recordData, data);
+
+ // 鑾峰彇鐓х墖
+ var files = [{
+ fileName: snapData.fileName1
+ }, {
+ fileName: snapData.fileName2
+ }, {
+ fileName: snapData.fileName3
+ }];
+ recordData.files = files;
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/inout-next-step",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(recordData),
+ success: function (result) {
+ if (result.code != "0000") {
+ notify(result.msg, result.data);
+ } else {
+ notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
+ // 鏇存柊鎸夐挳鏄剧ず
+ flushBtn("btn-submit");
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ notify("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯", null);
+ }
+ });
+
+ //浠ヤ笅閫昏緫涓哄鍔犱竴涓闊抽�氱煡鐨勮皟鐢ㄦ柟娉曪紝涓嶈�冭檻杩斿洖缁撴灉--鍚庡彴璋冪敤
+ var curWeight = recordData.fullWeight;
+ if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
+ curWeight = recordData.emptyWeight;
+ }
+ var param = {
+ sort: $("#scaleName").val(),
+ weight: curWeight,
+ inoutProgress: recordData.progress,
+ deptId: recordData.deptId,
+ companyId: recordData.companyId,
+ plateNum: recordData.plateNum
+ };
+ $.ajax({
+ type: "POST",
+ url: "../../inout/api/notice-weight-done",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(param)
+ });
+}
+
+
+// ---------------------------閫氱煡鍗�-寮�濮� -------------------//
+// 寮瑰嚭寰�鏉ュ崟浣嶄笅鎷夋
+function showNotice() {
+ var index = layer.load();
+ var param = {
+ type: type
+ };
+ // 娓叉煋寰�鏉ュ崟浣嶅垪琛�
+ table.render({
+ elem: '#tableNotice',
+ url: '../../basic/inout/list-notice鈥攊n',
+ page: false,
+ // skin : "nob",
+ // size : 'sm',
+ even: true,
+ method: 'POST',
+ contentType: "application/json;charset=UTF-8",
+ cols: [[{
+ field: 'name',
+ title: '閫氱煡鍗曞悕绉�',
+ width: '15%'
+ },{
+ field: 'customerName',
+ title: '閫佽揣鍗曚綅'
+ }, {
+ field: 'foodVarietyName',
+ title: '绮鍝佺',
+ width: '10%'
+ }, {
+ field: 'year',
+ title: '骞翠唤',
+ width: '8%'
+ }, {
+ field: 'unitName',
+ title: '鏀惰揣鍗曚綅'
+ }, {
+ field: 'contractName',
+ title: '鎵�灞炲悎鍚�'
+ }]],
+ where: param,
+ parseData: function (res) {
+ if ("0000" == res.code) {
+ return {
+ "code": "0",
+ "msg": res.msg,
+ "data": res.data
+ }
+ } else {
+ return {
+ "code": "1",
+ "msg": res.msg
+ }
+ }
+ },
+ done: function (res) {
+ layer.close(index);
+ }
+ });
+
+ //鍙屽嚮鏄剧ず閫変腑鏁版嵁
+ table.on('rowDouble(tableNotice)', function (obj) {
+ var data = obj.data;
+ form.val("form-data", {
+ customerId: data.customerId,
+ customerName: data.customerName,
+ noticeId: data.id
+ });
+ // 鍏抽棴
+ layer.closeAll();
+ });
+
+ // 寮瑰嚭瀵硅瘽妗�
+ layer.open({
+ type: 1,
+ offset: ['100px', '250px'],
+ title: "鍏ュ簱閫氱煡鍗�",
+ area: ['900px', '600px'],
+ shade: 0,
+ content: $('#listNotice'),
+ btn: 0,
+ btn: ['鍙栨秷'],
+ yes: function () {
+ layer.closeAll();
+ },
+ closeBtn: 0
+ });
+}
+
+// ---------------------------閫氱煡鍗� -缁撴潫 -------------------//
+//-------------------------閬撻椄鎿嶄綔--------------------------//
+
+function gateCtrl() {
+ layer.open({
+ type: 1,
+ title: '璁惧鎿嶄綔-' + domSelectDevice.attr("name"),
+ area: ['450px', '210px'],
+ shade: 0,
+ content: $('#control-gate'),
+ btn: 0,
+ closeBtn: 2
+ });
+}
+
+function controlGate(targetStatus){
+ if(gateDto){
+ var data = {"companyId":companyId
+ ,"deptId":deptId
+ ,"bizType":type
+ ,"confId":gateDto.id
+ ,"targetStatus":targetStatus
+ ,"sort":gateDto.sort
+ };
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/gate-ctrl",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(data),
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.msg("鎿嶄綔澶辫触锛�"+result.msg);
+ } else {
+ layer.msg("鎿嶄綔鎴愬姛");
+ }
+ },
+ error: function () {
+ layer.alert("鎿嶄綔澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ }
+ });
+ }else{
+ layer.msg("娌℃湁鑾峰彇鍒拌澶囷紒");
+ }
+}
+
+//-------------------------閬撻椄鎿嶄綔--------------------------//
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/style.css b/igds-web/src/main/resources/static/admin/inout/style.css
index 183d8b3..1a775da 100644
--- a/igds-web/src/main/resources/static/admin/inout/style.css
+++ b/igds-web/src/main/resources/static/admin/inout/style.css
@@ -936,10 +936,17 @@
font-weight: bold;
}
-
-
-
-
-
-
-
+.line-container {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.line {
+ flex: 1;
+ height: 1px;
+ background-color: #2ab5ad;
+}
+.line-text {
+ padding: 0 10px;
+ color: #2ab5ad;
+}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-register.html b/igds-web/src/main/resources/templates/admin/inout/in-register.html
index d5be5c1..eb15912 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-register.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-register.html
@@ -274,7 +274,7 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">杩愯緭宸ュ叿锛�</label>
- <div class="layui-input-inline">
+ <div class="layui-input-block">
<input type="radio" name="transType" value="1" title="姹借溅"
checked> <input type="radio" name="transType"
value="2" title="鐏溅"> <input type="radio"
@@ -283,6 +283,7 @@
</div>
</div>
</div>
+
</div>
</div>
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-weight.html b/igds-web/src/main/resources/templates/admin/inout/in-weight.html
index 8da7613..6b5511d 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-weight.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-weight.html
@@ -7,16 +7,28 @@
<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="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
<link rel="stylesheet" type="text/css"
th:href="@{../../static/admin/inout/style.css}">
-
<!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
<script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>
<style>
+ .kccz-r-btnbox {
+ width: 86px !important;
+ }
+
+ .kccz-r-btn {
+ width: 86px !important;
+ }
+
+ #text-param {
+ font-size: 14px;
+ color: red;
+ padding-left: 10px;
+ }
+
.display-none {
display: none;
}
@@ -33,7 +45,7 @@
}
.kccz-left-box2 {
- height: 500px;
+ height: 555px;
}
.color-red {
@@ -127,7 +139,7 @@
<div class="rkbk-quick fl">
<button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>鍖栭獙鍗�
+ <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璐ㄦ淇℃伅
</button>
<button id="btn-weight" class="rkbk-quick-btn layui-btn btn-blue"
onclick="weight()">
@@ -241,29 +253,24 @@
<!--kccz-left-box1 end-->
<div class="kccz-left-box2 mt-10 radius-6">
-
<div class="rkbk-tit">
<i></i>
- <h3>涓氬姟鏁版嵁</h3>
+ <h3>涓氬姟鏁版嵁<span id="text-param"></span></h3>
<div>
<input type="button" value="璇绘櫤鎱у崱"
class="rkbk-search-btn layui-btn r-240"
onclick="flushICCard()">
-
<input type="button" value="璇昏韩浠借瘉"
class="rkbk-search-btn layui-btn r-120"
onclick="flushIdCard()">
-
<input type="button" value="鎵嬪姩鏌ヨ"
class="rkbk-search-btn layui-btn" onclick="flushData()">
-
</div>
</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">闅愯棌瀛楁-ID</label>
<input type="text" name="id">
@@ -292,19 +299,19 @@
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">鏅烘収鍗″彿</label>
+ <label class="layui-form-label color-red">鏅烘収鍗″彿</label>
<div class="layui-input-block">
<input type="text" name="intelCard" id="intelCard"
- placeholder="鏅烘収鍗″彿" autocomplete="off" class="layui-input">
+ 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>
+ <label class="layui-form-label color-red">杞︾墝鍙�</label>
<div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum" placeholder="杞︾墝鍙�"
+ <input type="text" name="plateNum" id="plateNum" placeholder="鑷姩甯﹀叆/鎵嬪姩褰曞叆"
autocomplete="off" class="layui-input">
</div>
</div>
@@ -312,19 +319,9 @@
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">韬唤璇佸彿</label>
+ <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">鎵胯繍浜�</label>
- <div class="layui-input-block">
- <input type="text" name="userName" placeholder="涓嶅彲缂栬緫" class="layui-input"
+ <input type="text" name="userName" placeholder="鑷姩甯﹀叆锛屼笉鍙紪杈�" class="layui-input"
disabled>
</div>
</div>
@@ -336,7 +333,7 @@
<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>
+ placeholder="鍦扮鑷姩甯﹀叆" class="layui-input weight rkbk-search-input" disabled>
<em
class="kccz-data-dw">KG</em>
</div>
@@ -348,23 +345,13 @@
<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>
+ 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="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">
@@ -377,21 +364,13 @@
</div>
</div>
-
<div class="layui-col-xs4">
- <div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">鏉傝川鎵ｉ噸</label>
- <div class="posi-r kccz-data-bfb fr">
- <input id="impurity" type="text" name="impurity" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">%</em>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">瀹㈡埛淇℃伅</label>
<div class="layui-input-block">
- <div class="posi-r">
- <input id="deImpurity" type="text" name="deImpurity" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
- class="kccz-data-dw">KG</em>
- </div>
+ <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>
@@ -410,6 +389,38 @@
</div>
<div class="layui-col-xs4">
+ <div class="layui-form-item kccz-data-group-md">
+ <label class="layui-form-label">璐ㄦ鎵ｉ噸</label>
+ <div class="posi-r kccz-data-bfb fr">
+ <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
+ <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璇︾粏
+ </button>
+ </div>
+ <div class="layui-input-block">
+ <div class="posi-r">
+ <input id="deCheck" type="text" name="deCheck" placeholder="璇疯緭鍏�"
+ autocomplete="off" class="layui-input"> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </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">
+ <select name="foodVariety" id="foodVariety">
+ <option value=""></option>
+ <option th:each="dic,dicSet:${listFoodVariety}"
+ th:value="${dic.code}" th:text="${dic.name}"></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">
@@ -422,30 +433,28 @@
<div class="layui-col-xs4">
<div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">姘村垎鎵ｉ噸</label>
+ <label class="layui-form-label">璐ㄦ澧為噸</label>
<div class="posi-r kccz-data-bfb fr">
- <input id="wet" type="text" name="wet" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">%</em>
+ <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
+ <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璇︾粏
+ </button>
</div>
<div class="layui-input-block">
<div class="posi-r">
- <input id="deWet" type="text" name="deWet" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
+ <input id="addCheck" type="text" name="addCheck" placeholder="璇疯緭鍏�"
+ autocomplete="off" class="layui-input"> <em
class="kccz-data-dw">KG</em>
</div>
</div>
</div>
</div>
+
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">绮鍝佺</label>
+ <label class="layui-form-label color-red">绮浜у湴</label>
<div class="layui-input-block">
- <select name="foodVariety" id="foodVariety">
- <option value=""></option>
- <option th:each="dic,dicSet:${listFoodVariety}"
- th:value="${dic.code}" th:text="${dic.name}"></option>
- </select>
+ <input type="text" name="foodLocation" placeholder="璇烽�夋嫨"
+ autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -463,41 +472,10 @@
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">鎬� 鎵� 閲�</label>
+ <label class="layui-form-label">鍏朵粬璇存槑</label>
<div class="layui-input-block">
- <input type="text" name="deSum" 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">
- <select name="specType" id="specType">
- <option value="鏁ｇ伯">鏁ｇ伯</option>
- <option value="25kg">25kg</option>
- <option value="50kg">50kg</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 type="text" name="foodLocation" 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="price" placeholder="璇疯緭鍏ュ崟浠�"
- class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</em>
+ <input type="text" name="deOtherInfo" autocomplete="off"
+ placeholder="鍏朵粬鎵ｉ噸璇存槑" class="layui-input">
</div>
</div>
</div>
@@ -511,30 +489,10 @@
</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="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-xs8">
- <span style="padding-left: 50px;color: blue;">
- 娉ㄦ剰锛�1銆佹按鏉傚鎵ｉ噸鏍规嵁鍖栭獙缁撴灉鑷姩璁＄畻锛屾鏁�=鎵ｉ噸锛岃礋鏁�=澧為噸 <br>
- </span>
- <span style="padding-left: 93px;color: blue;">
- 2銆佸噣閲� = 姣涢噸 - 鐨噸 锛涙�绘墸閲� = 鎵ｆ按鏉傦紙澶т簬0锛� + 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸<br>
- </span>
- <span style="padding-left: 93px;color: blue;">
- 3銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� + 姘存潅澧為噸锛涘叆搴撻噸閲� = 鍑�閲� - 鎬绘墸閲�
- </span>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label color-red">鍏ュ簱閲嶉噺</label>
+ <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"
@@ -542,6 +500,99 @@
</div>
</div>
</div>
+ <div class="layui-col-xs8">
+ <span style="padding-left: 50px;color: #2ab5ad;">
+ 璇存槑锛氬噣閲�=姣涢噸-鐨噸锛涜川妫�澧炴墸閲嶆牴鎹川妫�璇︾粏濉啓锛涘叆搴撻噸閲�=鍑�閲�-鎵ｉ噸锛涚粨绠楅噸閲�=鍏ュ簱閲嶉噺+璐ㄦ澧為噸<br>
+ </span>
+ </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="line-container">
+ <div class="line"></div>
+ <div class="line-text">浠ヤ笅鏍规嵁搴撳尯绉伴噸浣滀笟瑕佹眰濉啓</div>
+ <div class="line"></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="radio" name="jjlx" value="0" title="绉伴噸鍏ュ簱" checked>
+ <input type="radio" name="jjlx" value="1" title="鏍囧噯鍖呭叆搴�">
+ </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="radio" name="bzw" value="1" title="楹昏">
+ <input type="radio" name="bzw"
+ value="2" title="缂栫粐琚�">
+ <input type="radio" name="bzw"
+ value="3" title="鏁ｈ" checked>
+ </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="dePackage" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input"> <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="dbz" 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 type="text" name="bzbjs" 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 type="text" name="price" placeholder="璇疯緭鍏�"
+ class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</em>
+ </div>
+ </div>
+ </div>
+
+
</form>
</div>
</div>
@@ -558,8 +609,6 @@
</div>
<div class="kccz-r-con">
<div class="kccz-r-vedio" id="kccz-r-video1">
-
-
</div>
<div class="kccz-r-btnbox">
<a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active">
@@ -684,6 +733,7 @@
<script th:src="@{../../static/js/igds-common.js}"></script>
<script th:src="@{../../static/admin/inout/inout-print.js}"></script>
<script th:src="@{../../static/admin/inout/video-play.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/weight.js}"></script>
<script th:src="@{../../static/admin/inout/in-weight.js}"></script>
@@ -739,11 +789,11 @@
<div class="layui-btn-container m10">
<button class="rkbk-quick-btn layui-btn btn-violet"
onClick="controlGate('OPEN')">
- <i><img th:src="@{../../static/images/icon-sm-fc.png}" /></i>寮�閬撻椄
+ <i><img th:src="@{../../static/images/icon-sm-fc.png}"/></i>寮�閬撻椄
</button>
<button class="rkbk-quick-btn layui-btn btn-red"
onClick="controlGate('CLOSE')">
- <i><img th:src="@{../../static/images/icon-sm-fc.png}" /></i>鍏抽亾闂�
+ <i><img th:src="@{../../static/images/icon-sm-fc.png}"/></i>鍏抽亾闂�
</button>
</div>
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-weight-bak20221110.html b/igds-web/src/main/resources/templates/admin/inout/in-weight20230530.html
similarity index 86%
rename from igds-web/src/main/resources/templates/admin/inout/in-weight-bak20221110.html
rename to igds-web/src/main/resources/templates/admin/inout/in-weight20230530.html
index 63d7ad8..8da7613 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-weight-bak20221110.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-weight20230530.html
@@ -6,7 +6,7 @@
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>
+ <title>鍑哄叆搴撶鐞�-鍏ュ簱绉伴噸</title>
<link rel="stylesheet" type="text/css"
th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
@@ -20,6 +20,7 @@
.display-none {
display: none;
}
+
.cursor {
cursor: pointer;
}
@@ -32,7 +33,7 @@
}
.kccz-left-box2 {
- height: 510px;
+ height: 500px;
}
.color-red {
@@ -89,28 +90,31 @@
.rkbk-search-btn {
width: 100px;
height: 30px;
- line-height: 30px;
- font-size: 16px;
- }
- .r-240{
- right: 240px;
- }
- .r-120{
- right: 120px;
- }
-
- .rkbk-search-input{
- background: #FFF !important;
- }
- .rkbk-search-input.bg-date {
- background: #FFF !important;
+ line-height: 30px;
+ font-size: 16px;
}
- #scaleName{
+ .r-240 {
+ right: 240px;
+ }
+
+ .r-120 {
+ right: 120px;
+ }
+
+ .rkbk-search-input {
+ background: #FFF !important;
+ }
+
+ .rkbk-search-input.bg-date {
+ background: #FFF !important;
+ }
+
+ #scaleName {
width: 130px;
height: 28px;
}
-
+
</style>
</head>
@@ -138,6 +142,9 @@
class="rkbk-quick-btn layui-btn btn-blue layui-btn-disabled"
disabled=true onclick="printBill()">
<i><img th:src="@{../../static/images/icon-dayin.png}"/></i>鎵撳嵃杩囩鍗�
+ </button>
+ <button class="rkbk-quick-btn layui-btn" onclick="gateCtrl()">
+ <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>閬撻椄鎿嶄綔
</button>
<button class="rkbk-quick-btn layui-btn btn-violet"
onclick="flushPage()">
@@ -224,7 +231,7 @@
<div class="kccz-czxx-wrap">
<div class="kccz-czxx-num">
- <span id="weightValue">0.00<em>KG</em></span>
+ <span id="weightValue">0.00</span><em>KG</em>
</div>
</div>
@@ -259,42 +266,29 @@
<div class="layui-form-item display-none">
<label class="layui-form-label">闅愯棌瀛楁-ID</label>
- <div class="layui-input-block">
- <input type="text" name="id" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
+ <input type="text" name="id">
</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>
+ <input type="text" name="progress">
</div>
-
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-瀹㈡埛ID</label>
- <div class="layui-input-block">
- <input type="text" name="customerId" 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" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
+ <input type="text" name="type">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-閫氱煡鍗昳d</label>
- <div class="layui-input-block">
- <input type="text" name="noticeId" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
+ <label class="layui-form-label">闅愯棌瀛楁-瀹㈡埛缂栫爜Id</label>
+ <input type="text" name="customerId">
</div>
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-閫氱煡鍗旾D</label>
+ <input type="text" name="noticeId">
+ </div>
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-绮鎬ц川</label>
+ <input type="text" name="foodType">
+ </div>
+
<div class="layui-col-xs4">
<div class="layui-form-item">
@@ -305,7 +299,6 @@
</div>
</div>
</div>
-
<div class="layui-col-xs4">
<div class="layui-form-item">
@@ -331,7 +324,8 @@
<div class="layui-form-item">
<label class="layui-form-label">鎵胯繍浜�</label>
<div class="layui-input-block">
- <input type="text" name="userName" placeholder="涓嶅彲缂栬緫" class="layui-input" disabled>
+ <input type="text" name="userName" placeholder="涓嶅彲缂栬緫" class="layui-input"
+ disabled>
</div>
</div>
</div>
@@ -363,11 +357,11 @@
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label color-red">寰�鏉ュ崟浣�</label>
+ <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="showCustomer()">鈥�</em>
+ class="kccz-data-dw cursor" onclick="showNotice()">鈥�</em>
</div>
</div>
</div>
@@ -401,6 +395,7 @@
</div>
</div>
</div>
+
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label">瑁呭嵏浠撳簱</label>
@@ -468,7 +463,7 @@
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">鎬� 鎵� 閲�</label>
+ <label class="layui-form-label">鎬� 鎵� 閲�</label>
<div class="layui-input-block">
<input type="text" name="deSum" placeholder="鑷姩璁＄畻"
autocomplete="off" class="layui-input rkbk-search-input"
@@ -476,7 +471,18 @@
</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="specType" id="specType">
+ <option value="鏁ｇ伯">鏁ｇ伯</option>
+ <option value="25kg">25kg</option>
+ <option value="50kg">50kg</option>
+ </select>
+ </div>
+ </div>
+ </div>
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label">绮浜у湴</label>
@@ -486,43 +492,17 @@
</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="foodLevel">-->
-<!-- <option value=""></option>-->
-<!-- <option th:each="dic,dicSet:${listFoodLevel}"-->
-<!-- th:value="${dic.code}" th:text="${dic.name}"></option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label color-red">缁撶畻閲嶉噺</label>
+ <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>
+ <input type="text" name="price" placeholder="璇疯緭鍏ュ崟浠�"
+ class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</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="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-col-xs8">
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞璇存槑</label>
<div class="layui-input-block">
@@ -531,17 +511,36 @@
</div>
</div>
</div>
-
- <div class="layui-col-xs12">
+ <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="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-xs8">
<span style="padding-left: 50px;color: blue;">
- 娉ㄦ剰锛�1銆佸噣閲� = 姣涢噸 - 鐨噸 锛� 鎬绘墸閲� = 鎵ｆ按鏉� + 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸 <br>
+ 娉ㄦ剰锛�1銆佹按鏉傚鎵ｉ噸鏍规嵁鍖栭獙缁撴灉鑷姩璁＄畻锛屾鏁�=鎵ｉ噸锛岃礋鏁�=澧為噸 <br>
</span>
- <span style="padding-left: 93px;color: blue;">
- 2銆佹按鍒嗘墸閲嶆牴鎹寲楠屾按鍒嗕俊鎭嚜鍔ㄨ绠楋紝姝ｆ暟=鎵ｉ噸锛岃礋鏁�=澧為噸<br>
+ <span style="padding-left: 93px;color: blue;">
+ 2銆佸噣閲� = 姣涢噸 - 鐨噸 锛涙�绘墸閲� = 鎵ｆ按鏉傦紙澶т簬0锛� + 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸<br>
</span>
- <span style="padding-left: 93px;color: blue;">
- 3銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� 锛堝惈姘存潅澧為噸锛夛紱 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堜笉鍚按鏉傚閲嶏級
+ <span style="padding-left: 93px;color: blue;">
+ 3銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� + 姘存潅澧為噸锛涘叆搴撻噸閲� = 鍑�閲� - 鎬绘墸閲�
</span>
+ </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="recordWeight" placeholder="鑷姩璁＄畻"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
</div>
</form>
</div>
@@ -671,7 +670,10 @@
//杩囩▼鎽勫儚澶�
var snapDto1 = [[${snapDto1}]];
var snapDto2 = [[${snapDto2}]];
- var snapDto3 = [[${snapDto2}]];
+ var snapDto3 = [[${snapDto3}]];
+ var gateDto = [[${gateDto}]];
+ //鏅烘収鍗�
+ var cardDto = [[${cardDto}]];
var ship = null; //鏄惁鑸硅繍椤甸潰鏍囪瘑
</script>
@@ -680,30 +682,18 @@
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
-<script th:src="@{../../static/plugins/video/EasyPlayer-element.min.js}"></script>
<script th:src="@{../../static/admin/inout/inout-print.js}"></script>
<script th:src="@{../../static/admin/inout/video-play.js}"></script>
+<script th:src="@{../../static/admin/inout/weight.js}"></script>
<script th:src="@{../../static/admin/inout/in-weight.js}"></script>
</body>
-<!-- 寮瑰嚭寰�鏉ュ崟浣嶅垪琛� -->
-<div class="layui-tab-content" id="listCustomer" style="display: none;">
- <table class="layui-table" lay-skin="nob" id="tableCustomer"
- lay-filter="tableCustomer" style="margin: 0px;"></table>
+<!-- 寮瑰嚭閫氱煡鍗� -->
+<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>
-
-<script type="text/html" id="toolbarCustomer">
- <div class="">
- <div class="layui-col-xs6">
- <input type="text" id="key" placeholder="杈撳叆缂栫爜鎴栬�呭悕绉扳�︹��" class="layui-input">
- </div>
- <div class="layui-col-xs6" style="padding-left: 10px;">
- <button class="layui-btn layui-btn-sm" onclick="flushCustomer()">鏌ヨ</button>
- </div>
- </div>
-</script>
-
<!-- 寮瑰嚭绮浜у湴 -->
<div class="layui-tab-content" id="listFoodLocation"
@@ -743,6 +733,21 @@
</tbody>
</table>
</div>
+<!-- 寮瑰嚭妗�-閬撻椄鎿嶄綔-->
+<div class="layui-tab-content areation-center" id="control-gate"
+ style="display: none;">
+ <div class="layui-btn-container m10">
+ <button class="rkbk-quick-btn layui-btn btn-violet"
+ onClick="controlGate('OPEN')">
+ <i><img th:src="@{../../static/images/icon-sm-fc.png}" /></i>寮�閬撻椄
+ </button>
+ <button class="rkbk-quick-btn layui-btn btn-red"
+ onClick="controlGate('CLOSE')">
+ <i><img th:src="@{../../static/images/icon-sm-fc.png}" /></i>鍏抽亾闂�
+ </button>
+ </div>
+
+</div>
<script type="text/html" id="toolbarFoodLocaton">
<div class="">
--
Gitblit v1.9.3