MES-WEB-LayUI.git

parent: e17e1a17 | 补丁 | 提交 | ignore whitespace

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

yangle

2025-04-29 b565866cdf89c29c535a43a96cbf50fc45c45721

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

7个文件已修改

	WebTM/views/home/console.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/宝工排产/Cg_PODemandPlanConfigBillReportForLack.html	82 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/宝工排产/Gy_RoutingBillReportForLack.html	46 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/宝工排产/JIT_NeedMaterPlanConfigBillReportForLack.html	81 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/home/console.html

@@ -322,6 +322,8 @@
                        HTranslationText = data[i].HTranslationText_English;
                    } else if (sessionStorage["HTranSlate"] == "3") {
                        HTranslationText = data[i].HTranslationText_Spain;
                    } else {
                        HTranslationText = data[i].HCaption;
                    }

                    if (i == 0) {

 WebTM/views/Éú²ú¹ÜÀí/ÈýÉýÅÅ²ú/JIT_DayPlanPlatForm.html

@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>çäº§è®¡åæäº§</title>
    <title>ä¸åçäº§è®¡åæäº§</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
@@ -1852,7 +1852,7 @@
            $.ajax({
                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
                type: "GET",
                async: false,
                async: true,
                data: { "sWhere": HinterID_S.toString(),"num":1 },
                success: function (data1) {
                    if (data1.count == 1) {
@@ -1918,7 +1918,7 @@
            $.ajax({
                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
                type: "GET",
                async: false,
                async: true,
                data: { "sWhere": HinterID_S.toString(), "num": 2 },
                success: function (data1) {
                    if (data1.count == 1) {

 WebTM/views/Éú²ú¹ÜÀí/±¦¹¤ÅÅ²ú/Cg_PODemandPlanConfigBillReportForLack.html

@@ -140,6 +140,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_insert" id="get_insert"><i class="layui-icon layui-icon-export"></i>å¿«æ·æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
@@ -189,6 +190,10 @@
                    //å¯¼åºexcel
                    case 'get_export':
                        get_Export();
                        break;
                    //å¿«æ·æ°å¢
                    case 'get_insert':
                        get_insert();
                        break;
                    //å·æ°
                    case 'get_Refresh': get_Refresh();
@@ -320,7 +325,7 @@
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

                            //å·æ°è¡¨æ ¼æ°æ®
                            //DisPlay_HideColumn();
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);

@@ -485,7 +490,18 @@
                                    }
                                }
                            }
                            table.exportFile(ins.config.id, option.data, "xls");
                            data.forEach((item) => {
                                for (let itemobj in item) {
                                    if (item[itemobj] == null) {
                                        item[itemobj] = "";
                                    }
                                    if (item[itemobj].length > 0) {  // åè®¾åæ®µåä¸ºfield
                                        item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                                        item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, 'ï¼');  // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                                    }
                                }
                            });
                            table.exportFile(ins.config.id, data, "xls");
                        } else {
                            layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
                        }
@@ -493,6 +509,48 @@
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region å¿«æ·æ°å¢
            function get_insert() {
                var CheckStatus = table.checkStatus("mainTable");
                if (set_ModCheck("Cg_PODemandPlanConfigBill_Edit") == false) {
                    return layer.msg("æ æé!")
                }
                if (CheckStatus.data.length == 0) {
                    return layer.msg("è¯·éæ©æ°æ®!")
                } else {
                    layer.confirm('æ¨ç¡®å®è¦æ°å¢åï¼', {
                        btn: ['ç¡®å®', 'åæ¶'] //æé®
                        , btn1: function () {
                            var ajaxLoad = layer.load();
                            var message = "";
                            for (var i = 0; i < CheckStatus.data.length; i++) {
                                var sql = "exec h_p_Cg_PODemandPlanConfigBillReportForLack_Copy " + CheckStatus.data[i].HOrgID + "," + CheckStatus.data[i].HMaterID + "," + CheckStatus.data[i].HSupID
                                $.ajax({
                                    url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
                                    type: "GET",
                                    async: false,
                                    data: { "sWhere": sql },
                                    success: function (data1) {
                                        if (data1.count == 1) {
                                            message += i + "." + data1.data[0].Remark + CheckStatus.data[i].ç©æåç§° + "\\n"
                                        } else {
                                            layer.alert(data1.code + data1.Message, { icon: 5 });
                                        }
                                    }, error: function () {
                                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                                    }
                                });
                            }
                            layer.alert(message, { icon: 5 });
                            layer.close(ajaxLoad);
                            //å·æ°æ°æ®
                            get_FastQuery(2);
                        }
                    })
                }
            }
            //#endregion

@@ -657,6 +715,26 @@
                form.render('select');
            }
            //#endregion
            //æéå¤å®
            function set_ModCheck(ModRightNameCheck) {
                var Permission = false;
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    async: false,
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            Permission = true;
                        } else {
                            layer.alert("å½åæ¨¡åæ²¡ææ¥è¯¢æé!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                return Permission;
            }
        });

            //#endregion

 WebTM/views/Éú²ú¹ÜÀí/±¦¹¤ÅÅ²ú/Gy_RoutingBillReportForLack.html

@@ -134,6 +134,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Copy" id="get_Copy"><i class="layui-icon layui-icon-refresh-3"></i>å¤å¶</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
@@ -183,6 +184,10 @@
                    //å¯¼åºexcel
                    case 'get_export':
                        get_Export();
                        break;
                    //å¯¼åºexcel
                    case 'get_Copy':
                        get_Copy();
                        break;
                    //å·æ°
                    case 'get_Refresh': get_Refresh();
@@ -314,7 +319,7 @@
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

                            //å·æ°è¡¨æ ¼æ°æ®
                            //DisPlay_HideColumn();
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);

@@ -462,7 +467,19 @@
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            table.exportFile(ins.config.id, option.data, "xls");
                            var data = option.data;
                            data.forEach((item) => {
                                for (let itemobj in item) {
                                    if (item[itemobj] == null) {
                                        item[itemobj] = "";
                                    }
                                    if (item[itemobj].length > 0) {  // åè®¾åæ®µåä¸ºfield
                                        item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                                        item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, 'ï¼');  // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                                    }
                                }
                            });
                            table.exportFile(ins.config.id,data, "xls");
                        } else {
                            layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
                        }
@@ -473,6 +490,31 @@
            }
            //#endregion

            //å¤å¶
            function get_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HMaterID = data[0].HMaterID;
                    var HMaterNumber = data[0].ç©æä»£ç ;
                    var HMaterName = data[0].ç©æåç§°;
                    var HMaterModel = data[0].è§æ ¼åå·;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: 'å·¥èºè·¯çº¿-ç¼è¾'
                        , shift: 0//å¼¹åºå¨ç»
                        , content: '../../è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=1&linterid=' + 0 + '&HSouceBillType=4610&HMaterID=' + HMaterID + '&HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel
                        , end: function () {
                            //å·æ°é¡µé¢,
                            //location.reload();
                        }
                    })
                } else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
                }
            }

            //#region å·æ°
            function get_Refresh() {
                $("#btnSearch").trigger('click');

 WebTM/views/Éú²ú¹ÜÀí/±¦¹¤ÅÅ²ú/JIT_NeedMaterPlanConfigBillReportForLack.html

@@ -140,6 +140,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_insert" id="get_insert"><i class="layui-icon layui-icon-export"></i>å¿«æ·æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
@@ -189,6 +190,10 @@
                    //å¯¼åºexcel
                    case 'get_export':
                        get_Export();
                        break;
                    //å¿«æ·æ°å¢
                    case 'get_insert':
                        get_insert();
                        break;
                    //å·æ°
                    case 'get_Refresh': get_Refresh();
@@ -320,7 +325,7 @@
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

                            //å·æ°è¡¨æ ¼æ°æ®
                            //DisPlay_HideColumn();
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);

@@ -481,7 +486,18 @@
                            //        }
                            //    }
                            //}
                            table.exportFile(ins.config.id, option.data, "xls");
                            data.forEach((item) => {
                                for (let itemobj in item) {
                                    if (item[itemobj] == null) {
                                        item[itemobj] = "";
                                    }
                                    if (item[itemobj].length > 0) {  // åè®¾åæ®µåä¸ºfield
                                        item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                                        item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, 'ï¼');  // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                                    }
                                }
                            });
                            table.exportFile(ins.config.id, data, "xls");
                        } else {
                            layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
                        }
@@ -498,6 +514,47 @@
            }
            //#endregion

            //#region å¿«æ·æ°å¢
            function get_insert() {
                var CheckStatus = table.checkStatus("mainTable");
                if (set_ModCheck("JIT_NeedMaterPlanConfigBill_Edit") == false) {
                    return layer.msg("æ æé!")
                }
                if (CheckStatus.data.length == 0) {
                    return layer.msg("è¯·éæ©æ°æ®!")
                } else {
                    layer.confirm('æ¨ç¡®å®è¦æ°å¢åï¼', {
                        btn: ['ç¡®å®', 'åæ¶'] //æé®
                        , btn1: function () {
                            var ajaxLoad = layer.load();
                            var message = "";
                            for (var i = 0; i < CheckStatus.data.length; i++) {
                                var sql = "exec h_p_JIT_NeedMaterPlanConfigBillReportForLack_Copy " + CheckStatus.data[i].HOrgID + "," + CheckStatus.data[i].HMaterID + "," + CheckStatus.data[i].HDeptID
                                $.ajax({
                                    url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
                                    type: "GET",
                                    async: false,
                                    data: { "sWhere": sql },
                                    success: function (data1) {
                                        if (data1.count == 1) {
                                            message += i + "." + data1.data[0].Remark + CheckStatus.data[i].ç©æåç§°+ "\\n"
                                        } else {
                                            layer.alert(data1.code + data1.Message, { icon: 5 });
                                        }
                                    }, error: function () {
                                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                                    }
                                });
                            }
                            layer.alert(message, { icon: 5 });
                            layer.close(ajaxLoad);
                            //å·æ°æ°æ®
                            get_FastQuery(2);
                        }
                    })
                }
            }
            //#endregion
            //#region éèåè®¾ç½®
            function get_HideColumn() {
                var colName = "";
@@ -632,6 +689,26 @@
                form.render('select');
            }
            //#endregion
            //æéå¤å®
            function set_ModCheck(ModRightNameCheck) {
                var Permission = false;
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    async: false,
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            Permission = true;
                        } else {
                            layer.alert("å½åæ¨¡åæ²¡ææ¥è¯¢æé!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                return Permission;
            }
        });

            //#endregion

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html

@@ -26,6 +26,7 @@
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">è§£é</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">é½å¥åæ</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">ææè¿ç®</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">è¦æè¿ç®</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">çäº§è®¢åéå</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">åå¤</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">æäº§</button>
@@ -699,6 +700,11 @@
        //ææè¿ç®
        form.on('submit(btnTLYS)', function (data) {
            get_btnTLYS();
        })

        //è¦æè¿ç®
        form.on('submit(btnYLYS)', function (data) {
            get_btnYLYS();
        })

        //çäº§è®¢åéå
@@ -1697,6 +1703,34 @@
            });
        }

        //è¦æè¿ç®
        function get_btnYLYS() {
            sWhere = {
                HProdORGID: $("#HProdORGID").val()
                , HWorkShopID: $("#HWorkShopID").val()
            }
            sWhere = JSON.stringify(sWhere);
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_YLYS',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        get_FastQuery(2);
                        layer.msg(data1.Message);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                }
            });
        }

        //çäº§è®¢åéå
        function get_btnICMOBill() {
            var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();

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

@@ -755,7 +755,7 @@
                HBillSubType = 3301

                $("#HMaterID").val(params[params[3]]);//ç©æID

                $("#HName").val(getParams("HMaterNumber"));//å·¥èºè·¯çº¿åç§°
                $("#HMaterNumber").val(getParams("HMaterNumber"));//ç©æä»£ç 
                $("#HMaterName").val(getParams("HMaterName"));//ç©æåç§°
                $("#HMaterModel").val(getParams("HMaterModel") == "" ? " " : getParams("HMaterModel"));//è§æ ¼åå·

			@@ -322,6 +322,8 @@
			HTranslationText = data[i].HTranslationText_English;
			} else if (sessionStorage["HTranSlate"] == "3") {
			HTranslationText = data[i].HTranslationText_Spain;
			} else {
			HTranslationText = data[i].HCaption;
			}

			if (i == 0) {

			@@ -2,7 +2,7 @@
			<html>
			<head>
			<meta charset="utf-8" />
			<title>çäº§è®¡åæäº§</title>
			<title>ä¸åçäº§è®¡åæäº§</title>
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
			@@ -1852,7 +1852,7 @@
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
			type: "GET",
			async: false,
			async: true,
			data: { "sWhere": HinterID_S.toString(),"num":1 },
			success: function (data1) {
			if (data1.count == 1) {
			@@ -1918,7 +1918,7 @@
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
			type: "GET",
			async: false,
			async: true,
			data: { "sWhere": HinterID_S.toString(), "num": 2 },
			success: function (data1) {
			if (data1.count == 1) {

			@@ -140,6 +140,7 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_insert" id="get_insert"><i class="layui-icon layui-icon-export"></i>å¿«æ·æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			@@ -189,6 +190,10 @@
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//å¿«æ·æ°å¢
			case 'get_insert':
			get_insert();
			break;
			//å·æ°
			case 'get_Refresh': get_Refresh();
			@@ -320,7 +325,7 @@
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

			//å·æ°è¡¨æ ¼æ°æ®
			//DisPlay_HideColumn();
			DisPlay_HideColumn();

			layer.close(ajaxLoad);

			@@ -485,7 +490,18 @@
			}
			}
			}
			table.exportFile(ins.config.id, option.data, "xls");
			data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, 'ï¼'); // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});
			table.exportFile(ins.config.id, data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			@@ -493,6 +509,48 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#region å¿«æ·æ°å¢
			function get_insert() {
			var CheckStatus = table.checkStatus("mainTable");
			if (set_ModCheck("Cg_PODemandPlanConfigBill_Edit") == false) {
			return layer.msg("æ æé!")
			}
			if (CheckStatus.data.length == 0) {
			return layer.msg("è¯·éæ©æ°æ®!")
			} else {
			layer.confirm('æ¨ç¡®å®è¦æ°å¢åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			var ajaxLoad = layer.load();
			var message = "";
			for (var i = 0; i < CheckStatus.data.length; i++) {
			var sql = "exec h_p_Cg_PODemandPlanConfigBillReportForLack_Copy " + CheckStatus.data[i].HOrgID + "," + CheckStatus.data[i].HMaterID + "," + CheckStatus.data[i].HSupID
			$.ajax({
			url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
			type: "GET",
			async: false,
			data: { "sWhere": sql },
			success: function (data1) {
			if (data1.count == 1) {
			message += i + "." + data1.data[0].Remark + CheckStatus.data[i].ç©æåç§° + "\\n"
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			layer.alert(message, { icon: 5 });
			layer.close(ajaxLoad);
			//å·æ°æ°æ®
			get_FastQuery(2);
			}
			})
			}
			}
			//#endregion

			@@ -657,6 +715,26 @@
			form.render('select');
			}
			//#endregion
			//æéå¤å®
			function set_ModCheck(ModRightNameCheck) {
			var Permission = false;
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: false,
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			Permission = true;
			} else {
			layer.alert("å½åæ¨¡åæ²¡ææ¥è¯¢æé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			return Permission;
			}
			});

			//#endregion

			@@ -134,6 +134,7 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Copy" id="get_Copy"><i class="layui-icon layui-icon-refresh-3"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			@@ -183,6 +184,10 @@
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//å¯¼åºexcel
			case 'get_Copy':
			get_Copy();
			break;
			//å·æ°
			case 'get_Refresh': get_Refresh();
			@@ -314,7 +319,7 @@
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

			//å·æ°è¡¨æ ¼æ°æ®
			//DisPlay_HideColumn();
			DisPlay_HideColumn();

			layer.close(ajaxLoad);

			@@ -462,7 +467,19 @@
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			table.exportFile(ins.config.id, option.data, "xls");
			var data = option.data;
			data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, 'ï¼'); // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});
			table.exportFile(ins.config.id,data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			@@ -473,6 +490,31 @@
			}
			//#endregion

			//å¤å¶
			function get_Copy() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HMaterID = data[0].HMaterID;
			var HMaterNumber = data[0].ç©æä»£ç ;
			var HMaterName = data[0].ç©æåç§°;
			var HMaterModel = data[0].è§æ ¼åå·;
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'å·¥èºè·¯çº¿-ç¼è¾'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=1&linterid=' + 0 + '&HSouceBillType=4610&HMaterID=' + HMaterID + '&HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel
			, end: function () {
			//å·æ°é¡µé¢,
			//location.reload();
			}
			})
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
			}
			}

			//#region å·æ°
			function get_Refresh() {
			$("#btnSearch").trigger('click');

			@@ -26,6 +26,7 @@
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">è§£é</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">é½å¥åæ</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">ææè¿ç®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">è¦æè¿ç®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">çäº§è®¢åéå</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">åå¤</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">æäº§</button>
			@@ -699,6 +700,11 @@
			//ææè¿ç®
			form.on('submit(btnTLYS)', function (data) {
			get_btnTLYS();
			})

			//è¦æè¿ç®
			form.on('submit(btnYLYS)', function (data) {
			get_btnYLYS();
			})

			//çäº§è®¢åéå
			@@ -1697,6 +1703,34 @@
			});
			}

			//è¦æè¿ç®
			function get_btnYLYS() {
			sWhere = {
			HProdORGID: $("#HProdORGID").val()
			, HWorkShopID: $("#HWorkShopID").val()
			}
			sWhere = JSON.stringify(sWhere);
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_YLYS',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			get_FastQuery(2);
			layer.msg(data1.Message);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//çäº§è®¢åéå
			function get_btnICMOBill() {
			var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();

			@@ -755,7 +755,7 @@
			HBillSubType = 3301

			$("#HMaterID").val(params[params[3]]);//ç©æID

			$("#HName").val(getParams("HMaterNumber"));//å·¥èºè·¯çº¿åç§°
			$("#HMaterNumber").val(getParams("HMaterNumber"));//ç©æä»£ç
			$("#HMaterName").val(getParams("HMaterName"));//ç©æåç§°
			$("#HMaterModel").val(getParams("HMaterModel") == "" ? " " : getParams("HMaterModel"));//è§æ ¼åå·