From 99a2bc560a8c0d859bcb74796b56f27f3fdc183f Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 18 七月 2024 09:24:45 +0800
Subject: [PATCH] 采购订单等页面bug修复
---
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 4 +-
WebTM/Vlog/webapi20240718.txt | 35 +++++++++++++++++
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 4 +-
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 2
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 26 ++++++------
WebTM/layuiadmin/Scripts/webConfig.js | 6 +-
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 4 +-
7 files changed, 58 insertions(+), 23 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 61f98ff..ad542e6 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -18,10 +18,10 @@
<publishTime>01/28/2016 14:22:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>07/17/2024 19:44:45</publishTime>
+ <publishTime>07/18/2024 07:54:46</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>07/17/2024 19:44:45</publishTime>
+ <publishTime>07/18/2024 07:54:46</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>04/15/2024 13:00:47</publishTime>
@@ -732,7 +732,7 @@
<publishTime>04/15/2024 13:00:47</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>07/16/2024 16:46:13</publishTime>
+ <publishTime>07/18/2024 07:49:08</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig2.js">
<publishTime>07/11/2024 15:00:06</publishTime>
@@ -5046,7 +5046,7 @@
<publishTime>04/15/2024 13:00:48</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_MaterialTechParamBillMain.html">
- <publishTime>07/17/2024 13:14:17</publishTime>
+ <publishTime>07/17/2024 20:30:21</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_MaterialTechParamBillMainList.html">
<publishTime>07/12/2024 09:54:49</publishTime>
@@ -5259,7 +5259,7 @@
<publishTime>07/09/2024 16:31:47</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html">
- <publishTime>07/17/2024 13:14:17</publishTime>
+ <publishTime>07/17/2024 20:30:21</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillList.html">
<publishTime>06/21/2024 16:12:46</publishTime>
@@ -5958,7 +5958,7 @@
<publishTime>07/16/2024 16:45:59</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
- <publishTime>07/17/2024 13:14:17</publishTime>
+ <publishTime>07/17/2024 20:30:21</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList_LookDown.html">
<publishTime>04/15/2024 13:00:49</publishTime>
@@ -6276,7 +6276,7 @@
<publishTime>07/09/2024 16:31:47</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html">
- <publishTime>07/17/2024 16:42:07</publishTime>
+ <publishTime>07/17/2024 21:17:37</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">
<publishTime>07/17/2024 10:28:57</publishTime>
@@ -6327,7 +6327,7 @@
<publishTime>07/03/2024 08:54:13</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillEdit.html">
- <publishTime>07/17/2024 19:40:08</publishTime>
+ <publishTime>07/17/2024 21:12:48</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
<publishTime>07/17/2024 15:24:16</publishTime>
@@ -6756,10 +6756,10 @@
<publishTime>04/15/2024 13:00:49</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
- <publishTime>07/17/2024 16:58:29</publishTime>
+ <publishTime>07/17/2024 21:21:15</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
- <publishTime>07/17/2024 16:58:29</publishTime>
+ <publishTime>07/17/2024 21:21:15</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
<publishTime>07/16/2024 14:06:24</publishTime>
@@ -6825,7 +6825,7 @@
<publishTime>04/15/2024 13:00:49</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutRequestBillList.html">
- <publishTime>07/09/2024 16:31:47</publishTime>
+ <publishTime>07/17/2024 20:30:21</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBill.html">
<publishTime>04/15/2024 13:00:49</publishTime>
@@ -6897,7 +6897,7 @@
<publishTime>03/07/2024 09:59:11</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html">
- <publishTime>07/17/2024 16:42:19</publishTime>
+ <publishTime>07/17/2024 21:18:45</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html">
<publishTime>04/15/2024 13:00:49</publishTime>
@@ -6954,7 +6954,7 @@
<publishTime>06/06/2024 13:46:09</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/17/2024 19:44:57</publishTime>
+ <publishTime>07/18/2024 07:56:16</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/Vlog/webapi20240718.txt b/WebTM/Vlog/webapi20240718.txt
new file mode 100644
index 0000000..b886e72
--- /dev/null
+++ b/WebTM/Vlog/webapi20240718.txt
@@ -0,0 +1,35 @@
+2024/7/18 8:15:23 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000321717 order by hmainid desc
+
+2024/7/18 8:15:24 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/18 8:15:24 ReportDataSet:1
+
+2024/7/18 8:16:23 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000321717 order by hmainid desc
+
+2024/7/18 8:16:23 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/18 8:16:23 ReportDataSet:1
+
+2024/7/18 8:16:28 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000321717 order by hmainid desc
+
+2024/7/18 8:16:28 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/18 8:16:28 ReportDataSet:1
+
+2024/7/18 8:18:07 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000321717 order by hmainid desc
+
+2024/7/18 8:18:07 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/18 8:18:07 ReportDataSet:1
+
+2024/7/18 8:27:42 鎵撳嵃sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13746323
+
+2024/7/18 8:27:42 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/18 8:27:42 ReportDataSet:3
+
+2024/7/18 8:45:19 鎵撳嵃sql:select * from h_v_Kf_POStockInBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(1374825300100823) order by hmainid desc
+
+2024/7/18 8:45:19 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/18 8:45:19 ReportDataSet:1
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index dffa025..2e826da 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,13 +3,13 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ /*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ /*var WEBURL = "http://localhost:8082/API/"; *//*//寮犵憺骞挎湰鍦伴厤缃�*/
// var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index e4579ae..5c2d9af 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -1203,8 +1203,8 @@
//瀹炲彂鏁伴噺鏍煎紡鏍￠獙
temp = option.data[i]["HQty"] + "";
if (temp == "0") {
- //layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
- //return false;
+ layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+ return false;
} else if (!ref.test(temp)) {
layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
return false;
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 6706135..61f261b 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -1035,7 +1035,7 @@
}
var rowData = option.data[i]; //option.data[i]鍏冪礌鏄竴涓湁鏁堢殑瀵硅薄灏嗗叾璧嬪�肩粰rowData鍙橀噺
for (var col of Object.keys(rowData)) { //閬嶅巻rowData瀵硅薄鐨勬墍鏈夐敭 Object.keys(rowData)杩斿洖涓�涓寘鍚玶owData鎵�鏈夎嚜韬睘鎬ч敭鐨勬暟缁�
- if (rowData[col] == "0" && col != "LAY_TABLE_INDEX" && col != "HTaxRate" && col != "HPrice" && col != "HWHID" && col != "HMoney" && col != "HTaxPrice") { //妫�鏌ュ綋鍓嶅睘鎬х殑鍊兼槸鍚︾瓑浜�"0"锛屽苟涓斿睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"
+ if (rowData[col] == "0" && (col == "HQty" || col =="HMaterID")) { //妫�鏌ュ綋鍓嶅睘鎬х殑鍊兼槸鍚︾瓑浜�"0"锛屽苟涓斿睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"
layer.msg("绗�" + (i + 1) + "琛岋細" + col + "涓嶈兘涓�0锛�"); //鎻愮ず绗嚑琛屼笉鑳戒负0 濡傛灉鎵惧埌鍊间负"0"鐨勫睘鎬э紝骞朵笖璇ュ睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"锛屽垯閫氳繃layer.msg鏄剧ず涓�涓鍛婃秷鎭紝鎸囧嚭鍝釜琛屽拰鍝釜鍒楃殑鍊间笉鑳戒负0
return;
}
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 a9d6ede..48d9eac 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"
@@ -2193,8 +2193,8 @@
//瀹炲彂鏁伴噺鏍煎紡鏍￠獙
temp = option.data[i]["HQty"] + "";
if (temp == "0") {
- //layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺涓嶈兘涓�0锛�");
- //return false;
+ layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺涓嶈兘涓�0锛�");
+ return false;
} else if (!ref.test(temp)) {
layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
return false;
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index f2cc0c6..7298f25 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -2168,8 +2168,8 @@
//瀹炲彂鏁伴噺鏍煎紡鏍￠獙
temp = option.data[i]["HQty"] + "";
if (temp == "0") {
- //layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
- //return false;
+ layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+ return false;
} else if (!ref.test(temp)) {
layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
return false;
--
Gitblit v1.9.1