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

yangle

2022-07-11 cc60441578ce0c1fcb4a344a11c2e8616a9b13ec

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

@@ -495,7 +495,7 @@
                $("#HInterID").val("");
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                    type: "GET",
                    data: { "HBillType": '1207' },
                    success: function (d) {
@@ -870,7 +870,7 @@
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                    layer.confirm("生成调拨单" + data.Message + $("#HBillNo").val(), {
                                    layer.confirm(data.Message , {
                                        icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                                        btn2: function () {
                                            //parent.layui.admin.events.closeThisTabs();关闭页签
@@ -1066,12 +1066,13 @@
                                        elem: '#wl-table'
                                        , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
                                        , toolbar: '#toolbarDemo'
                                        , totalRow: true
                                        , defaultToolbar: []
                                        , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
                                        , cols: [[
                                            { type: 'radio' }
                                            , { field: 'HQty', title: '数量', width: 150 }
                                            , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                            , { field: 'HQty', title: '数量', width: 150, totalRow: true}
                                            , { field: 'HQtyMust', title: '应收数量', width: 150, totalRow: true}
                                            , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                            , { field: 'HMaterName', title: '物料名称', width: 150 }
                                            , { field: 'HMaterModel', title: '规格型号', width: 150 }
@@ -1259,12 +1260,13 @@
                                elem: '#wl-table'
                                , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
                                , toolbar: '#toolbarDemo'
                                , totalRow: true
                                , defaultToolbar: []
                                , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
                                , cols: [[
                                    { type: 'radio' }
                                    , { field: 'HQty', title: '数量', width: 150 }
                                    , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                    , { field: 'HQty', title: '数量', width: 150, totalRow: true }
                                    , { field: 'HQtyMust', title: '应收数量', width: 150, totalRow: true}
                                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                    , { field: 'HMaterName', title: '物料名称', width: 150 }
                                    , { field: 'HMaterModel', title: '规格型号', width: 150 }