基础资料的功能完善

yangle

2022-06-15 43b272c3de309c45b4f8c1ff00f038e2841ceebe

基础资料的功能完善

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_WorkCenter.html

@@ -35,6 +35,14 @@
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -126,7 +134,7 @@

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                get_FastQuery(2);
            });
            //#endregion

@@ -190,10 +198,11 @@

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                Organ();
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                get_FastQuery(1);
            }
            //#endregion

@@ -213,6 +222,7 @@
                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                        , { field: '工作中心代码', title: '工作中心代码' }
                        , { field: '工作中心名称', title: '工作中心名称' }
                        , { field: '组织', title: '组织' }
                        //, { field: '条形码', title: '条形码' }
                        , { field: '明细标记', title: '明细标记' }
                        , { field: '禁用标记', title: '禁用标记' }
@@ -226,6 +236,29 @@
                };
            }
            //#endregion

            //获取组织
            function Organ() {
                //获取登录页组织列
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        var Organization = "";
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            $("#HOrgID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }


            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
@@ -254,14 +287,25 @@
            //#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
            function get_FastQuery(number) {
                var HOrgID = "";
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (number == 1) {
                    HOrgID = sessionStorage["OrganizationID"];
                }
                else {
                    HOrgID = $("#HOrgID").val();//组织
                }

                if (HNumber) {
                    sWhere += " and å·¥ä½œä¸­å¿ƒä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and å·¥ä½œä¸­å¿ƒåç§° like '%" + HName + "%'";
                }
                if (HOrgID) {
                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -272,6 +316,8 @@
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HOrgID").val(sessionStorage["OrganizationID"]);
                form.render('select');
                sWhere = "";
            }
            //#endregion

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_WorkCenter_Add_Edit.html

@@ -97,6 +97,20 @@
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">组织</label>
                                <div class="layui-input-inline" style="margin-bottom: -15px;">
                                    <div class="layui-form">
                                        <div class="layui-form-item">
                                            <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">禁用标志</label>
                                <div class="layui-input-inline">
                                    <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="是否禁用">
@@ -148,7 +162,7 @@

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            get_LoginIs();

            Organ();
            //获取页面跳转参数
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
@@ -163,6 +177,8 @@
                $("#HItemID").val(0);
            }
            else if (OperationType == 3) {//编辑
                //禁用组织选项
                $("#HUSEORGID").attr("disabled", true);
                $("#HItemID").val(linterid);//修改时主表ID
                //编辑状态时，根据内码，获取信息并写入界面
                RoadBillMain(linterid);
@@ -263,6 +279,7 @@
                                , "HDeptID": data.HDeptID
                                , "HStopflag": data.HStopflag
                                , "HRemark": data.HRemark
                                , "HUSEORGID": data.HUSEORGID
                            });
                            layer.close(ajaxLoad);
                        } else {
@@ -279,7 +296,7 @@

            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
                var sMainStr = JSON.stringify(data.field);
                //var sMainStr = JSON.stringify(data.field);
                if (!$("#HDeptName").val()) {
                    layer.msg("请选择部门！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
@@ -319,6 +336,29 @@
            }
            //#endregion


            //获取组织
            function Organ() {
                //获取登录页组织列
                var Organization = '';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HUSEORGID").append(Organization);
                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            //#region é€‰æ‹©å·¥åºæ–¹æ³•
            function get_checkProc() {
                layer.open({

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group.html

@@ -35,6 +35,14 @@
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -122,7 +130,7 @@

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                get_FastQuery(2);
            });
            //#endregion

@@ -132,10 +140,11 @@

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                Organ();
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                get_FastQuery(1);
            }
            //#endregion

@@ -154,6 +163,7 @@
                        , { field: 'HDeptID', title: 'HDeptID', sort: true, hide: true }
                        , { field: '班组代码', title: '班组代码' }
                        , { field: '班组名称', title: '班组名称' }
                        , { field: '组织', title: '组织' }
                        , { field: '明细标记', title: '明细标记' }
                        , { field: '条码编号', title: '条码编号' }
                        , { field: '禁用标记', title: '禁用标记' }
@@ -166,6 +176,29 @@
                };
            }
            //#endregion

            //获取组织
            function Organ() {
                //获取登录页组织列
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        var Organization = "";
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            $("#HOrgID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }


            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
@@ -195,14 +228,25 @@
            //#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
            function get_FastQuery(number) {
                var HOrgID = "";
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (number == 1) {
                    HOrgID = sessionStorage["OrganizationID"];
                }
                else {
                    HOrgID = $("#HOrgID").val();//组织
                }

                if (HNumber) {
                    sWhere += " and ç­ç»„代码 like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and ç­ç»„名称 like '%" + HName + "%'";
                }
                if (HOrgID) {
                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -213,6 +257,8 @@
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HOrgID").val(sessionStorage["OrganizationID"]);
                form.render('select');
                sWhere = "";
            }
            //#endregion

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group_Add_Edit.html

@@ -95,6 +95,18 @@
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">组织</label>
                                <div class="layui-input-inline" style="margin-bottom: -15px;">
                                    <div class="layui-form">
                                        <div class="layui-form-item">
                                            <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">禁用标志</label>
                                <div class="layui-input-inline">
                                    <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="是否禁用">
@@ -148,6 +160,7 @@

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            get_LoginIs();
            Organ();

            //获取页面跳转参数
            var params = get_UrlVars();
@@ -163,6 +176,8 @@
                $("#HItemID").val(0);
            }
            else if (OperationType == 3) {//编辑
                //禁用组织选项
                $("#HUSEORGID").attr("disabled", true);
                $("#HItemID").val(linterid);//修改时主表ID
                //编辑状态时，根据内码，获取信息并写入界面
                RoadBillMain(linterid);
@@ -263,6 +278,7 @@
                                , "HProcName": data.工序
                                , "HStopflag": data.禁用标记
                                , "HRemark": data.备注
                                , "HUSEORGID": data.HUSEORGID
                            });
                            layer.close(ajaxLoad);
                        } else {
@@ -277,6 +293,28 @@
            }
            //#endregion

            //获取组织
            function Organ() {
                //获取登录页组织列
                var Organization = '';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HUSEORGID").append(Organization);
                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
                if (!$("#HProcID").val()) {

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Process.html

@@ -144,6 +144,18 @@
                            </div>
                            <div class="layui-row">
                                <div class="layui-col-xs4 layui-inline">
                                    <label class="layui-form-label">组织</label>
                                    <div class="layui-input-inline" style="margin-bottom: -15px;">
                                        <div class="layui-form">
                                            <div class="layui-form-item">
                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-col-xs4 layui-inline">
                                    <label class="layui-form-label">禁用标志</label>
                                    <div class="layui-input-inline">
                                        <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="是否禁用">
@@ -226,7 +238,7 @@

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            get_LoginIs();

            Organ();//显示组织
            //获取页面跳转参数
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
@@ -241,6 +253,8 @@
                $("#HItemID").val(0);
            }
            else if (OperationType == 3) {//编辑
                //禁用组织选项
                $("#HUSEORGID").attr("disabled", true);
                $("#HItemID").val(linterid);//修改时主表ID
                //编辑状态时，根据内码，获取信息并写入界面
                RoadBillMain(linterid);
@@ -325,6 +339,28 @@
            }
            //#endregion

            //获取组织
            function Organ() {
                //获取登录页组织列
                var Organization = '';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HUSEORGID").append(Organization);
                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            //#region åŠ è½½è¡¨å¤´
            function RoadBillMain(linterid) {
                //查询检验方案单是否存在
@@ -379,6 +415,7 @@
                                , "HAutoTrunFlag": data.自动移转
                                , "HRemark": data.备注
                                , "HProcCheckNote": data.本工序确认记录
                                , "HUSEORGID": data.HUSEORGID
                            });
                            layer.close(ajaxLoad);
                        } else {

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Source.html

@@ -158,6 +158,20 @@
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">组织</label>
                                <div class="layui-input-inline" style="margin-bottom: -15px;">
                                    <div class="layui-form">
                                        <div class="layui-form-item">
                                            <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">禁用标志</label>
                                <div class="layui-input-inline">
                                    <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="是否禁用">
@@ -204,7 +218,7 @@


        //#region è¿›å…¥é¡µé¢å³åŠ è½½

            Organ();
            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            get_LoginIs();

@@ -222,6 +236,8 @@
                $("#HItemID").val(0);
            }
            else if (OperationType == 3) {//编辑
                //禁用组织选项
                $("#HUSEORGID").attr("disabled", true);
                $("#HItemID").val(linterid);//修改时主表ID
                //编辑状态时，根据内码，获取信息并写入界面
                RoadBillMain(linterid);
@@ -291,6 +307,28 @@
            }
            //#endregion

            //获取组织
            function Organ() {
                //获取登录页组织列
                var Organization = '';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HUSEORGID").append(Organization);
                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            //#region åŠ è½½è¡¨å¤´
            function RoadBillMain(linterid){
                //查询检验方案单是否存在
@@ -332,6 +370,7 @@
                                , "HStopflag": data.禁用标记
                                , "HType": data.类型
                                , "HRemark": data.备注
                                , "HUSEORGID": data.HUSEORGID
                            });
                            layer.close(ajaxLoad);
                        } else {
@@ -356,7 +395,6 @@
                    data: { "msg": sMainStr },
                    dataType: "json",
                    success: function (data) {
                        console.log(JSON.stringify(data))
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -369,7 +407,6 @@
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        console.log(JSON.stringify(err))
                        layer.alert("错误:" + err, { icon: 5 });
                        console.log("Reason" + sMainStr);
                    }

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.html

@@ -40,6 +40,14 @@
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -121,7 +129,7 @@

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                get_FastQuery(2);
            });
            //#endregion

@@ -134,7 +142,8 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                get_FastQuery(1);
                Organ();
            }
            //#endregion

@@ -153,6 +162,7 @@
                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                        , { field: '工序代码', title: '工序代码' }
                        , { field: '工序名称', title: '工序名称' }
                        , { field: '组织', title: '组织' }
                        , { field: '等级', title: '等级' }
                        , { field: '流转标记', title: '流转标记' }
                        , { field: '核算标记', title: '核算标记' }
@@ -175,6 +185,30 @@
            }

            //#endregion


            //获取组织
            function Organ() {
                //获取登录页组织列
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        var Organization = "";
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            $("#HOrgID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }


            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
@@ -204,14 +238,26 @@
            //#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
            function get_FastQuery(number) {
                var HOrgID = "";
                var HNumber = $("#HNumber").val();//工序代码
                var HName = $("#HName").val();//工序名称

                if (number == 1) {
                    HOrgID = sessionStorage["OrganizationID"];
                }
                else {
                    HOrgID = $("#HOrgID").val();//组织
                }

                if (HNumber) {
                    sWhere += " and å·¥åºä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and å·¥åºåç§° like '%" + HName + "%'";
                }
                if (HOrgID) {
                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -222,6 +268,8 @@
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HOrgID").val(sessionStorage["OrganizationID"]);
                form.render('select');
                sWhere = "";
            }
            //#endregion

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Source.html

@@ -35,6 +35,14 @@
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -118,7 +126,7 @@

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                get_FastQuery(2);
            });
            //#endregion

@@ -135,12 +143,36 @@

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                Organ();
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                get_FastQuery(1);
            }
            //#endregion

            //获取组织
            function Organ() {
                //获取登录页组织列
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        var Organization = "";
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            $("#HOrgID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }


            //#region åˆå§‹åŒ–表格方法
            function set_InitGrid() {
@@ -157,6 +189,7 @@
                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                        , { field: '生产资源代码', title: '生产资源代码' }
                        , { field: '生产资源名称', title: '生产资源名称' }
                        , { field: '组织', title: '组织' }
                        , { field: '条码编号', title: '条码编号' }
                        , { field: 'Hprocid', title: 'Hprocid', hide: true }
                        , { field: '工序', title: '工序' }
@@ -268,14 +301,26 @@
            //#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
            function get_FastQuery(number) {
                var HOrgID = "";
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (number == 1) {
                    HOrgID = sessionStorage["OrganizationID"];
                }
                else {
                    HOrgID = $("#HOrgID").val();//组织
                }


                if (HNumber) {
                    sWhere += " and ç”Ÿäº§èµ„源代码 like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and ç”Ÿäº§èµ„源名称 like '%" + HName + "%'";
                }
                if (HOrgID) {
                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -286,6 +331,8 @@
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HOrgID").val(sessionStorage["OrganizationID"]);
                form.render('select');
                sWhere = "";
            }
            //#endregion

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -253,6 +253,8 @@
                $("#HOrderProcNO").val("");//单据类型
                $("#btnSearch").click();
                $("#HName").val("");
                $("#HOrgID").val(sessionStorage["OrganizationID"]);
                form.render('select');
                sWhere = "";
            }
            //#endregion

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -646,7 +646,7 @@
                    "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
                    "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                    "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                    "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                }];
                table.render(option);
            }
@@ -688,7 +688,7 @@
                    "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
                    "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                    "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                    "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                }];
                table.render(option);
            }
@@ -782,7 +782,7 @@
                    "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
                    "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                    "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                    "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -1252,17 +1252,26 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        getRoutingBill(checkStatus.data[0].单据号);

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });

            function getRoutingBill(HBillNo) {
                        $.ajax({
                            type: "get",
                            url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
                            async: true,
                            data: { "sWhere": " and å•æ®å·='" + checkStatus.data[0].单据号 + "'", "user": sessionStorage["HUserName"] },
                    data: { "sWhere": " and å•æ®å·='" + HBillNo + "'", "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                var data = result.data;
                                var Tablerow = [];

                                $("#RoutingBill").val(data[0].单据号)
                     
                                for (var i = 0; i < data.length; i++) {
                                    Tablerow.push({
                                        "HProcNo": data[i].工序号, "HProcID": data[i].hprocid, "HProcNumber": data[i].工序代码, "HProcName": data[i].工序, "HWorkRemark": data[i].表体备注,
@@ -1271,13 +1280,13 @@
                                        "HSupID": data[i].HSupID, "HSupNumber": data[i].供应商代码, "HSupName": data[i].供应商, "isEntrust": data[i].委外标记 == 0 ? "false" : "true",
                                        "HQty": data[i].加工数量, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                                        "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                                        "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": data[i].工艺参数, "HPicNum": data[i].图纸编号, "HProcCheckNote": data[i].本工序确认记录
                                "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].工艺参数, "HPicNum": data[i].图纸编号, "HProcCheckNote": data[i].本工序确认记录
                                    });
                                }
                                option.data = Tablerow;
                                table.render(option);
                                for (var i = 1; i <= data.length; i++) {
                                    $('#isEntrust' + i + '').find("option[value='" + (checkStatus.data[i - 1].委外标记 == 0 ? "false" : "true") + "']").attr("selected", true);
                            $('#isEntrust' + i + '').find("option[value='" + (data[i - 1].委外标记 == "0" ? "false" : "true") + "']").attr("selected", true);
                                }
                                form.render('select');
                            },
@@ -1287,12 +1296,7 @@
                                //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                            }
                        })
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });



            //保存提交
@@ -1408,7 +1412,7 @@
                    "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
                    "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                    "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                    "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                }];
                table.render(option);
            }
@@ -1566,7 +1570,7 @@
                            $("#HOrderProcNO").val(data.订单跟踪号);
                            $("#HMaterID").val(data.hmaterid);
                            $("#HMaterName").val(data.物料名称);
                            $("#HMaterID2").val(data.HMaterID);
                            $("#HMaterID2").val(data.hmaterid);
                            $("#HMaterName2").val(data.物料名称);
                            $("#HMaterNumber").val(data.物料代码);
                            $("#HMaterNumber2").val(data.物料代码);
@@ -1598,6 +1602,25 @@
                            $("#HVerNum").val(data.版本);
                            $("input[name='HBLFlag']").prop("checked", result.data[0].HBLFlag == 0 ? false : true);//true:选中 false:不选中
                            btnHMaterID= data.hmaterid;

                            $.ajax({
                                type: "get",
                                url: GetWEBURL() + "LEMS/Gy_RoutingBillList",
                                async: true,
                                data: { "sWhere": "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
                                success: function (result) {
                                    if (result.data != null) {
                                        var hbillno = result.data[0].单据号
                                        getRoutingBill(hbillno);
                                    }
                                  
                                },
                                error: function (result) {
                                    layer.close(index);
                                    console.log(result);
                                    //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                                }
                            })
                        }
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -1605,7 +1628,8 @@
                    }
                })
                //txtHBillNo.Text = sBillNo;
                GetICMOBillDetail(hmainid, HEntryID);
                //GetICMOBillDetail(hmainid, HEntryID);
              
            }

            function GetICMOBillDetail(hmainid, HEntryID) {