From 5fc90c39af6bbd2661807dc524dcbd4c7f52bea0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 17 一月 2024 14:28:52 +0800
Subject: [PATCH] 销售出库单：选择表头仓库后，自动填入子表中未设置仓库的记录，保存时判断仓库是否已经设置
---
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 164 +++++++++++++-----------------------------------------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 4
2 files changed, 41 insertions(+), 127 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 3c57a46..ce4fa39 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5439,10 +5439,10 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
- <publishTime>01/17/2024 10:14:45</publishTime>
+ <publishTime>01/17/2024 14:25:12</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
- <publishTime>01/17/2024 10:14:45</publishTime>
+ <publishTime>01/17/2024 14:25:12</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
<publishTime>01/16/2024 14:21:41</publishTime>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 6c07afb..21d84a3 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -547,9 +547,9 @@
}
- //if (AllowLoadData(data)) {
- set_SaveBill(data);
- //}
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
});
//#endregion
//#endregion
@@ -1222,8 +1222,10 @@
//鏍规嵁琛ㄥご 鍑哄簱浠撳簱 甯﹀嚭瀛愯〃 鍙戣揣浠撳簱
for (var i = 0; i < option.data.length; i++) {
- option.data[i].HWHID = checkStatus.data[0].HItemID;
- option.data[i].鍙戣揣浠撳簱 = checkStatus.data[0].HName;
+ if (option.data[i].HWHID + "" == "0") {
+ option.data[i].HWHID = checkStatus.data[0].HItemID;
+ option.data[i].鍙戣揣浠撳簱 = checkStatus.data[0].HName;
+ }
}
table.render(option);
@@ -1820,48 +1822,28 @@
return false;
}
- if ($("#HDeptID").val() == "0") {
- layer.msg("閮ㄩ棬鏈�夋嫨!");
- return false;
- }
+ //if ($("#HDeptID").val() == "0") {
+ // layer.msg("閮ㄩ棬鏈�夋嫨!");
+ // return false;
+ //}
+
+ //if ($("#HEmpID").val() == "0") {
+ // layer.msg("閿�鍞憳鏈�夋嫨!");
+ // return false;
+ //}
+
+ //if ($("#HMangerID").val() == "0") {
+ // layer.msg("閿�鍞富绠℃湭閫夋嫨!");
+ // return false;
+ //}
if ($("#HCusID").val() == "0") {
layer.msg("瀹㈡埛鏈�夋嫨!");
return false;
}
- if ($("#HEmpID").val() == "0") {
- layer.msg("涓氬姟鍛樻湭閫夋嫨!");
- return false;
- }
-
if ($("#HCurID").val() == "0") {
layer.msg("甯佸埆鏈�夋嫨!");
- return false;
- }
-
- if ($("#HMangerID").val() == "0") {
- layer.msg("涓荤鏈�夋嫨!");
- return false;
- }
-
- if ($("#HSSID").val() == "0") {
- layer.msg("缁撶畻鏂瑰紡鏈�夋嫨!");
- return false;
- }
-
- if ($("#HPayCusID").val() == "0") {
- layer.msg("缁撶畻鏂规湭閫夋嫨!");
- return false;
- }
-
- if ($("#HDate").val() == "") {
- layer.msg("鏃ユ湡鏈缃�!");
- return false;
- }
-
- if ($("#HSSDate").val() == "") {
- layer.msg("缁撶畻鏃ユ湡鏈缃�!");
return false;
}
@@ -1872,7 +1854,7 @@
} else if (!ref.test(temp)) {
layer.msg("姹囩巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return false;
- }
+ }
//#endregion
//#region 瀛愯〃 鏁版嵁妫�楠�
@@ -1887,28 +1869,23 @@
return false;
}
- if (option.data[i]["HDate"] == "") {
- layer.msg("绗�" + i + "琛岋細浜よ揣鏃ユ湡涓嶈兘涓虹┖锛�");
- return false;
- }
-
- //鏁伴噺鏍煎紡鏍￠獙
+ //瀹炲彂鏁伴噺鏍煎紡鏍￠獙
temp = option.data[i]["HQty"] + "";
if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+ layer.msg("绗�" + i + "琛岋細瀹炲彂鏁伴噺涓嶈兘涓�0锛�");
return false;
} else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ layer.msg("绗�" + i + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
return false;
}
- //涓嶅惈绋庡崟浠锋牸寮忔牎楠�
+ //鍗曚环鏍煎紡鏍￠獙
temp = option.data[i]["HPrice"] + "";
if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細涓嶅惈绋庡崟浠蜂笉鑳戒负0锛�");
+ layer.msg("绗�" + i + "琛岋細鍗曚环涓嶈兘涓�0锛�");
return false;
} else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細涓嶅惈绋庡崟浠疯杈撳叆澶т簬0鐨勬暟瀛楋紒");
+ layer.msg("绗�" + i + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
return false;
}
@@ -1922,6 +1899,13 @@
return false;
}
+ //绋庣巼鏍煎紡鏍￠獙
+ temp = option.data[i]["HTaxRate"] + "";
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+ return false;
+ }
+
//閲戦鏍煎紡鏍￠獙
temp = option.data[i]["HMoney"] + "";
if (temp == "0") {
@@ -1932,48 +1916,8 @@
return false;
}
- //鎶樻墸鐜囨牸寮忔牎楠�
- temp = option.data[i]["HDiscountRate"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細鎶樻墸鐜囦笉鑳戒负0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細鎶樻墸鐜囪杈撳叆澶т簬0鐨勬暟瀛楋紒");
- return false;
- }
-
- //瀹為檯鍚◣鍗曚环鏍煎紡鏍￠獙
- temp = option.data[i]["HRelTaxPrice"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細瀹為檯鍚◣鍗曚环涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細瀹為檯鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
- }
-
- //绋庣巼鏍煎紡鏍￠獙
- temp = option.data[i]["HTaxRate"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細绋庣巼涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細绋庣巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
- }
-
- //绋庨鏍煎紡鏍￠獙
- temp = option.data[i]["HTaxMoney"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細绋庨涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細绋庨璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
- }
-
//浠风◣鍚堣鏍煎紡鏍￠獙
- temp = option.data[i]["HlineTotal"] + "";
+ temp = option.data[i]["HTaxMoney"] + "";
if (temp == "0") {
layer.msg("绗�" + i + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
return false;
@@ -1982,39 +1926,9 @@
return false;
}
- //鏈綅甯佷环绋庡悎璁℃牸寮忔牎楠�
- temp = option.data[i]["HlineTotalBB"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細鏈綅甯佷环绋庡悎璁′笉鑳戒负0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細鏈綅甯佷环绋庡悎璁¤杈撳叆澶т簬0鐨勬暟瀛楋紒");
- return false;
- }
-
- //鍑哄簱鏁伴噺鏍煎紡鏍￠獙
- temp = option.data[i]["HOutStockQty"] + "";
- if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細鍑哄簱鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
- }
-
- //寮�绁ㄦ暟閲忔牸寮忔牎楠�
- temp = option.data[i]["HInvoiceQty"] + "";
- if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細寮�绁ㄦ暟閲忚杈撳叆澶т簬0鐨勬暟瀛楋紒");
- return false;
- }
- }
- //#endregion
-
- //#region 瀛愯〃 鍏抽敭瀛楅噸澶嶆牎楠�
- var num = [];
- for (var i = 0; i < option.data.length; i++) {
- if ($.inArray(option.data[i]["HMaterID"], num) == -1) {
- num.push(option.data[i]["HMaterID"]);
- } else {
- layer.msg("绗�" + (i + 1) + "琛�,鐗╂枡:" + option.data[i]["HMaterID"] + "閲嶅!");
+ //鍙戣揣浠撳簱闈炵┖楠岃瘉
+ if (option.data[i]["HWHID"] == "0") {
+ layer.msg("绗�" + i + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
return false;
}
}
--
Gitblit v1.9.1