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

zgq

2021-08-11 6fd6b4d8399cd5ce53b20ba2b865e7cee0f4cc9d

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

 WebTM/views/PublicPage/CustomerInformation.html

@@ -87,7 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = " where HStopFlag=0  and HUSEORGID = " + sessionStorage["OrganizationID"]+" ";
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treeCustomer',
@@ -157,7 +158,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/CustomerList',
                type: "GET",
                data: { "sWhere": SeachFilter(sWhere) },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -179,7 +180,7 @@
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/CustomerList',
                    type: "GET",
                    data: { "sWhere": SeachFilter(sWhere) },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -192,7 +193,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
                sWhere1 = "";//调用接口后清空sWhere缓存
            });

            //以上是layui模块
@@ -205,7 +206,7 @@
            $.ajax({
                url: GetWEBURL() + '/Gy_MaintenanceMode/CustomerLoadTree',
                type: "GET",
                data: { "sWhere": SeachFilter(sWhere) },
                data: { "sWhere": sWhere },
                async: false,
                success: function (result) {
                    var data = result.data;
@@ -236,16 +237,16 @@
            return treeData;
        }

        function SeachFilter(sWhere) {
        function SeachFilter(sWhere1) {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere += " and HNumber like '%" + HNumber + "%'";
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere += " and HName like '%" + HName + "%'";
                sWhere1 += " and HName like '%" + HName + "%'";
            }
            return sWhere;
            return sWhere1;
        }

    </script>

 WebTM/views/PublicPage/DeptInformation.html

@@ -87,7 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = "";
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treeDepartment',
@@ -156,7 +157,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/DeptList',
                type: "GET",
                data: { "sWhere": sWhere },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -175,18 +176,11 @@

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and HNumber like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and HName like '%" + HName + "%'";
                }
               
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/DeptList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -199,7 +193,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
                sWhere1 = "";//调用接口后清空sWhere缓存
            });

            //以上是layui模块
@@ -243,7 +237,17 @@
            return treeData;
        }


        function SeachFilter(sWhere1) {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere1 += " and HName like '%" + HName + "%'";
            }
            return sWhere1;
        }
    </script>

</body>

 WebTM/views/PublicPage/PartInformation.html

@@ -87,7 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = "";
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treePart',
@@ -157,7 +158,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/PartList',
                type: "GET",
                data: { "sWhere": sWhere },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -176,18 +177,11 @@

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and HNumber like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and HName like '%" + HName + "%'";
                }
               
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/PartList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -244,6 +238,17 @@
            return treeData;
        }

        function SeachFilter(sWhere1) {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere += " and HName like '%" + HName + "%'";
            }
            return sWhere1;
        }

    </script>


 WebTM/views/PublicPage/SupplierInformation.html

@@ -87,7 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = "";
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treeSupplier',
@@ -156,7 +157,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/SupplierList',
                type: "GET",
                data: { "sWhere": sWhere },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -175,18 +176,11 @@

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and HNumber like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and HName like '%" + HName + "%'";
                }
              
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/SupplierList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -199,7 +193,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
                sWhere1 = "";//调用接口后清空sWhere缓存
            });

            //以上是layui模块
@@ -243,7 +237,17 @@
            return treeData;
        }


        function SeachFilter(sWhere1) {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere1 += " and HName like '%" + HName + "%'";
            }
            return sWhere1;
        }
    </script>

</body>

 WebTM/views/PublicPage/UnitInformation.html

@@ -87,7 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = "";
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treeUnit',
@@ -156,7 +157,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/UnitList',
                type: "GET",
                data: { "sWhere": sWhere },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -175,18 +176,11 @@

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and HNumber like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and HName like '%" + HName + "%'";
                }
                
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/UnitList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -199,7 +193,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
                sWhere1 = "";//调用接口后清空sWhere缓存
            });

            //以上是layui模块
@@ -243,7 +237,17 @@
            return treeData;
        }


        function SeachFilter(sWhere1) {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere1 += " and HName like '%" + HName + "%'";
            }
            return sWhere1;
        }
    </script>

</body>

 WebTM/views/PublicPage/UserInformation.html

@@ -33,7 +33,7 @@
                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;">
                                            <div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
                                        </div>
                                        <div class="layui-col-xs9 layui-inline">
                                        <div class="layui-col-xs9 layui-inline" style="width: 74%;">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">代码</label>
@@ -87,7 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = " where HStopFlag=0  and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treeUser',
@@ -156,7 +157,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/UserList',
                type: "GET",
                data: { "sWhere": SeachFilter(sWhere) },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -179,7 +180,7 @@
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/UserList',
                    type: "GET",
                    data: { "sWhere": SeachFilter(sWhere) },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -192,7 +193,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
                sWhere1 = "";//调用接口后清空sWhere缓存
            });

            //以上是layui模块
@@ -205,7 +206,7 @@
            $.ajax({
                url: GetWEBURL() + '/Gy_MaintenanceMode/UserLoadTree',
                type: "GET",
                data: { "sWhere": SeachFilter(sWhere) },
                data: { "sWhere": sWhere },
                async: false,
                success: function (result) {
                    var data = result.data;
@@ -236,17 +237,17 @@
            return treeData;
        }

        function SeachFilter(sWhere)
        function SeachFilter(sWhere1)
        {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere += " and HNumber like '%" + HNumber + "%'";
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere += " and HName like '%" + HName + "%'";
                sWhere1 += " and HName like '%" + HName + "%'";
            }
            return sWhere;
            return sWhere1;
        }

    </script>

 WebTM/views/PublicPage/WareHouseInformation.html

@@ -87,7 +87,9 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = "";

            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treeWareHouse',
@@ -156,7 +158,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/WareHouseList',
                type: "GET",
                data: { "sWhere": sWhere },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -175,18 +177,11 @@

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and HNumber like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and HName like '%" + HName + "%'";
                }
               
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/WareHouseList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -199,7 +194,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
                sWhere1 = "";//调用接口后清空sWhere缓存
            });

            //以上是layui模块
@@ -243,7 +238,17 @@
            return treeData;
        }


        function SeachFilter(sWhere1) {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere1 += " and HName like '%" + HName + "%'";
            }
            return sWhere1;
        }
    </script>

</body>

 WebTM/views/ReportHtml.html

@@ -198,9 +198,10 @@
                    async: false,
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    success: function (data1) {
                        console.log(data1);
                        for (var key in data1.list)
                        {
                            resultTableHead.push({ "id": data1.list[key], "name": data1.list[key] });
                            resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        set_InitGrid(sWhere);
                    }, error: function (err) {
@@ -217,26 +218,39 @@
                //填充表格头数组
                var data = resultTableHead;
                cols_arr[0] = [];
                cols_arr[0][0] = { checkbox: true, fixed: true };
                cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '合计' };
                for (var i = 0; i < data.length; i++) {
                    if (data[i].name == 'HItemID') {
                        cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //隐藏id列
                    }
                    else
                    {
                        cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center'};
                        switch (data[i].Type)
                        {
                            //int
                            case 'Int32':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true ,sort: true};
                                break;
                            //Decimal
                            case 'Decimal': 
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true};
                                break;
                            default:
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center' ,sort: true};
                        }
                    }
                }
                //填充表格数据
                table.render({
                    elem: '#layTable',
                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportFromBillList',
                    toolbar: '#toolbarDemo', //开启头部工具栏，并为其绑定左侧模板
                    //toolbar: '#toolbarDemo', //开启头部工具栏，并为其绑定左侧模板
                    title: '用户数据表',
                    cols: cols_arr,    //填充表格头数据,
                    id: 'layTable', //表格id
                    where: { sWhere: sWhere}, //扩展参数,可以传数据到后台
                    page: true,   //开启分页
                    totalRow: true, //开启合计
                    limit: 10,     //一页能够显示的最大数目
                    limits: [10, 20, 40, 60,80,100], //控制多少行一页（默认五条一页）
                    method: 'get',  //提交方式

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£¾ßÉú²úÍË¿âµ¥/Sc_MouldProdBackBill_PDA.html

@@ -350,6 +350,9 @@
            //条形码回车方法
            $('#HBarCode').on('keydown', function (event) {
                var HBarCode = $('#HBarCode').val();
                var HInterID = $('#HInterID').val();
                var HWHID = $('#HWHID').val();
                var HSPID = $('#HSPID').val();  
                if (event.keyCode == 13) {
                    if (!HBarCode) {
                        layer.msg("条形码不能为空！")
@@ -359,16 +362,16 @@
                    $.ajax({
                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
                        type: "GET",
                        data: { "HBarCode": HBarCode },
                        data: { "HBarCode": HBarCode, "HInterID": HInterID, "HWHID": HWHID, "HSPID": HSPID },
                        success: function (result) {
                            if (result.count == 1) {
                                var data = result.data[0];
                                form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                    "HMouldID":data.hinterid,
                                    "HBarName": data.HName,
                                    "HBarSpec": data.HModel,
                                    "HBarSpec": data.HModel2,
                                    "HBarModel": data.HModel2,
                                    "HDesignLife": data.HDesignLife,
                                    "HLastUseLife": data.HLastUseLife,
                                    "HLeaveLife": data.HLeaveLife
                                });
                                $("#HBarCode").attr("readonly", "readonly");//条形码只读

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£¾ßÉú²úÁìÓõ¥/Sc_MouldProdOutBill_PDA.html

@@ -97,7 +97,7 @@
                                            <label class="layui-form-label" style="width: 75px;">仓库:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" style="width:80%;">
                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input">
                                                <input type="hidden" name="HWHID" id="HWHID" value="0" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Warehouse" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -107,7 +107,7 @@
                                            <label class="layui-form-label" style="width: 75px;">仓位:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
                                                <input type="hidden" name="HSPID" id="HSPID" class="layui-input">
                                                <input type="hidden" name="HSPID" id="HSPID" value="0" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -314,10 +314,10 @@
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                type: "GET",
                data: { "HBillType": '3802' },
                data: { "HBillType": '3796' },
                success: function (d) {
                    //console.log(d.data);
                    $("#HInterID").val("0");
                    console.log(d.data);
                    $("#HInterID").val(d.data[0].HInterID);
                    $("#HBillNo").val(d.data[0].HBillNo);
                }
            });
@@ -326,6 +326,10 @@
            //条形码回车方法
            $('#HBarCode').on('keydown', function (event) {
                var HBarCode = $('#HBarCode').val();
                var HInterID = $('#HInterID').val();
                var HWHID = $('#HWHID').val();  
                var HSPID = $('#HSPID').val();  
                    
                if (event.keyCode == 13) {
                    if (!HBarCode) {
                        layer.msg("条形码不能为空！")
@@ -335,16 +339,16 @@
                    $.ajax({
                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
                        type: "GET",
                        data: { "HBarCode": HBarCode },
                        data: { "HBarCode": HBarCode, "HInterID": HInterID, "HWHID": HWHID, "HSPID": HSPID },
                        success: function (result) {
                            if (result.count == 1) {
                                var data = result.data[0];
                                form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                    "HMouldID":data.hinterid,
                                    //"HMouldID": data.HMaterIDField,
                                    "HBarName": data.HName,
                                    "HBarSpec": data.HModel,
                                    "HBarSpec": data.HModel2,
                                    "HBarModel": data.HModel2,
                                    "HLeaveLife": data.HLeaveLife
                                    "HLeaveLife": data.HDesignLife
                                });
                                $("#HBarCode").attr("readonly", "readonly");//条形码只读
                                $("#HBarCode").css("background-color", "#efefef4d");
@@ -375,20 +379,21 @@

            //提交
            form.on('submit(Saver)', function (data) {
                if (!$("#HBarCode").val()) {
                    layer.msg("请扫描模治具条码!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if (!$("#HWHID").val()) {
                    layer.msg("请选择仓库!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if (!$("#HSPID").val()) {
                    layer.msg("请选择仓位!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //if (!$("#HBarCode").val()) {
                //    layer.msg("请扫描模治具条码!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //if (!$("#HWHID").val()) {
                //    layer.msg("请选择仓库!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //if (!$("#HSPID").val()) {
                //    layer.msg("请选择仓位!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainSub = JSON.stringify(data.field);
                //var sMainSub = { "HBarCode": "X60201609060002", "HWHName": "二厂五金塑胶仓库", "HWHID": "189470", "HSPName": "A1 - 2", "HSPID": "100228", "HBillNo": "MJLY00000091", "HInterID": "147", "HDate": "2021 - 08 - 02 15: 31: 41", "HDeptName": "工程部", "HDeptID": "121472", "HManagerName": "Admin", "HManagerID": "001", "HBarName": "顶杆", "HMouldID": "", "HBarSpec": "16156 - 8", "HBarModel": "16156 - 8", "HQty": "1", "HLeaveLife": "0", "HMaker": "Admin", "HMakeDate": "2021 - 08 - 02 15: 31: 41", "HUpDater": "", "HUpDateDate": "", "HChecker": "", "HCheckDate": "", "HDeleteMan": "", "HDeleteDate": "", "lngBillKey": "", "lngBillSubKey": "" };
                var index = layer.load();
                $.ajax({
                    type: "POST",
@@ -399,7 +404,7 @@
                    success: function (data) {
                        if (data.count == 1) {
                            layer.close(index);
                            layer.msg("提交成功");
                            layer.msg(data.Message);
                            $('#Saver').removeClass("buttom_box_little");
                            $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                        }

 WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_ProductReportBillList.html

@@ -285,7 +285,7 @@
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESProductReportBillList", //方法所在页面和方法名
                        async: false,
                        async: true,
                        data: { "ScMaxWork": ScMaxWork(), "HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker, "Czybm": Czybm },
                        dataType: "json",
                        beforeSend: function () {
@@ -293,17 +293,20 @@
                        },
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $('#AskReport').removeClass("layui-btn-disabled").attr("disabled", false);
                                layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                    layer.close(layer.index);
                                    window.parent.location.reload();
                                });
                            }
                            else {
                               layer.alert(data.Message, { icon: 5 })
                                layer.alert(data.Message, { icon: 5 })
                                $('#AskReport').removeClass("layui-btn-disabled").attr("disabled", false);
                            }
                        },
                        error: function (err) {
                            layer.alert(data.Message, { icon: 5 })
                            $('#AskReport').removeClass("layui-btn-disabled").attr("disabled", false);
                        }
                    });
            })

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html

@@ -958,6 +958,7 @@
                        data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                GetSellOutFindSP();
                                $("#HSupID").val(result.data[0].HSupID);
                                $("#HSupName").val(result.data[0].HSupName);
                                //$("#HDeptID").val(result.data[0].HDeptID);
@@ -1015,32 +1016,56 @@
            });

            //扫源单查货
            $('#HSourceBillNo').on('keydown', function (event) {
            //$('#HSourceBillNo').on('keydown', function (event) {
            //    var HSourceBillNo = $('#HSourceBillNo').val();
            //    if (event.keyCode == 13) {
            //        var index = layer.load(0);
            //        $.ajax({
            //            url: GetWEBURL() + "/LookingFor/GetSellOutFindSP",
            //            type: "GET",
            //            data: { "HbillNo": HSourceBillNo },
            //            success: function (result) {
            //                if (result.count == 1) {
            //                    ZHOption.data = result.data;
            //                    table.render(ZHOption);
            //                    layer.close(index);
            //                    element.tabChange('tab-SellOutBill', '5');
            //                }
            //                else {
            //                    layer.close(index);
            //                    layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //                }
            //            }, error: function () {
            //                layer.close(index);
            //                layer.alert("接口请求失败!", { icon: 5 });
            //            }
            //        });
            //    }
            //});


            //扫源单查货
            function GetSellOutFindSP() {
                var HSourceBillNo = $('#HSourceBillNo').val();
                if (event.keyCode == 13) {
                    var index = layer.load(0);
                    $.ajax({
                        url: GetWEBURL() + "/LookingFor/GetSellOutFindSP",
                        type: "GET",
                        data: { "HbillNo": HSourceBillNo },
                        success: function (result) {
                            if (result.count == 1) {
                                ZHOption.data = result.data;
                                table.render(ZHOption);
                                layer.close(index);
                                element.tabChange('tab-SellOutBill', '5');
                            }
                            else {
                                layer.close(index);
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        }, error: function () {
                $.ajax({
                    url: GetWEBURL() + "/LookingFor/GetSellOutFindSP",
                    type: "GET",
                    data: { "HbillNo": HSourceBillNo },
                    success: function (result) {
                        if (result.count == 1) {
                            ZHOption.data = result.data;
                            table.render(ZHOption);
                            layer.close(index);
                            layer.alert("接口请求失败!", { icon: 5 });
                            element.tabChange('tab-SellOutBill', '5');
                        }
                    });
                }
            });
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

        //以上为layui模块
        });

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_Fast.html

@@ -470,12 +470,39 @@
        });


        //$('#HStockPlaceName').on('keydown', function (event) {      //扫仓位
        //    var HBarCode = $('#HStockPlaceName').val()
        //    if (event.keyCode == 13) {
        //        //判断文本框是否有数据    new
        //        $.ajax({
        //            url: GetWEBURL() + "/Web/GetSpName_Json",
        //            type: "GET",
        //            data: { "HBarCode": HBarCode },
        //            success: function (result) {
        //                if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
        //                    $("#HStockPlaceName").val(result.data[0].HName);
        //                    $("#HStockPlaceID").val(result.data[0].HItemID);
        //                    $("#HWHID").val(result.data[0].HWHID);
        //                    $("#HWHNAME").val(result.data[0].HWhName);
        //                    element.tabChange('tab-MateOutBill', '2');
        //                }
        //                else {
        //                    layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
        //                }
        //                layer.closeAll("loading");
        //            }
        //        });
        //    }
        //});


        //扫仓位
        $('#HStockPlaceName').on('keydown', function (event) {      //扫仓位
            var HBarCode = $('#HStockPlaceName').val()
            if (event.keyCode == 13) {
                //判断文本框是否有数据    new
                $.ajax({
                    url: GetWEBURL() + "/Web/GetSpName_Json",
                    url: GetWEBURL() + "/LookingFor/getSpName_Json",
                    type: "GET",
                    data: { "HBarCode": HBarCode },
                    success: function (result) {
@@ -484,10 +511,12 @@
                            $("#HStockPlaceID").val(result.data[0].HItemID);
                            $("#HWHID").val(result.data[0].HWHID);
                            $("#HWHNAME").val(result.data[0].HWhName);
                            element.tabChange('tab-MateOutBill', '2');
                            element.tabChange('tab-ProductlnBill', '2');
                        }
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            // $("#verifycode").click();
                            //layer.msg(result.Message, { icon: 5 });
                            layer.msg(result.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                        layer.closeAll("loading");
                    }