From 922f6d5e03eb30a0b2f4d31a1b734cd61567b436 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 17 四月 2025 11:22:05 +0800
Subject: [PATCH] 染厂领料单：子表数值计算时存在小数自动加00000001的情况处理
---
WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 16 deletions(-)
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
index a025d0d..b448c66 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
@@ -825,11 +825,11 @@
for (var i = 0; i < option.data.length; i++) {
var HMaterRuleType = option.data[i].HMaterRuleType;
if (HMaterRuleType == "鏌撴枡") {
- option.data[i].HQty = option.data[i].HRate * HWeight;
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
} else if (HMaterRuleType == "鍔╁墏") {
- option.data[i].HQty = option.data[i].HRate * HWaterQty * 0.001;
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
} else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- option.data[i].HQty = option.data[i].HRate * HWeight * 0.001;
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
}
}
table.render(option);
@@ -846,11 +846,11 @@
for (var i = 0; i < option.data.length; i++) {
var HMaterRuleType = option.data[i].HMaterRuleType;
if (HMaterRuleType == "鏌撴枡") {
- option.data[i].HQty = option.data[i].HRate * HWeight;
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
} else if (HMaterRuleType == "鍔╁墏") {
- option.data[i].HQty = option.data[i].HRate * HWaterQty * 0.001;
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
} else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- option.data[i].HQty = option.data[i].HRate * HWeight * 0.001;
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
}
}
table.render(option);
@@ -1053,11 +1053,11 @@
var HQty = 0;
var HMaterRuleType = obj.data.HMaterRuleType;
if (HMaterRuleType == "鏌撴枡") {
- HQty = HRate * HWeight;
+ HQty = dealDoubleToFixed(HRate * HWeight);
} else if (HMaterRuleType == "鍔╁墏") {
- HQty = HRate * HWaterQty * 0.001;
+ HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
} else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- HQty = HRate * HWeight * 0.001;
+ HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -1073,11 +1073,11 @@
var HQty = 0;
var HMaterRuleType = value;
if (HMaterRuleType == "鏌撴枡") {
- HQty = HRate * HWeight;
+ HQty = dealDoubleToFixed(HRate * HWeight);
} else if (HMaterRuleType == "鍔╁墏") {
- HQty = HRate * HWaterQty * 0.001;
+ HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
} else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- HQty = HRate * HWeight * 0.001;
+ HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -1652,11 +1652,11 @@
var HWeight = $("#HWeight").val();
var HWaterQty = $("#HWaterQty").val();
if (option.data[rowIndex + i].HMaterRuleType == "鏌撴枡") {
- option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWeight;
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
} else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏") {
- option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWaterQty * 0.001;
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
} else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWeight * 0.001;
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
}
}
table.render(option);
@@ -2204,7 +2204,33 @@
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
function GetGyUnit(data) {
OptionData = data
- }
+ }
+
+
+ //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
+ function dealDoubleToFixed(data) {
+ //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+ var dotLength = 6;
+
+ //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+ data = data + "";
+ var index = data.indexOf(".");
+
+ //澶勭悊鏁版嵁骞惰繑鍥�
+ if (index < 0) {
+ return data * 1;
+ } else {
+ //鑾峰彇灏忔暟浣嶆暟
+ var length = data.length - index - 1;
+ if (length <= dotLength) {
+ return data * 1;
+ } else {
+ data = data * 1;
+ return data.toFixed(dotLength) * 1;
+ }
+ }
+ }
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1