From 164f78cd00ef30c7ca5aad0106dbd75ddbc8381f Mon Sep 17 00:00:00 2001 From: 王 垚 <1402714037@qq.com> Date: 星期三, 03 八月 2022 17:30:42 +0800 Subject: [PATCH] 到货确认 --- WebTM/App_Data/MssqlReportData.cs | 3 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 55 +++++++++++-- WebTM/views/组装单/Sc_PCruxBindingPDA.html | 72 +++++++++--------- WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 2 WebTM/Vlog/webapi20220731.txt | 61 +++++++++++++++ WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 2 6 files changed, 145 insertions(+), 50 deletions(-) diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs index 7c22561..bfbbb2c 100644 --- a/WebTM/App_Data/MssqlReportData.cs +++ b/WebTM/App_Data/MssqlReportData.cs @@ -19,10 +19,9 @@ //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯 //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯 - //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳 + public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳 //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃 //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//闆呯惇璇烘祴璇� - public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇 //public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍑礉濂堢壒 //public string sServer; diff --git a/WebTM/Vlog/webapi20220731.txt b/WebTM/Vlog/webapi20220731.txt new file mode 100644 index 0000000..acc8676 --- /dev/null +++ b/WebTM/Vlog/webapi20220731.txt @@ -0,0 +1,61 @@ +2022/7/31 14:16:08 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠g爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿, + b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁¢噺鍗曚綅 + from Kf_ICStockBillMain a + left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID + left join Gy_Material m on b.HMaterID=m.HItemID + left join gy_unit u on m.HUnitID=u.HItemID + JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID + where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163') + +2022/7/31 14:16:08 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠g爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿, + b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁¢噺鍗曚綅 + from Kf_ICStockBillMain a + left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID + left join Gy_Material m on b.HMaterID=m.HItemID + left join gy_unit u on m.HUnitID=u.HItemID + JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID + where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163') + +2022/7/31 14:18:53 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠g爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿, + b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁¢噺鍗曚綅 + from Kf_ICStockBillMain a + left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID + left join Gy_Material m on b.HMaterID=m.HItemID + left join gy_unit u on m.HUnitID=u.HItemID + JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID + where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163') + +2022/7/31 14:18:53 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠g爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿, + b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁¢噺鍗曚綅 + from Kf_ICStockBillMain a + left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID + left join Gy_Material m on b.HMaterID=m.HItemID + left join gy_unit u on m.HUnitID=u.HItemID + JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID + where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163') + +2022/7/31 14:18:53 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022; + +2022/7/31 14:18:53 ReportDataSet:1 + +2022/7/31 14:19:14 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠g爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿, + b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁¢噺鍗曚綅 + from Kf_ICStockBillMain a + left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID + left join Gy_Material m on b.HMaterID=m.HItemID + left join gy_unit u on m.HUnitID=u.HItemID + JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID + where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163') + +2022/7/31 14:19:14 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠g爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿, + b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁¢噺鍗曚綅 + from Kf_ICStockBillMain a + left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID + left join Gy_Material m on b.HMaterID=m.HItemID + left join gy_unit u on m.HUnitID=u.HItemID + JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID + where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163') + +2022/7/31 14:19:14 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022; + +2022/7/31 14:19:14 ReportDataSet:1 diff --git "a/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html" "b/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html" index d965491..ef3335c 100644 --- "a/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html" +++ "b/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html" @@ -179,8 +179,8 @@ //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇宸ュ簭 鐢熶骇璧勬簮銆佹搷浣滃憳銆佺敓浜х彮缁勶級 new - //宸ュ簭 - + //宸ュ簭 + $("#HProcID").val(sessionStorage["HProcID"]); $("#HProc").val(sessionStorage["HProc"]); //鐢熶骇璧勬簮 @@ -315,7 +315,7 @@ } }); }) - + //鍒犻櫎 form.on('submit(cmdDelete)', function () { var checkStatus = table.checkStatus('tm-table') @@ -328,7 +328,7 @@ type: "Get", url: GetWEBURL() + "/Sc_PckSplit/Delete_PHPCruxBillListByME", async: true, - data: { "HInterID": sInterID, "HMaterID": sMaterID, "HBarCode": sBarCode}, + data: { "HInterID": sInterID, "HMaterID": sMaterID, "HBarCode": sBarCode }, dataType: "json", success: function (data) { if (data.count == 1) { @@ -351,33 +351,33 @@ var sSubStr = JSON.stringify(table.cache['pj-table']); var sSubStr1 = JSON.stringify(table.cache['tm-table']); var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ';' + sessionStorage["HUserName"]; - $.ajax( - { - type: "POST", - url: GetWEBURL() + "/Sc_PckSplit/Add_PHPCruxBillList", - async: true, - data: { "msg": sMainSub }, - dataType: "json", - success: function (data) { - if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜� - layer.msg("鎻愪氦鎴愬姛" + data.Message + $("#HBillNo").val(), { time: 1 * 1000, icon: 1 }, function () { - location.reload(); - }); - //layer.msg("鎻愪氦鎴愬姛" + data.Message + $("#HBillNo").val(), { icon: 1, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - //location.reload(); - } - else { - //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' }); - 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' }); - layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + $.ajax( + { + type: "POST", + url: GetWEBURL() + "/Sc_PckSplit/Add_PHPCruxBillList", + async: true, + data: { "msg": sMainSub }, + dataType: "json", + success: function (data) { + if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜� + layer.msg("鎻愪氦鎴愬姛" + data.Message + $("#HBillNo").val(), { time: 1 * 1000, icon: 1 }, function () { + location.reload(); + }); + //layer.msg("鎻愪氦鎴愬姛" + data.Message + $("#HBillNo").val(), { icon: 1, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + //location.reload(); } - }); + else { + //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' }); + 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' }); + layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }); }); //鐩戝惉鎻愪氦 @@ -410,7 +410,7 @@ url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxSNBillList", type: "GET", async: false, - data: { "HinterID": sInterID, "HBarCode": sBarCode, "HProcID": sProcID, "HBillNo": sBillNo}, + data: { "HinterID": sInterID, "HBarCode": sBarCode, "HProcID": sProcID, "HBillNo": sBillNo }, success: function (result) { if (result.count == 1) { option.data = result.data; @@ -426,7 +426,7 @@ $("#HPCrux").focus(); } }); - //鍏抽敭浠跺洖杞︽柟娉� + //鍏抽敭浠跺洖杞︽柟娉� $('#HPCrux').on('keydown', function (event) { var sHPCrux = $('#HPCrux').val() var sInterID = $('#HInterID').val() @@ -440,7 +440,7 @@ url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxBillList", type: "GET", async: false, - data: { "HinterID": sInterID, "HPCrux": sHPCrux, "HBillNo": sBillNo}, + data: { "HinterID": sInterID, "HPCrux": sHPCrux, "HBillNo": sBillNo }, success: function (result) { if (result.count == 1) { option1.data = result.data; @@ -507,10 +507,10 @@ option1.data = []; table1.render(option1); } - + }); - - + + </script> </body> </html> \ No newline at end of file diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" index 11d6277..685dbd4 100644 --- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" +++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" @@ -41,6 +41,7 @@ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button> <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button> <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button> + <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-event="btn-InStorage" lay-filter="btn-InStorage" id="btn-InStorage"></i>鍏ュ簱</button> </div> </div> <div class="layui-form-item" style="padding-top: 10px;"> @@ -504,6 +505,8 @@ , element = layui.element; //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓� $("#HBarCode").focus(); + //杩涘叆椤甸潰鍏ュ簱鎸夐挳缃伆 + $('#btn-InStorage').addClass("layui-btn-disabled").attr("disabled", true); /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/ /* 1.鏃犳簮鍗曟柊澧� @@ -587,8 +590,8 @@ } - - function RoadBillMain(linterid)//鍔犺浇琛ㄥご + //鍔犺浇琛ㄥご + function RoadBillMain(linterid) { var index = layer.load(); $.ajax({ @@ -817,14 +820,10 @@ if (data.count == 1) { layer.close(index); layer.msg("鎻愪氦鎴愬姛"); - - $("#HPlanQty").attr("disabled", "true"); - $("#HQty").attr("disabled", "true"); - $("#HWasterQty").attr("disabled", "true"); - $("#HWorkTimes").attr("disabled", "true"); if (result.Verify == "Y") { location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2'); - } else { + } + else { //淇濆瓨鍚庢祻瑙� ReRoadBillMain(); } @@ -837,6 +836,33 @@ error: function (err) { layer.close(index); layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }); + }); + + //鍏ュ簱 + form.on('submit(btn-InStorage)', function (data) { + var InterID = $("#HInterID").val(); + var BillNo = $("#HBillNo").val(); + $.ajax({ + type: "GET", + url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + async: true, + data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": sessionStorage["OrganizationID"] }, + dataType: "json", + success: function (data) { + if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () { + var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩 + parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽 + }); + } + else { + layer.alert(data.Message, { icon: 5 }); + } + }, + error: function (err) { + layer.alert(err.Message, { icon: 5 }); } }); }); @@ -921,9 +947,18 @@ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes'] - , resize: false - , cancel: function (index, layero) { + , btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + $("#HEmpName").val(checkStatus.data[0].HName); + $("#HEmpID").val(checkStatus.data[0].HItemID); + layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� } + , btn2: function (index, layero) { } }) }); //閫夋嫨鎿嶄綔鍛�2 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_Fast.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_Fast.html" index 7470878..268b641 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_Fast.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_Fast.html" @@ -763,7 +763,7 @@ //parent.location.href = "../../../views/index.html" //window.close();//鍏抽棴褰撳墠椤� layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) { - window.close(); + window.location.href = "http://localhost:8082/LuBaoUi/views/index_Mobile.html" }); }) 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_MateOutBill_Fast.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_MateOutBill_Fast.html" index 9e76c91..d7489ac 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_MateOutBill_Fast.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_MateOutBill_Fast.html" @@ -684,7 +684,7 @@ //parent.location.href = "../../../views/index.html" //window.close();//鍏抽棴褰撳墠椤� layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) { - window.close(); + window.history.back(); }); }) -- Gitblit v1.9.1