From 273b97ce22c6c3659493b097c384d6449359ab36 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 19 一月 2024 11:30:20 +0800
Subject: [PATCH] 销售订单列表增加行状态，进行下推销售出库单或在销售出库单选择源单的时候，只能选择单据为已审核且子表行状态为未关闭的物料、只要关闭了就不能选择； 不管是整单关闭还是 行关闭
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 9 ++++++++-
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 9 +++++++++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 8 ++++----
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index fa29bea..677ccd1 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5262,7 +5262,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>01/18/2024 14:15:08</publishTime>
+ <publishTime>01/19/2024 10:21:26</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
<publishTime>11/03/2023 21:45:51</publishTime>
@@ -5283,7 +5283,7 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>01/18/2024 14:15:08</publishTime>
+ <publishTime>01/19/2024 10:21:26</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBill_LookDown.html">
<publishTime>01/19/2024 09:43:33</publishTime>
@@ -5445,10 +5445,10 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
- <publishTime>01/18/2024 14:00:41</publishTime>
+ <publishTime>01/19/2024 11:11:04</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
- <publishTime>01/18/2024 14:00:41</publishTime>
+ <publishTime>01/19/2024 11:11:04</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
<publishTime>01/16/2024 14:21:41</publishTime>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 1687f82..dd6b5c1 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -379,6 +379,7 @@
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 125, sort: true }
, { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
, { field: '鐘舵��', title: '鐘舵��', width: 125, sort: true }
+ , { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 125, sort: true }
, { field: '鏄惁涓嬫帹鐢熶骇璁㈠崟', title: '鏄惁涓嬫帹鐢熶骇璁㈠崟', width: 125, sort: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true }
@@ -871,6 +872,12 @@
layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + data[i].鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
return;
}
+
+ if (data[i].琛岀姸鎬� == "宸插叧闂�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + data[i].鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ return;
+ }
+
if (data[i].瀹㈡埛 != HCusName) {
layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
return;
@@ -1250,7 +1257,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and HOrgID = " + HOrgID;
+ addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
}
return addSWhere;
}
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 3620506..3a7a976 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"
@@ -538,6 +538,9 @@
} else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
layer.alert("淇濆瓨澶辫触!绗�" + (i+1) + "琛岋細婧愬崟鍗曟嵁鐘舵�佹湭涓�'宸插鏍�'鐘舵��!", { icon: 5 });
return;
+ } else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
+ return;
}
} else {
return;
@@ -2346,6 +2349,12 @@
layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
return;
}
+
+ if (temp.琛岀姸鎬� == "宸插叧闂�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ return;
+ }
+
if (temp.瀹㈡埛 != HCusName) {
layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
return;
--
Gitblit v1.9.1