From 5f7870fca094b4bee99e4a8408fc720645ac18db Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期一, 19 七月 2021 08:56:40 +0800 Subject: [PATCH] 委外领料扫码 --- WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html | 198 ++++++++++++++++++++++++------------------------- WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 26 +++--- WebTM/layuiadmin/Scripts/webConfig.js | 4 WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 2 4 files changed, 114 insertions(+), 116 deletions(-) diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user index 204e860..f5d1ccb 100644 --- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user +++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user @@ -15,10 +15,10 @@ <publishTime>05/10/2021 09:25:59</publishTime> </File> <File Include="bin/WebTM.dll"> - <publishTime>07/15/2021 15:22:36</publishTime> + <publishTime>07/15/2021 21:28:20</publishTime> </File> <File Include="bin/WebTM.pdb"> - <publishTime>07/15/2021 15:22:36</publishTime> + <publishTime>07/15/2021 21:28:20</publishTime> </File> <File Include="layuiadmin/config.js"> <publishTime>05/10/2021 09:25:59</publishTime> @@ -630,7 +630,7 @@ <publishTime>05/10/2021 09:25:59</publishTime> </File> <File Include="layuiadmin/Scripts/webConfig.js"> - <publishTime>07/14/2021 16:00:40</publishTime> + <publishTime>07/15/2021 21:28:19</publishTime> </File> <File Include="layuiadmin/style/admin.css"> <publishTime>05/10/2021 09:25:59</publishTime> @@ -1065,10 +1065,10 @@ <publishTime>07/14/2021 10:12:32</publishTime> </File> <File Include="views/index.html"> - <publishTime>07/14/2021 20:10:46</publishTime> + <publishTime>07/15/2021 20:50:03</publishTime> </File> <File Include="views/index_Mobile.html"> - <publishTime>07/14/2021 10:12:32</publishTime> + <publishTime>07/15/2021 21:18:20</publishTime> </File> <File Include="views/IpadIndex.html"> <publishTime>07/14/2021 10:12:32</publishTime> @@ -1560,7 +1560,7 @@ <publishTime>07/14/2021 10:12:32</publishTime> </File> <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html"> - <publishTime>07/14/2021 21:30:44</publishTime> + <publishTime>07/14/2021 10:12:32</publishTime> </File> <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapOutBillList.html"> <publishTime>07/14/2021 10:12:32</publishTime> @@ -1581,7 +1581,7 @@ <publishTime>07/02/2021 08:44:26</publishTime> </File> <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html"> - <publishTime>07/14/2021 21:06:33</publishTime> + <publishTime>07/15/2021 20:50:03</publishTime> </File> <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill_PDA.html"> <publishTime>07/02/2021 08:44:26</publishTime> @@ -1662,7 +1662,7 @@ <publishTime>07/14/2021 10:12:32</publishTime> </File> <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html"> - <publishTime>07/14/2021 21:30:44</publishTime> + <publishTime>07/14/2021 10:12:32</publishTime> </File> <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapOutBillList.html"> <publishTime>07/14/2021 10:12:32</publishTime> @@ -1683,7 +1683,7 @@ <publishTime>07/02/2021 08:44:26</publishTime> </File> <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html"> - <publishTime>07/14/2021 21:06:33</publishTime> + <publishTime>07/15/2021 20:50:03</publishTime> </File> <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html"> <publishTime>07/02/2021 08:44:26</publishTime> @@ -2292,7 +2292,7 @@ <publishTime>05/10/2021 09:25:59</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html"> - <publishTime>05/10/2021 09:25:59</publishTime> + <publishTime>07/15/2021 21:24:18</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html"> <publishTime>05/10/2021 09:25:59</publishTime> @@ -2367,7 +2367,7 @@ <publishTime>05/10/2021 09:25:59</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html"> - <publishTime>07/15/2021 17:48:37</publishTime> + <publishTime>07/15/2021 20:49:39</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html"> <publishTime>05/10/2021 09:25:59</publishTime> @@ -2406,13 +2406,13 @@ <publishTime>05/10/2021 09:25:59</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html"> - <publishTime>07/15/2021 17:49:46</publishTime> + <publishTime>07/16/2021 16:58:55</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html"> <publishTime>05/10/2021 09:25:59</publishTime> </File> <File Include="Web.config"> - <publishTime>07/15/2021 15:22:44</publishTime> + <publishTime>07/15/2021 21:28:24</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js index 7980c71..e8bcf45 100644 --- a/WebTM/layuiadmin/Scripts/webConfig.js +++ b/WebTM/layuiadmin/Scripts/webConfig.js @@ -1,7 +1,7 @@ 锘縡unction GetWEBURL() { //var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒 //var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴 - var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴 + //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴 //var WEBURL = "http://192.168.2.21:8081/lubaoWebAPI/";//鐜嬫案娉㈡湰鍦伴厤缃紝璇峰嬁鏇存敼 //var WEBURL = "http://101.37.171.70/API/"; //鍏徃鏈嶅姟鍣� //var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃� @@ -10,7 +10,7 @@ //var WEBURL = "http://10.1.4.154/API/"; //姹熶赴瀹㈡埛 //var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW //var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣� - //var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣� + var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣� return WEBURL } diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" index 2b3aeaa..d259456 100644 --- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" +++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" @@ -198,7 +198,7 @@ <script src="../../../layuiadmin/Scripts/json2.js"></script> <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> <script src="../../../layuiadmin/Scripts/webConfig.js"></script> - <script src="../../../layuiadmin/timeFormat/timeFormat.js"></script> + <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script> <script> layui.config({ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" index 8ee4a88..417e6a9 100644 --- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" +++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" @@ -236,7 +236,7 @@ <script src="../../../layuiadmin/Scripts/json2.js"></script> <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> <script src="../../../layuiadmin/Scripts/webConfig.js"></script> - <script src="../../../layuiadmin/timeFormat/timeFormat.js"></script> + <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script> <script> layui.config({ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� @@ -244,11 +244,11 @@ index: 'lib/index' //涓诲叆鍙fā鍧� }).use(['index', 'form', 'laydate', 'table', 'element'], function () { var $ = layui.$ - , admin = layui.admin - , layer = layui.layer - , table = layui.table - , form = layui.form - , element = layui.element; + , admin = layui.admin + , layer = layui.layer + , table = layui.table + , form = layui.form + , element = layui.element; var RZ = ""; var Flag = sessionStorage["SourceFlag"]; @@ -289,10 +289,9 @@ var params = getUrlVars(); var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜 var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷 - + //鍔犺浇琛ㄥご - function RoadBillMain(linterid) - { + function RoadBillMain(linterid) { $.ajax({ url: GetWEBURL() + "/Web/GetPonderationBill", type: "GET", @@ -314,8 +313,7 @@ } //鍔犺浇琛ㄤ綋 - function RoadBillSub(linterid) - { + function RoadBillSub(linterid) { table.render({ elem: '#wl-table' , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json' @@ -323,15 +321,15 @@ , where: { HBillID: linterid, HBillType: '1210', sWhere: '' } , cols: [[ { type: 'radio' } - , { field: 'HQty', title: '鏁伴噺', width: 150 } - , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 } - , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 } - , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 } - , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 } - , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 } - , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 } - , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 } - , { field: 'HBatchNo', title: '鎵规', width: 150 } + , { field: 'HQty', title: '鏁伴噺', width: 150 } + , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 } + , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 } + , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 } + , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 } + , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 } + , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 } + , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 } + , { field: 'HBatchNo', title: '鎵规', width: 150 } ]] , height: 500 , done: function () { @@ -339,21 +337,21 @@ } }); } - + //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new - - - + + + //鍒ゆ柇鏄惁鏂板 if (linterid == null || linterid == 0) { //鑾峰彇鏈�澶у崟鎹彿 new $("#HInterID").val(""); - $("#HBillNo").val(""); - $.ajax({ + $("#HBillNo").val(""); + $.ajax({ url: GetWEBURL() + "/Web/GetMAXNum", type: "GET", data: { "HBillType": '1210' }, @@ -514,40 +512,40 @@ { layer.load(3); $.ajax( - { - type: "POST", - //url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/set_SaveEntrustInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� - //url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_Json", - url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json", - async: true, - data: { "oMain": sMainStr }, - dataType: "json", - success: function (data) { - if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜� - layer.confirm("鐢熸垚濮斿鍏ュ簱鍗�" + data.Message + $("#HBillNo").val(), { - icon: 1, - skin: 'layui-layer-lan', - closeBtn: 0, - btn: ['鏂板'], - btn2: function () { - //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电 - //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥 - parent.location.href = "../../../views/index.html" - }//鍏抽棴 + { + type: "POST", + //url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/set_SaveEntrustInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + //url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_Json", + url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json", + async: true, + data: { "oMain": sMainStr }, + dataType: "json", + success: function (data) { + if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜� + layer.confirm("鐢熸垚濮斿鍏ュ簱鍗�" + data.Message + $("#HBillNo").val(), { + icon: 1, + skin: 'layui-layer-lan', + closeBtn: 0, + btn: ['鏂板'], + btn2: function () { + //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电 + //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥 + parent.location.href = "../../../views/index.html" + }//鍏抽棴 + } + , function () { window.location.reload(); }//鏂板 + ); } - , function () { window.location.reload(); }//鏂板 - ); + else { + layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + layer.closeAll("loading"); + layui.form.render(); + }, + error: function (err) { + layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); } - else { - layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - } - layer.closeAll("loading"); - layui.form.render(); - }, - error: function (err) { - layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - } - }); + }); return false; } }); @@ -564,7 +562,7 @@ }); //鎵潯鐮� - $('#HBarCode').on('keydown', function (event) { + $('#HBarCode').on('keydown', function (event) { var sSubStr = table.cache['wl-table']; var sBarCode = $('#HBarCode').val() var sInterID = $("#HInterID").val() @@ -700,13 +698,13 @@ //$("#HDeptName").val(result.data.HDeptName); layer.load(3) table.render({ - elem: '#wl-table' - , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json' - , toolbar: '#toolbarDemo' - , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' } - , cellMinWidth: 90 - , cols: [[ - { type: 'radio' } + elem: '#wl-table' + , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json' + , toolbar: '#toolbarDemo' + , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' } + , cellMinWidth: 90 + , cols: [[ + { type: 'radio' } , { field: 'HQty', title: '鏁伴噺', width: 150 } , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 } , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 } @@ -716,11 +714,11 @@ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 } , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 } , { field: 'HBatchNo', title: '鎵规', width: 150 } - ]] - , height: 500 - , done: function () { - layer.closeAll("loading"); - } + ]] + , height: 500 + , done: function () { + layer.closeAll("loading"); + } }); } else { @@ -744,7 +742,7 @@ }); //鎵簮鍗曟柟娉� - $('#HSourceBillNo').on('keydown', function (event) { + $('#HSourceBillNo').on('keydown', function (event) { var HSourceBillNo = $('#HSourceBillNo').val() var sInterID = $("#HInterID").val() var sBillNo = $("#HBillNo").val() @@ -768,27 +766,27 @@ table.render({ elem: '#wl-table' //, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json' - , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json' - , toolbar: '#toolbarDemo' - , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' } - , cols: [[ - { type: 'radio' } - , { field: 'HQty', title: '鏁伴噺', width: 150 } - , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 } - , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 } - , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 } - , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 } - , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 } - , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 } - , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 } - , { field: 'HBatchNo', title: '鎵规', width: 150 } - ]] + , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json' + , toolbar: '#toolbarDemo' + , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' } + , cols: [[ + { type: 'radio' } + , { field: 'HQty', title: '鏁伴噺', width: 150 } + , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 } + , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 } + , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 } + , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 } + , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 } + , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 } + , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 } + , { field: 'HBatchNo', title: '鎵规', width: 150 } + ]] // , data: [linterid] // , page: true - , height: 500 - , done: function () { - layer.closeAll("loading"); - } + , height: 500 + , done: function () { + layer.closeAll("loading"); + } }); } else { @@ -804,7 +802,7 @@ }); //鎵粨浣� - $('#HStockPlaceName').on('keydown', function (event) { + $('#HStockPlaceName').on('keydown', function (event) { var HBarCode = $('#HStockPlaceName').val() if (event.keyCode == 13) { //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new @@ -833,13 +831,13 @@ // , url: 'http://localhost:8083/Kf_EntrustInBill/GetHBarCodeShowBillSub' //, toolbar: '#toolbarDemo' // , where: { sMsg: linterid, sMsg2: lentryid } - , cols: [[ - , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true } - ]] - , page: true - , height: 500 - , done: function () { - } + , cols: [[ + , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true } + ]] + , page: true + , height: 500 + , done: function () { + } }); //鎵玀ES浠撲綅 @@ -882,7 +880,7 @@ } }); - //浠ヤ笂涓簂ayui妯″潡 + //浠ヤ笂涓簂ayui妯″潡 }); //娓呯┖琛ㄥご //function f_ClearTitle() { -- Gitblit v1.9.1