| WebTM/WebTM.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBill_PDA.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/WMS扫码模块/生产调拨/调拨换托/Kf_MoveStockBillList_HuanTuo_PDA.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/WMS扫码模块/生产调拨/调拨换托/Kf_MoveStockBill_HuanTuo_PDA.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/index_Mobile.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/WebTM.csproj
@@ -196,6 +196,7 @@ <Content Include="views\WMSæ«ç 模å\ç产管ç\çäº§ç»æå\Sc_PackUnionBillList_PDA.html" /> <Content Include="views\WMSæ«ç 模å\ç产管ç\çäº§ç»æå\Sc_PackUnionBill_PDA.html" /> <Content Include="views\WMSæ«ç 模å\çäº§è°æ¨\è°æ¨æ¢æ\Kf_MoveStockBill_HuanTuo_PDA.html" /> <Content Include="views\WMSæ«ç 模å\çäº§è°æ¨\è°æ¨æ¢æ\Kf_MoveStockBillList_HuanTuo_PDA.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Gy_MaterType.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\Gy_MaterTypeEdit.html" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\HBarPlanPrint_GXPG.html" /> WebTM/views/WMSɨÂëÄ£¿é/Éú²ú¹ÜÀí/Éú²ú×éÍе¥/Sc_PackUnionBill_PDA.html
@@ -452,7 +452,7 @@ } else { playSound(); layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' }); layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' }); document.getElementById("cmdLoadData").disabled = false; //æé®å为å¯ç¼è¾ç¶æ } layer.closeAll("loading"); //å ³éå è½½å± WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/µ÷²¦»»ÍÐ/Kf_MoveStockBillList_HuanTuo_PDA.html
New file @@ -0,0 +1,263 @@ <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>æ¢æè°æ¨åç¼åå表</title> <meta name="renderer" content="webkit"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <!--å¼ç¨layuiæ ·å¼æä»¶--> <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all"> <!--å¼ç¨layui jsæä»¶--> <script src="../../../../layuiadmin/layui/layui.js"></script> <script src="../../../../layuiadmin/Scripts/json2.js"></script> <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> <script src="../../../../layuiadmin/Scripts/webConfig.js"></script> </head> <body> <div class="layui-fluid"> <div class="layui-card" style="padding: 1px"> <div class="layui-card-body" style="padding: 1px;"> <form class="layui-form" action="" lay-filter="component-form-group"> <div class="layui-tab" lay-filter="tab-Kf_MoveStockBillList_HuanTuo_PDA"> <ul class="layui-tab-title" lay-filter="tab-all"> <li lay-id="1">ç¼åå表</li> </ul> <div class="layui-tab-content"> <div class="layui-tab-item layui-show"> <div class="layui-row"> <div class="layui-col-xs12"> <table class="layui-hide" id="Temp-table" lay-filter="Temp-table"></table> </div> </div> </div> </div> <div class="layui-form-item" style="margin-bottom: 20px;"> <div class="layui-row"> <div class="layui-col-xs2"> <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">ç¼è¾</button> </div> <div class="layui-col-xs2"> <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">å é¤</button> </div> <div class="layui-col-xs2"> <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">å·æ°</button> </div> <div class="layui-col-xs2"> <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">éåº</button> </div> <div class="layui-col-xs2"> <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdAdd">æ°å¢</button> </div> </div> </div> </div> </form> </div> </div> </div> <script> layui.config({ base: '../../../../layuiadmin/' //éæèµæºæå¨è·¯å¾ }).extend({ index: 'lib/index' //ä¸»å ¥å£æ¨¡å }).use(['index', 'form', 'laydate', 'table', 'element'], function () { //#region å ¬å ±åé var $ = layui.$ , admin = layui.admin , layer = layui.layer , table = layui.table , form = layui.form , element = layui.element; var HBillType = '1207' var HMaker = sessionStorage["HUserName"] var HStockOrgID = sessionStorage["OrganizationID"] var option = []; //#region åå§åçé¢ set_ClearBill(); function set_ClearBill() { element.tabChange('tab-Kf_MoveStockBillList_HuanTuo_PDA', '1'); //åå§åè¡¨æ ¼ set_InitGrid(); //读ååæ®å表 DisBillEntryList(); } //#region åå§åè¡¨æ ¼æ¹æ³ function set_InitGrid() { option = { elem: '#Temp-table' , height: 'full-50' //, page: true , cellMinWidth: 90 , limit: 50 //, limits: [50, 500, 5000, 20000] }; } //#endregion //#endregion //#region ç¼åå表çé¢ æ§ä»¶äºä»¶ //#region ç¼è¾åè½æ§ä»¶ form.on('submit(cmdModify)', function () { var checkStatus = table.checkStatus('Temp-table') , data = checkStatus.data; layer.open({ type: 2 , area: ['100%', '100%'] , title: 'æ¢æè°æ¨å' , shade: 0.6 //é®ç½©éæåº¦ , maxmin: false //å è®¸å ¨å±æå°å , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯ , content: ['../../../WMSæ«ç 模å/çäº§è°æ¨/è°æ¨æ¢æ/Kf_MoveStockBill_HuanTuo_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes'] , resize: false , cancel: function () { $(".layui-btn").removeClass("layui-btn-disabled"); } }) }); //#endregion //#region å é¤åè½æ§ä»¶ form.on('submit(cmdDelete)', function () { var checkStatus = table.checkStatus('Temp-table') , data = checkStatus.data; if (checkStatus.data.length === 1) { layer.confirm("确认è¦å é¤åï¼å é¤åå°ä¸å¯æ¢å¤ï¼", { title: "å é¤ç¡®è®¤" }, function (index) { var sInterID = data[0].HInterID; $.ajax( { type: "GET", url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json", async: true, data: { "HInterID": sInterID, "HBillType": HBillType }, dataType: "json", success: function (data) { if (data.count == 1) { layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () { DisBillEntryList(); //æ¾ç¤ºè¡¨ä½æç» //// å¾å°frameç´¢å¼ //var index = layer.getFrameIndex(window.name); ////å ³éå½åframe //layer.close(index); ////ä¿®æ¹æååå·æ°çé¢ //window.location.reload(); }); } else { layer.msg(data.Message, { icon: 2 }); } }, error: function (err) { layer.msg('é误' + err, { icon: 5, time: 20000 }, function () { }); } }); }) } else { layer.msg('è¯·éæ©ä¸è¡è®°å½ï¼è¿è¡å é¤ï¼'); } }); //#endregion //#region å·æ°åè½æ§ä»¶ form.on('submit(cmdRefresh)', function () { DisBillEntryList(); }); function DisBillEntryList() { var ajaxLoad = layer.load(); $.ajax({ type: "GET", url: GetWEBURL() + '/WEBSController/GetPonderationBillMain_TempList_HuanTuo_Json', data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID }, success: function (data1) { var col = []; if (data1.count == 1) { var data = []; //ç»ç©ºçæ°ç»èµå¼ for (var key in data1.list) { data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType }); } //夿æ¯å¦æ¯çº¯è±æ var patrn = new RegExp("[\u4E00-\u9FA5]+"); col.push({ type: 'radio' }); for (var i = 0; i < data.length; i++) { if (!patrn.test(data[i].name)) { col.push({ field: data[i].name, title: data[i].name, hide: true }); //éèå } else { switch (data[i].Type) { case 'DateTime': col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 }); break; default: col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true }); } } } option.cols = [col]; option.data = data1.data; table.render(option); layer.close(ajaxLoad); } else { layer.close(ajaxLoad); layer.alert(data1.code + data1.Message, { icon: 5 }); } }, error: function () { layer.close(ajaxLoad); layer.alert("å·æ°ç¼åå表信æ¯ï¼æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 }); } }); } //#endregion //#region éåºåè½æ§ä»¶ form.on('submit(cmdCancel)', function () { layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) { parent.location.href = "../../../../views/index_Mobile.html" }); }) //#endregion //#region æ°å¢åè½æ§ä»¶ form.on('submit(cmdAdd)', function () { layer.open({ type: 2 , area: ['100%', '100%'] , title: 'æ¢æè°æ¨å' , shade: 0.6 //é®ç½©éæåº¦ , maxmin: false //å è®¸å ¨å±æå°å , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯ , content: ['../../../WMSæ«ç 模å/çäº§è°æ¨/è°æ¨æ¢æ/Kf_MoveStockBill_HuanTuo_PDA.html?HInterID_Temp=0', 'yes'] , resize: false , cancel: function () { $(".layui-btn").removeClass("layui-btn-disabled"); } }) }); //#endregion //#endregion }); </script> </body> </html> WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/µ÷²¦»»ÍÐ/Kf_MoveStockBill_HuanTuo_PDA.html
@@ -167,6 +167,8 @@ var SourceFlag = sessionStorage["SourceFlag"]; //ææ¡ç å·²æ«æ å¿ var OperationType = 0;//æä½ç±»å var params = get_UrlVars(); var OperationType = params[params[0]]; //ä»ç¼åå表ä¸è¿åæ°æ®ç±»å 1æ°å¢ 2ä»ç¼åå表ä¸è¿å var HInterID_Temp = params[params[1]]; //ä»ç¼åå表ä¸è¿ååæ®ID var option = []; //#endregion @@ -210,38 +212,29 @@ //#endregion //#region ä»ç¼åå表ä¸è¿åä¿¡æ¯ //function getBillTemp() { // var vars = [], hash; // var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); // for (var i = 0; i < hashes.length; i++) { // hash = hashes[i].split('='); // vars.push(hash[0]); // vars[hash[0]] = hash[1]; // } // return vars; //} //var params = getBillTemp(); //var HInterID_Temp = params[params[0]]; //ä»ç¼åå表ä¸è¿ååæ®ID //var HBillNo_Temp = params[params[1]]; //ä»ç¼åå表ä¸è¿ååæ®å· //var HBarCode_Pack_Temp = params[params[2]]; //ä»ç¼åå表ä¸è¿åææ¡ç //#endregion //夿æ¯å¦æ°å¢ if (typeof (params[params[0]]) == "undefined") { var OperationType = 0; //ç´æ¥æ°å¢ } else { var OperationType = 1; //ç¼åä¸æå¼ if (HInterID != 0) { SourceFlag = true; } if (OperationType == 0 && HInterID == 0) { //ä»ç¼åå表ç¼è¾åè½è·³è½¬è³åæ®æ¨¡å else if (OperationType == 2) { RoadBillMain(HInterID_Temp); $("#HBarCode").select(); $("#HBarCode").focus(); //è·åå æ $('#cmdHBarCode_Pack_In').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨ //document.getElementById("cmdHBarCode_Pack_In").disabled = true; //æé®å为ä¸å¯ç¼è¾ç¶æ element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '1'); //æ¾ç¤ºè¡¨ä½æç» DisBillEntryList(); SourceFlag = true; } else { OperationType = 1; //è·åæå¤§åæ®IDãåæ®å· $.ajax({ type: "GET", url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json", async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ± data: { "HBillType": HBillType }, success: function (d) { if (d.count == 1) { @@ -257,70 +250,35 @@ }); SourceFlag = false; } else if (OperationType == 0 && HInterID != 0) { SourceFlag = true; } //ä»ç¼åå表ç¼è¾åè½è·³è½¬è³åæ®æ¨¡å else if (HInterID == 0) { $("#HBarCode_Pack_In").val(params[params[0]]); $("#HBarCode_Pack_In").attr("readonly", "readonly"); $("#HPackUnionInterID_In").val(params[params[0]]); $("#HWHName").val(params[params[0]]); $("#HWHID").val(params[params[0]]); $("#HSPName").val(params[params[0]]); $("#HSPID").val(params[params[0]]); $("#HBarCode").select(); $("#HBarCode").focus(); //è·åå æ document.getElementById("cmdHBarCode_Pack_In").disabled = true; //æé®å为ä¸å¯ç¼è¾ç¶æ element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '1'); //æ¾ç¤ºè¡¨ä½æç» DisBillEntryList(); SourceFlag = true; } else { SourceFlag = true; } //if (HInterID_Temp == null || HInterID_Temp == 0) { // //è·åæå¤§åæ®IDãåæ®å· // $.ajax({ // type: "GET", // url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json", // data: { "HBillType": HBillType }, // success: function (d) { // if (d.count == 1) { // $("#HInterID").val(d.data[0].HInterID); // $("#HBillNo").val(d.data[0].HBillNo); // HInterID = $('#HInterID').val() // HBillNo = $('#HBillNo').val() // } // else { // layer.msg(d.Message, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' }); // } // } // }); // SourceFlag = false; //} ////ä»ç¼åå表ç¼è¾åè½è·³è½¬è³åæ®æ¨¡å //else { // var HInterID_Temp = params[params[0]]; //ä»ç¼åå表ä¸è¿ååæ®ID // var HBillNo_Temp = params[params[1]]; //ä»ç¼åå表ä¸è¿ååæ®å· // var HBarCode_Pack_Temp = params[params[2]]; //ä»ç¼åå表ä¸è¿åææ¡ç // $('#HInterID').val(HInterID_Temp) // $('#HBillNo').val(HBillNo_Temp) // $('#HBarCode_Pack_In').val(HBarCode_Pack_Temp) // $("#HBarCode_Pack_In").attr("readonly", "readonly"); // HInterID = $('#HInterID').val() // HBillNo = $('#HBillNo').val() // HBarCode_Pack_In = $('#HBarCode_Pack_In').val() // $("#HBarCode").focus(); // element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '1'); // //æ¾ç¤ºè¡¨ä½æç» // DisBillEntryList(); // SourceFlag = true; //} //ç¼åå表ä¸è¿å 页é¢èµå¼ function RoadBillMain(HInterID_Temp) { $.ajax({ type: "GET", url: GetWEBURL() + '/WEBSController/GetKF_MoveStockBill_TempList_HuanTuo_Json', async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ± data: { "HInterID": HInterID_Temp, "HBillType": HBillType }, success: function (d) { $("#HInterID").val(d.data[0].HInterID); $("#HBillNo").val(d.data[0].HBillNo); $("#HBarCode_Pack_In").val(d.data[0].HBarCode_Pack_In); $("#HBarCode_Pack_In").attr("readonly", "readonly"); $("#HPackUnionInterID_In").val(d.data[0].HPackUnionInterID_In); $("#HWHName").val(d.data[0].HWhName); $("#HWHID").val(d.data[0].HWhID); $("#HSPName").val(d.data[0].HSPName); $("#HSPID").val(d.data[0].HStockPlaceID); //å ¨å±åéèµå¼ HInterID = $('#HInterID').val() HBillNo = $('#HBillNo').val() HBarCode_Pack_In = $('#HBarCode_Pack_In').val() //è°å ¥ææ¡ç HPackUnionInterID_In = $('#HPackUnionInterID_In').val() //è°å ¥ç»æåå ç HWhID = $('#HWHID').val() //è°å ¥ä»åº HSPID = $('#HSPID').val() //è°å ¥ä»ä½ } }) } //失败æç¤ºé³ function playSound() { @@ -365,6 +323,7 @@ $.ajax({ type: "GET", url: GetWEBURL() + "/WEBSController/Get_BarCodePack_In_MoveStockBill_HuanTuo_Json", async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ± data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack_In, "HStockOrgID": HStockOrgID }, success: function (result) { if (result.count == 1) { @@ -382,7 +341,7 @@ //document.getElementById("cmdHBarCode_Pack_In").disabled = true; //æé®å为ä¸å¯ç¼è¾ç¶æ element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '2'); //å ¨å±åéèµå¼ HBarCode_Pack_In = $('#HBarCode_Pack_In').val() //è°å ¥ææ¡ç HBarCode_Pack_In = $('#HBarCode_Pack_In').val() //è°å ¥ææ¡ç HPackUnionInterID_In = $('#HPackUnionInterID_In').val() //è°å ¥ç»æåå ç HWhID = $('#HWHID').val() //è°å ¥ä»åº HSPID = $('#HSPID').val() //è°å ¥ä»ä½ @@ -437,7 +396,7 @@ $.ajax({ type: "GET", url: GetWEBURL() + "/WEBSController/set_DelPackUnionBill_Temp_MoveStockBill_HuanTuo_Json", async: true, async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ± data: { "HInterID": HInterID, "HBarCode": sBarCode, "HBillType": HBillType }, dataType: "json", success: function (data) { @@ -481,9 +440,8 @@ $.ajax({ type: "GET", url: GetWEBURL() + "/WEBSController/Get_BarCode_MoveStockBill_HuanTuo_Json", data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HBarCode": sBarCode, "HBarCode_Pack": HBarCode_Pack_In, "HPackUnionInterID_In": HPackUnionInterID_In, "HWhID": HWhID, "HSPID": HSPID, "HMaker": HMaker, "HStockOrgID": HStockOrgID }, async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ± data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HBarCode": sBarCode, "HBarCode_Pack": HBarCode_Pack_In, "HPackUnionInterID_In": HPackUnionInterID_In, "HWhID": HWhID, "HSPID": HSPID, "HMaker": HMaker, "HStockOrgID": HStockOrgID }, success: function (result) { if (result.count == 1) { playSound_OK(); @@ -514,6 +472,7 @@ $.ajax({ type: "GET", url: GetWEBURL() + '/WEBSController/GetBillEntry_Temp_MoveStockBill_HuanTuo_Json', async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ± data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID }, success: function (data1) { var col = []; @@ -580,14 +539,16 @@ parent.location.href = "../../../../views/index_Mobile.html" }//å ³é }, function () { HInterID_Temp = 0; window.location.reload(); //å·æ°å½åé¡µé¢ //HInterID = 0; //HInterID_Temp = 0; //window.location.reload(); //å·æ°å½åé¡µé¢ location.replace('Kf_MoveStockBill_HuanTuo_PDA.html?OperationType=1&HInterID=0'); });//æ°å¢ layer.load(3); } else { playSound(); layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' }); layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' }); document.getElementById("cmdLoadData").disabled = false; //æé®å为å¯ç¼è¾ç¶æ } layer.closeAll("loading"); //å ³éå è½½å± WebTM/views/index_Mobile.html
@@ -583,6 +583,12 @@ çäº§ç»æåç¼åå表 </a> </dd> <dd> <a lay-href="WMSæ«ç 模å/çäº§è°æ¨/è°æ¨æ¢æ/Kf_MoveStockBillList_HuanTuo_PDA.html" style="color: aqua;"> <img src="../layuiadmin/myicon/åæ®å½å¶.svg" alt="åæ®å½å¶" style="width:25px;height:25px;margin-right: 5px;" /> æ¢æè°æ¨åç¼åå表 </a> </dd> <!--<dd> <a lay-href="" style="color: aqua;"> <img src="../layuiadmin/myicon/åæ®å½å¶.svg" alt="åæ®å½å¶" style="width:25px;height:25px;margin-right: 5px;" />