From d62cbd8da3bd2422de2923a6e7d999822730d632 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 16 九月 2023 11:55:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/static/admin/inout/weight.js | 149 ++++++++++++++++++++++++++++++-------------------
1 files changed, 91 insertions(+), 58 deletions(-)
diff --git a/igds-web/src/main/resources/static/admin/inout/weight.js b/igds-web/src/main/resources/static/admin/inout/weight.js
index 9f0f528..379559f 100644
--- a/igds-web/src/main/resources/static/admin/inout/weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/weight.js
@@ -21,7 +21,7 @@
netWeight = netWeight.toFixed(0);
recordWeight = recordWeight.toFixed(0);
- settleWeight = recordWeight.toFixed(0);
+ settleWeight = settleWeight.toFixed(0);
form.val("form-data", {
netWeight: netWeight,
@@ -34,86 +34,119 @@
/**
* 鍑哄簱-绉伴噸鑷姩璁＄畻
- * 1銆佸噣閲� = 姣涢噸 - 鐨噸 锛� 鎬绘墸閲� = 鎵ｆ按鏉� + 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸
- * 2銆佹按鍒嗗閲嶏紝鏁存暟 = 澧為噸锛岃礋鏁�= 鎵ｉ噸
- * 3銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� 锛堝惈姘存潅澧為噸锛夛紱 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堜笉鍚按鏉傚閲嶏級
+ * 1銆佸噣閲� = 姣涢噸 - 鐨噸 锛� 鎬绘墸閲� = 璐ㄦ鎵ｉ噸 + 鍏朵粬鎵ｉ噸
+ * 2銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� + 璐ㄦ鎵ｉ噸锛� 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲�
* 娉ㄦ剰锛氬鏋滄槸鎵嬪姩淇敼浜嗘按鍒嗗拰鏉傝川鐨勬墸閲嶏紝鍒欎笉鎸夌収閰嶇疆瑙勫垯杩涜澧炴墸閲嶈绠�
* @param name 瑙﹀彂浜嬩欢鐨勫睘鎬у悕绉�
*/
function deAutoByOut(name) {
var curData = form.val("form-data");
-
if (curData.fullWeight == 0 || curData.emptyWeight == 0) {
return;
}
- //姹囨�荤粨鏋�
- var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
// 鍑�閲�
var netWeight = curData.fullWeight - curData.emptyWeight;
- //鎵ｆ按鏉�
- var deWet = curData.deWet, deImpurity = curData.deImpurity;
-
if (netWeight <= 0) {
- layer.alert("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
+ alertError("鍑�閲�<=0锛屽綋鍓嶇幆鑺傚瓨鍦ㄩ�昏緫閿欒锛岃鏍稿");
return;
}
+ //鍏朵粬淇℃伅
+ var dePackage = curData.dePackage, deOther = curData.deOther, settleWeight = 0,
+ recordWeight = 0, deSum = 0, deCheck = curData.deCheck, addCheck = curData.addCheck;
- var deBase = 0, multiple = 0;
- //姘村垎鏉傝川锛屾洿鏀规瘮渚嬪苟涓旀按鍒嗘墸閲嶈繕娌¤绠楁儏鍐典笅
- if ("fullWeight" == name || null == deWet) {
- var checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C01, CHECK_ST.C020101);
- if (checkItem) {
- deBase = Number(curData.wet) - Number(checkItem.upperLimit);
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.ruleNum);//鍊嶆暟
- deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
- }
- }
- //鏉傝川
- if ("fullWeight" == name || null == deImpurity) {
- checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C02, CHECK_ST.C01010301);
- if (checkItem) {
- deBase = Number(curData.impurity) - Number(checkItem.upperLimit);
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.ruleNum);
- deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
- }
- }
+ recordWeight = Number(netWeight) - Number(dePackage) - Number(deOther) - Number(deCheck);
+ settleWeight = Number(recordWeight) + Number(addCheck);
- /** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
- deSum = Number(curData.deOther) + Number(curData.deHandle);
+ deSum = Number(deOther) + Number(deCheck)
-
- if (Number(deWet) > 0) {//澧為噸
- addSum = addSum + Number(deWet);
- } else {
- deSum = deSum + Number(deWet);
- }
-
- if (Number(deImpurity) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deImpurity);
- } else {
- addSum = addSum + Number(deImpurity);
- }
-
+ netWeight = netWeight.toFixed(0);
+ recordWeight = recordWeight.toFixed(0);
+ settleWeight = settleWeight.toFixed(0);
deSum = deSum.toFixed(0);
- /** 澧為噸杞鏁帮紝渚夸簬璁＄畻 */
- addSum = Math.abs(addSum).toFixed(0);
- /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
- recordWeight = Number(netWeight) - Number(deSum);
- /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
- settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
form.val("form-data", {
netWeight: netWeight,
- deImpurity: deImpurity,
- deWet: deWet,
- deSum: deSum,
settleWeight: settleWeight,
- recordWeight: recordWeight
+ recordWeight: recordWeight,
+ deSum: deSum
});
form.render();
}
+
+// function deAutoByOut(name) {
+// var curData = form.val("form-data");
+//
+// if (curData.fullWeight == 0 || curData.emptyWeight == 0) {
+// return;
+// }
+// //姹囨�荤粨鏋�
+// var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
+// // 鍑�閲�
+// var netWeight = curData.fullWeight - curData.emptyWeight;
+// //鎵ｆ按鏉�
+// var deWet = curData.deWet, deImpurity = curData.deImpurity;
+//
+// if (netWeight <= 0) {
+// layer.alert("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
+// return;
+// }
+//
+// var deBase = 0, multiple = 0;
+// //姘村垎鏉傝川锛屾洿鏀规瘮渚嬪苟涓旀按鍒嗘墸閲嶈繕娌¤绠楁儏鍐典笅
+// if ("fullWeight" == name || null == deWet) {
+// var checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C01, CHECK_ST.C020101);
+// if (checkItem) {
+// deBase = Number(curData.wet) - Number(checkItem.upperLimit);
+// if (deBase == 0) return;
+// multiple = parseInt(deBase / checkItem.ruleNum);//鍊嶆暟
+// deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
+// }
+// }
+// //鏉傝川
+// if ("fullWeight" == name || null == deImpurity) {
+// checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C02, CHECK_ST.C01010301);
+// if (checkItem) {
+// deBase = Number(curData.impurity) - Number(checkItem.upperLimit);
+// if (deBase == 0) return;
+// multiple = parseInt(deBase / checkItem.ruleNum);
+// deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
+// }
+// }
+//
+// /** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
+// deSum = Number(curData.deOther) + Number(curData.deHandle);
+//
+//
+// if (Number(deWet) > 0) {//澧為噸
+// addSum = addSum + Number(deWet);
+// } else {
+// deSum = deSum + Number(deWet);
+// }
+//
+// if (Number(deImpurity) > 0) {//鎵ｉ噸
+// deSum = deSum + Number(deImpurity);
+// } else {
+// addSum = addSum + Number(deImpurity);
+// }
+//
+// deSum = deSum.toFixed(0);
+// /** 澧為噸杞鏁帮紝渚夸簬璁＄畻 */
+// addSum = Math.abs(addSum).toFixed(0);
+// /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
+// recordWeight = Number(netWeight) - Number(deSum);
+// /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
+// settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
+//
+// form.val("form-data", {
+// netWeight: netWeight,
+// deImpurity: deImpurity,
+// deWet: deWet,
+// deSum: deSum,
+// settleWeight: settleWeight,
+// recordWeight: recordWeight
+// });
+// form.render();
+// }
/**
* 鏍规嵁鍖栭獙椤瑰拰浼犻�掕繃鏉ョ殑鍙傛暟鑾峰彇褰撳墠鍙傛暟鐨勯厤缃俊鎭�
@@ -174,7 +207,7 @@
var param = {
type: type
};
-
+
console.log(url);
table.render({
--
Gitblit v1.9.3