From 7f5ecaf7dbd07e218fbda575e45d8264a560a1e6 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 05 六月 2023 13:50:59 +0800
Subject: [PATCH] 出入库优化-称重页面逻辑优化完成
---
igds-web/src/main/resources/static/admin/inout/in-weight.js | 102 ++++++++++++++++++--------------------------------
1 files changed, 37 insertions(+), 65 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 86e82ee..b2cf50b 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
@@ -285,7 +285,7 @@
// 鐐瑰嚮鎵撳嵃锛岀郴缁熷垽鏂槸鍚﹀凡缁忔墽琛屽畬鎴愶紝濡傛灉宸茬粡瀹屾垚锛岀洿鎺ユ墦鍗帮紝濡傛灉鏈畬鎴愬垯鍏堟墽琛屽畬鎴�
function printBill() {
if (!recordData) {
- layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝涓嶆敮鎸佹墦鍗帮紒");
+ alertError("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝鎵撳嵃琚嫆缁濓紒");
return;
}
// 浠庡悗鍙拌幏鍙栨ā鐗堝苟鎵撳嵃
@@ -293,34 +293,25 @@
// 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
Object.assign(recordData, data);
- printBillStep2();
-}
-
-// 鐐瑰嚮鎵撳嵃锛屽厛鎵ц绯荤粺榛樿鎵ц瀹屾垚鍗″洖鏀�
-function printBillStep2() {
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../basic/inout-report/inout-bill-weight",
+ url: "../../basic/inout/report/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);
+ alertError(result.msg);
} else {
layer.msg("寮�濮嬫覆鏌撴墦鍗板崟鈥︹��");
- if (companyId && companyId == "5016") {
- print5016Weight(result.data);
- } else {
- printWeight(result.data);
- }
+ printWeight(result.data);
}
},
error: function () {
layer.close(index);
- layer.msg("鑾峰彇鎵撳嵃妯＄増澶辫触锛岃鑱旂郴绠＄悊鍛樻煡鐪嬪師鍥狅紒锛�");
+ alertError("鑾峰彇鎵撳嵃妯＄増澶辫触锛岃鑱旂郴绠＄悊鍛樻煡鐪嬪師鍥�");
}
});
}
@@ -331,19 +322,13 @@
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);
}
function flushPage() {
layer.confirm('纭畾瑕佸埛鏂伴〉闈㈠悧锛�', {icon: 3, title: '鎻愮ず'}, function (index) {
resetForm();
- layer.msg("椤甸潰閲嶇疆瀹屾垚锛岃閲嶆柊鎿嶄綔鈥︹��");
layer.close(index);
});
}
@@ -424,41 +409,49 @@
// 褰撳墠瀹屾垚
function submit() {
- if (null == recordData) {
- notify("娌℃湁鏁版嵁鍙互鎻愪氦", null);
+ if (!recordData) {
+ alertError("娌℃湁涓氬姟鏁版嵁淇℃伅锛屾墽琛岃鎷掔粷");
return;
}
var data = form.val("form-data");
if (!data.depotId) {
- notify("瑁呭嵏浠撳簱蹇呴』濉啓", null);
+ alertError("鎻愮ず锛氳鍗镐粨搴撳繀濉�");
return;
}
+ if (!data.customerName) {
+ alertError("鎻愮ず锛氬鎴峰悕绉板繀濉�");
+ 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);
+ alertError("鎻愮ず锛氭弧杞︾О閲嶄俊鎭繀濉�");
return;
}
}
- // 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
+ if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
+ if (data.emptyWeight <= 0.0) {
+ alertError("鎻愮ず锛氱┖杞︾О閲嶄俊鎭繀濉�");
+ return;
+ }
+ if (!data.foodVariety) {
+ alertError("鎻愮ず锛氱伯椋熷搧绉嶅繀濉�");
+ return;
+ }
+
+ if (!data.settleWeight || data.settleWeight <= 0.0) {
+ alertError("缁撶畻閲嶉噺涓嶅悎瑙勶紝璇锋牳瀵�");
+ return;
+ }
+ if (!data.recordWeight || data.recordWeight <= 0.0) {
+ alertError("鍏ュ簱閲嶉噺涓嶅悎瑙勶紝璇锋牳瀵�");
+ return;
+ }
+ }
+
+ //鍚堝苟鏁版嵁
Object.assign(recordData, data);
// 鑾峰彇鐓х墖
@@ -474,7 +467,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../basic/inout/inout-next-step",
+ url: "../../basic/inout/submit-weight",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(recordData),
@@ -488,29 +481,8 @@
},
error: function () {
layer.close(index);
- notify("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯", null);
+ alertError("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯");
}
- });
-
- //浠ヤ笅閫昏緫涓哄鍔犱竴涓闊抽�氱煡鐨勮皟鐢ㄦ柟娉曪紝涓嶈�冭檻杩斿洖缁撴灉--鍚庡彴璋冪敤
- 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)
});
}
--
Gitblit v1.9.3