Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

yangle

2023-04-24 a9ed06456324641db44df7bd96a276e7d2c98eca

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html

@@ -463,7 +463,7 @@
            var params = getUrlVars();
            var linterid = params[params[0]]; //从参数中获取 å•æ®å†…码
            var HSourceBillType = params[params[1]]; //用于判断源单类型
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•ç±»åž‹
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•ç±»åž‹           

            //判断是否新增
            if (linterid == null || linterid == 0) {
@@ -524,6 +524,13 @@
                $("#HBillType").val(1242);
            } else {
                $("#HBillType").val(-1);
            }
          
             //直接调拨  æ‰«è°ƒå‡ºä»“库--调入仓库--条码
            if ($("#HBillType").val() == -1) {
                element.tabChange('tab-MoveStockBill', '2');

                $("#HSCWHNAME").focus();//调出仓库
            }

            function RoadBillMain(linterid)//加载表头
@@ -640,7 +647,9 @@
                table.render({
                    elem: '#wl-table'
                    , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
                    , toolbar: '#toolbarDemo'
                    //, toolbar: '#toolbarDemo'
                    , page: true
                    , limit: 100
                    , defaultToolbar: []
                    , where: { HBillID: linterid, HBillType: '1207', sWhere: '' }
                    , cols: [[
@@ -986,7 +995,9 @@
                                    elem: '#wl-table'
                                    , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
                                    , cellMinWidth: 80
                                    , toolbar: '#toolbarDemo'
                                    //, toolbar: '#toolbarDemo'
                                    , page: true
                                    , limit: 100
                                    , defaultToolbar: []
                                    , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
                                    , cols: [[
@@ -1153,10 +1164,10 @@
                            }
                            layer.load(3);

                            if (HSourceBillType == 1402 || HSourceBillType == 1214) { //发货通知单||生产发料通知单
                            if (HSourceBillType == 1402 || HSourceBillType == 1214 || HSourceBillType == 1242) { //发货通知单||生产发料通知单
                                element.tabChange('tab-MoveStockBill', '2');
                                //扫源单成功后，光标显示到条码上
                                $("#HWHNAME").focus();
                                //扫源单成功后，光标显示到调出仓库上
                                $("#HSCWHNAME").focus();
                            } 
                          
                            $.ajax({
@@ -1442,7 +1453,7 @@
                }
            });

            //扫仓库
            //扫调入仓库
            $('#HWHNAME').on('keydown', function (event) {
                var HBarCode = $('#HWHNAME').val()
                if (event.keyCode == 13) {
@@ -1462,10 +1473,12 @@
                                $("#HWHID").val(result.data[0].HItemID);
                                $("#HWHNAME").val(result.data[0].HName);
                                //element.tabChange('tab-POStockInBill', '2');
                                //扫调入仓库成功后，光标显示到条码上
                                $("#HBarCode").focus();
                                if (HSourceBillType == 1402 || HSourceBillType == 1214) { //发货通知单||生产发料通知单
                                    element.tabChange('tab-MoveStockBill', '2');
                                    //扫源单成功后，光标显示到条码上
                                    $("#HWHNAME").focus();
                                    //扫调入仓库成功后，光标显示到条码上
                                    $("#HBarCode").focus();
                                } 
                            }
                            else {
@@ -1500,11 +1513,13 @@
                                $("#HSCWHID").val(result.data[0].HItemID);
                                $("#HSCWHNAME").val(result.data[0].HName);
                                //element.tabChange('tab-POStockInBill', '2');
                                //扫调出仓库成功后，光标显示到调入仓库上
                                $("#HWHNAME").focus();
                                if (HSourceBillType == 1402 || HSourceBillType == 1214) { //发货通知单||生产发料通知单
                                    element.tabChange('tab-MoveStockBill', '2');
                                    //扫源单成功后，光标显示到条码上
                                    $("#HSCWHNAME").focus();
                                } 
                                    //扫调出仓库成功后，光标显示到调入仓库上
                                    $("#HWHNAME").focus();
                                }                                
                            }
                            else {
                                // $("#verifycode").click();
@@ -1602,6 +1617,7 @@
                    , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
                ]]
                , page: true
                , limit: 100
                , height: 500
                , done: function () {
                }