From 7a7ccfd74dbdff086d2aabe5117ec1dc6f804d91 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 31 五月 2023 18:48:41 +0800
Subject: [PATCH] 出入库优化-称重
---
igds-web/src/main/resources/static/admin/inout/in-weight.js | 217 ++++++++++++++++++++----------------------------------
1 files changed, 80 insertions(+), 137 deletions(-)
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 dc553ba..0f061eb 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,8 +5,8 @@
var recordData = null;// 涓氬姟鏁版嵁淇℃伅
var snapData;//绯荤粺鎶撴媿瀵硅薄淇℃伅
var timerWeight;
-var textParam;//璁惧璇嗗埆缁撴灉
-var curProgress;//褰撳墠璇︾粏娴佺▼
+var paramIntelCard;//璁惧璇嗗埆缁撴灉
+var paramIdCard;//璁惧璇嗗埆缁撴灉
$(function () {
layui.use(['layer', 'laydate', 'form', 'table', 'util'], function () {
@@ -85,76 +85,38 @@
//鏆傛棤
}
-// 鏍规嵁褰撳墠鎿嶄綔鐨勬寜閽甀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);
- }
- }
- 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);
-
- resetForm();
- }
-}
-
//鐐瑰嚮绉伴噸
function weight() {
// 娌℃湁涓氬姟鏁版嵁涓嶅彲鎵ц
if (!recordData) {
- alertError("娌℃湁鏌ヨ鍒颁笟鍔℃暟鎹紝鎵ц琚嫆缁濓紒锛�");
+ alertError("娌℃湁鏌ヨ鍒颁笟鍔℃暟鎹紝鎵ц琚嫆缁濓紒");
return;
}
-
// 濡傛灉鏄┖杞︾О閲�
if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
form.val("form-data", {
emptyWeight: weightDto.weight
});
+ form.render();
}
-
// 濡傛灉鏄弧杞︾О閲�
if (InoutProgress.WEIGHT_FULL == recordData.progress) {
form.val("form-data", {
fullWeight: weightDto.weight
});
+ form.render();
}
- 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,
-
+ id1: snapDto1.id,
+ id2: snapDto2.id,
+ id3: snapDto3.id,
sort: $("#scaleName").val(),
weight: weightDto.weight
};
@@ -171,62 +133,57 @@
success: function (result) {
layer.close(index);
if (result.code != "0000") {
- layer.alert(result.msg);
+ alertError(result.msg);
} else {
snapData = result.data;
}
},
error: function () {
layer.close(index);
- layer.msg("鍚庡彴璋冪敤鎴浘澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ alertError("鍚庡彴璋冪敤鎴浘澶辫触锛岃閲嶆柊灏濊瘯");
}
});
- //鍏ュ簱绗簩娆＄О閲嶆椂璋冪敤璁＄畻鏂规硶
+ //濡傛灉鏄浜屾绉伴噸锛岄粯璁ゆ墽琛岃嚜鍔ㄨ绠�
if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
deAutoByIn("emptyWeight");
}
- flushBtn("btn-weight");
}
-//鏂扮殑璇诲崱鏂瑰紡
+//璇绘櫤鎱у崱
function flushICCard() {
- flushICCard1();
+ if (!cardDto.protocol) {
+ flushICCard1();
+ } else {
+ flushICCard2();
+ }
}
/**
* 鍗忚璇诲彇鏅烘収鍗�
*/
function flushICCard2() {
- var param = JSON.stringify(cardDto);
var index = layer.load();
+ var param = JSON.stringify(cardDto);
$.ajax({
type: "POST",
- url: "../../inout/api/ic-card-num",
+ url: "../../inout/api/get-icCard",
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);
+ if (result.code != "0000") {
+ alertError(result.msg);
+ } else {
+ paramIntelCard = data;
+ $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
+ flushData(paramIntelCard, null);
+ }
},
error: function () {
layer.close(index);
- layer.alert("IC鍗¤鍙栧け璐ワ紒", {
- offset: ['300px', '300px']
- });
+ alertError("IC鍗¤鍙栧け璐�");
}
});
}
@@ -235,6 +192,7 @@
* 鏈湴璇诲彇鏅烘収鍗�
*/
function flushICCard1() {
+ var index = layer.load();
$("#text-param").val(null);
$("#form-data")[0].reset();
form.render();
@@ -249,21 +207,23 @@
jsonpCallback: "jsonpCallback",
success: function (json) {
var data = json.no;
+ layer.close(index);
if (data === "not found") {
alertError("璇烽噸鏂拌鍗★紒");
} else {
- textParam = data;
- $("#text-param").text("璇嗗埆鍗″彿锛�" + textParam);
- flushData();
+ paramIntelCard = data;
+ $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
+ flushData(paramIntelCard, null);
}
},
error: function () {
+ layer.close(index);
alertError("IC鍗¤鍙栧嚭閿欙紒");
}
});
}
-// 浣跨敤鎻掍欢鑾峰彇鐪佷唤璇�
+// 浣跨敤鎻掍欢鑾峰彇韬唤璇�
function flushIdCard() {
var index = layer.load();
$.ajax({
@@ -278,21 +238,22 @@
layer.close(index);
var data = json.content;
if (data === "not found") {
- layer.alert("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛岃鎵嬪姩褰曞叆锛�", {
- offset: ['300px', '300px']
- });
+ alertError("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛�");
return;
}
- $("#userId").val(data.idNum);
- flushData();
+ paramIdCard = data;
+ $("#text-param").text("璇嗗埆韬唤璇侊細" + paramIdCard);
+ flushData(null, paramIdCard);
},
error: function () {
- layer.alert("韬唤璇佽鍙栧け璐ワ紝璇锋墜鍔ㄥ綍鍏ワ紒", {
- offset: ['300px', '300px']
- });
+ alertError("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛�");
layer.close(index);
}
});
+}
+
+function flushByHand() {
+ flushData(null, null);
}
function flushWeight() {
@@ -352,12 +313,9 @@
layer.msg("寮�濮嬫覆鏌撴墦鍗板崟鈥︹��");
if (companyId && companyId == "5016") {
print5016Weight(result.data);
- console.log("5016");
} else {
printWeight(result.data);
}
- // 鍒锋柊鎸夐挳
- flushBtn("btn-printBill");
}
},
error: function () {
@@ -380,12 +338,6 @@
//绉伴噸鍙互澶嶇敤
$("#btn-weight").removeClass("layui-btn-disabled");
$("#btn-weight").attr("disabled", false);
-
- //绌鸿溅鍜屾弧杞﹁閲嶇疆
- updateEditAndProgress();
-
- //鎵ｉ噸淇℃伅妗嗘仮澶嶄负鍙紪杈�
- delDisabled();
}
function flushPage() {
@@ -397,19 +349,18 @@
}
// --鏌ヨ鏂规硶,鑾峰彇韬唤璇佸彿銆佸崱鍙枫�佽溅鐗屽彿锛岃繘琛屾煡璇�
-function flushData() {
+function flushData(intelCard, userIdCard) {
var index = layer.load();
- var userId2 = $("#userId").val();
- var intelCard = $("#intelCard").val();
+ var userIdCard = userIdCard;
+ var intelCard = intelCard;
var plateNum = $("#plateNum").val();
var param = {
type: type,
progress: progress,
intelCard: intelCard,
- userId: userId2,
+ userId: userIdCard,
plateNum: plateNum
};
-
$.ajax({
type: "POST",
url: "../../basic/inout/inout-query",
@@ -417,66 +368,57 @@
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(param),
success: function (result) {
+ layer.close(index);
if (result.code != "0000") {
- notify(result.msg, result.data);
+ notifyProgress(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("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ alertError("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯");
}
});
}
+
/**
- * 璺熸柊娴佺▼璇存槑鎻愬績淇℃伅
+ * 鏍规嵁涓氬姟鏁版嵁鏇存柊椤甸潰涓殑鐘舵��
*/
function updateEditAndProgress() {
- if (recordData) {
- if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
- $("#emptyWeight").removeClass("rkbk-search-input");
- $("#emptyWeight").attr("disabled", false);
+ if (!recordData) return true;
+ var curProgress = recordData.progress;
- $("#progress-hand").addClass("active");
- $("#progress-emptyWeight").addClass("active");
+ //绌鸿溅绉伴噸
+ if (InoutProgress.WEIGHT_EMPTY == curProgress) {
+ $("#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);
+ $("#depotIdLabel").removeClass("color-red");
+ }
- $("#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);
-
+ //婊¤溅绉伴噸
+ if (InoutProgress.WEIGHT_FULL == curProgress) {
$("#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);
+ //瑁呭嵏浠撳簱蹇呭～
+ $("#depotIdLabel").addClass("color-red");
+ }
+
+ //璁剧疆鍙紪杈�
+ if (weightEditTag == 'Y') {
+ $("#fullWeight").removeClass("rkbk-search-input");
+ $("#fullWeight").attr("disabled", false);
+
+ $("#emptyWeight").removeClass("rkbk-search-input");
+ $("#emptyWeight").attr("disabled", false);
}
}
@@ -541,8 +483,6 @@
notify(result.msg, result.data);
} else {
notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
- // 鏇存柊鎸夐挳鏄剧ず
- flushBtn("btn-submit");
}
layer.close(index);
},
@@ -572,6 +512,11 @@
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(param)
});
+}
+
+//鏄剧ず璐ㄦ淇℃伅
+function showCheck() {
+ alertError("璋冩暣");
}
@@ -709,5 +654,3 @@
layer.msg("娌℃湁鑾峰彇鍒拌澶囷紒");
}
}
-
-//-------------------------閬撻椄鎿嶄綔--------------------------//
\ No newline at end of file
--
Gitblit v1.9.3