龙山汽配专用调整MES-UI前端界面
1
yusijie
2023-05-26 d1c9ed51388f9e11a3f837082fdce86b686d378d
1
1个文件已添加
24个文件已修改
931 ■■■■■ 已修改文件
WebTM/WebTM.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/PublicPage/PowerInformation.html 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Gy_UserByOrg.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Gy_UserByUser.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Gy_UserByWorkStation.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Gy_UserCustomer.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Gy_UserDept.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Gy_UserEmployee.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Gy_UserGroup.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Gy_UserMater.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Gy_UserProcess.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Gy_UserStock.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Xt_UserSuplies.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 74 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillimport.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Gy_ProcessBatchReport.html 678 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_EmployeePiecePayReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_EmployeePiecePaySumReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_EmployeePieceWorkReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_WorkShopProcessWIPReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_WorkShopProcessWIPSumReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -212,6 +212,7 @@
    <Content Include="views\车间管理\工序流转\MES_StationInBill_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBill_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBill_PDA_Detail.html" />
    <Content Include="views\车间管理\工序流转卡\Gy_ProcessBatchReport.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcExchRecordBackBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcExchRecordBackBillEdit.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessSendWorkEdit.html" />
@@ -1254,6 +1255,7 @@
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_Check_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBill.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBillList.html" />
    <Content Include="views\验收入库\Kf_OtherInBill_Fast.html" />
    <Content Include="views\验收入库\产品入库\Kf_ICStockBillSub_WMS_List.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherInBillList.html" />
WebTM/views/PublicPage/PowerInformation.html
@@ -32,7 +32,7 @@
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="get_Refresh">刷新</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">授权</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
@@ -202,6 +202,13 @@
                }
            });
            //刷新按钮
            form.on('submit(get_Refresh)', function () {//提交
                layer.confirm('继续对当前所选用户进行更改权限?', { icon: 3, title: '提示' }, function (index) {
                    location.replace('PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=');
                });
            })
            //监听选中数据
            table.on('checkbox(mainTable)', function (obj) {
                //console.log(obj.checked); //当前是否选中状态
WebTM/views/index.html
@@ -444,7 +444,7 @@
                            <a><i class="layui-icon layui-icon-set"></i><cite>车间管理</cite></a>
                            <dl class="layui-nav-child">
                                <dd>
                                    <a>工序流转</a>
                                    <a>工序派工</a>
                                    <dl class="layui-nav-child">
                                        <!--<dd><a lay-href="车间管理/工序流转卡/WindowPrint.html">测试打印</a></dd>-->
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeBill.html">工序派工单</a></dd>
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserByOrg.html
@@ -39,6 +39,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">新增</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -316,6 +317,13 @@
            }
        });
        //新增按钮
        form.on('submit(set_AddNew)', function () {//提交
            layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                location.replace('Gy_UserByOrg.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
            });
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserByUser.html
@@ -42,6 +42,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">新增</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -332,6 +333,13 @@
                }
            });
            //新增按钮
            form.on('submit(set_AddNew)', function () {//提交
                layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                    location.replace('Gy_UserByUser.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
                });
            })
            //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserByWorkStation.html
@@ -39,6 +39,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">新增</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -316,6 +317,13 @@
            }
        });
        //新增按钮
        form.on('submit(set_AddNew)', function () {//提交
            layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                location.replace('Gy_UserByWorkStation.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
            });
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserCustomer.html
@@ -42,6 +42,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">新增</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -331,6 +332,13 @@
                }
            });
            //新增按钮
            form.on('submit(set_AddNew)', function () {//提交
                layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                    location.replace('Gy_UserCustomer.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
                });
            })
            //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserDept.html
@@ -38,6 +38,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">新增</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -315,6 +316,13 @@
            }
        });
        //新增按钮
        form.on('submit(set_AddNew)', function () {//提交
            layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                location.replace('Gy_UserDept.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
            });
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserEmployee.html
@@ -38,6 +38,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">新增</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -315,6 +316,13 @@
            }
        });
        //新增按钮
        form.on('submit(set_AddNew)', function () {//提交
            layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                location.replace('Gy_UserEmployee.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
            });
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserGroup.html
@@ -38,6 +38,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">新增</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -315,6 +316,13 @@
            }
        });
        //新增按钮
        form.on('submit(set_AddNew)', function () {//提交
            layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                location.replace('Gy_UserGroup.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
            });
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserMater.html
@@ -42,6 +42,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">新增</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -331,6 +332,13 @@
                }
            });
            //新增按钮
            form.on('submit(set_AddNew)', function () {//提交
                layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                    location.replace('Gy_UserMater.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
                });
            })
            //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserProcess.html
@@ -42,6 +42,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">新增</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -331,6 +332,13 @@
                }
            });
            //新增按钮
            form.on('submit(set_AddNew)', function () {//提交
                layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                    location.replace('Gy_UserProcess.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
                });
            })
            //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserStock.html
@@ -39,6 +39,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">新增</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -316,6 +317,13 @@
            }
        });
        //新增按钮
        form.on('submit(set_AddNew)', function () {//提交
            layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                location.replace('Gy_UserStock.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
            });
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserSuplies.html
@@ -42,6 +42,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">新增</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -331,6 +332,13 @@
                }
            });
            //新增按钮
            form.on('submit(set_AddNew)', function () {//提交
                layer.confirm('新增后页面数据将消失?', { icon: 3, title: '提示' }, function (index) {
                    location.replace('Xt_UserSuplies.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
                });
            })
            //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -2006,10 +2006,10 @@
                    layer.msg("规格型号不能为空!");
                    return false;
                }
                if ($("#HUnitName").val() == "") {
                    layer.msg("计量单位没有选择");
                    return false;
                }
                //if ($("#HUnitName").val() == "") {
                //    layer.msg("计量单位没有选择");
                //    return false;
                //}
                //if ($("#HMainProcIDName").val() == "") {
                //    layer.msg("工序没有选择");
                //    return false;
@@ -2044,13 +2044,13 @@
                            layer.msg("第" + (i + 1) + "行:工序不能为空!");
                            return false;
                        }
                        //外协标记
                        if (option.data[i]["HSupFlag"]) {
                            if (option.data[i]["HSupID"] == "0") {
                                layer.msg("第" + (i + 1) + "行:供应商不能为空!");
                                return false;
                            }
                        }
                        ////外协标记
                        //if (option.data[i]["HSupFlag"]) {
                        //    if (option.data[i]["HSupID"] == "0") {
                        //        layer.msg("第" + (i + 1) + "行:供应商不能为空!");
                        //        return false;
                        //    }
                        //}
                        //else {
                        //    if (option.data[i]["HCenterID"] == "0") {
                        //        layer.msg("第" + (i + 1) + "行:工作中心不能为空!");
@@ -2059,36 +2059,36 @@
                        //}
                        //良率 å¤§äºŽ0  å°äºŽç­‰äºŽ100
                        if (parseInt(option.data[i]["HPassRate"]) <= 0) {
                            layer.msg("第" + (i + 1) + "行:良率必须大于0!");
                            return false;
                        }
                        if (parseInt(option.data[i]["HPassRate"]) > 100) {
                            layer.msg("第" + (i + 1) + "行:良率必须小于等于100!");
                            return false;
                        }
                        //if (parseInt(option.data[i]["HPassRate"]) <= 0) {
                        //    layer.msg("第" + (i + 1) + "行:良率必须大于0!");
                        //    return false;
                        //}
                        //if (parseInt(option.data[i]["HPassRate"]) > 100) {
                        //    layer.msg("第" + (i + 1) + "行:良率必须小于等于100!");
                        //    return false;
                        //}
                        //仓库重复
                        if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWasterWHID"] != 0) {
                        //if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWasterWHID"] != 0) {
                            if (option.data[i]["HBadWHID"] == option.data[i]["HWasterWHID"]) {
                                layer.msg("第" + (i + 1) + "行:不良品仓和报废品仓重复!");
                                return false;
                            }
                        }
                        if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWHID"] != 0) {
                            if (option.data[i]["HBadWHID"] == option.data[i]["HWHID"]) {
                                layer.msg("第" + (i + 1) + "行:不良品仓和良品仓重复!");
                                return false;
                            }
                        }
                        if (option.data[i]["HWasterWHID"] != 0 && option.data[i]["HWHID"] != 0) {
                            if (option.data[i]["HWasterWHID"] == option.data[i]["HWHID"]) {
                                layer.msg("第" + (i + 1) + "行:报废品仓和良品仓重复!");
                                return false;
                            }
                        }
                        //    if (option.data[i]["HBadWHID"] == option.data[i]["HWasterWHID"]) {
                        //        layer.msg("第" + (i + 1) + "行:不良品仓和报废品仓重复!");
                        //        return false;
                        //    }
                        //}
                        //if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWHID"] != 0) {
                        //    if (option.data[i]["HBadWHID"] == option.data[i]["HWHID"]) {
                        //        layer.msg("第" + (i + 1) + "行:不良品仓和良品仓重复!");
                        //        return false;
                        //    }
                        //}
                        //if (option.data[i]["HWasterWHID"] != 0 && option.data[i]["HWHID"] != 0) {
                        //    if (option.data[i]["HWasterWHID"] == option.data[i]["HWHID"]) {
                        //        layer.msg("第" + (i + 1) + "行:报废品仓和良品仓重复!");
                        //        return false;
                        //    }
                        //}
                    }
                }
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillimport.html
@@ -22,6 +22,7 @@
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">导入数据</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">文件上传</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="DownLoad" id="DownLoad">模板下载</button>
                        </div>
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
@@ -170,7 +171,12 @@
                debugger
                layer.alert('导入出现异常', { icon: 2 });
            }
        });
        });
        //下载
        form.on('submit(DownLoad)', function () {
            window.open("/files/工艺路线导入模板/导入模板.xlsx");
        })
        //退出
        form.on('submit(Cancel)', function () {
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html
@@ -677,7 +677,7 @@
                    , { field: '供应商', title: '供应商' }
                    , { field: '计划数量', title: '计划数量' }
                    , { field: '进站数量', title: '进站数量', edit: 'text' }
                    , { field: '出站数量', title: '出站数量' }
                    , { field: '出站数量', title: '已汇报数量' }
                ];
                option = {
                    id: 'mainTable'
@@ -721,6 +721,7 @@
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        PicUpload();
                    }
                });
                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮默认禁用
@@ -992,7 +993,7 @@
                                            , { field: '流转卡数量', title: '派工单数量',width:103 }
                                            , { field: '流水号', title: '流水号',width:50 }
                                            , { field: '工序名称', title: '工序名称',width:135 }
                                            , { field: '出站数量', title: '出站数量',width:90 }
                                            , { field: '出站数量', title: '已汇报数量',width:95 }
                                            , { field: '工作中心', title: '工作中心',width:145 }
                                            , { field: 'HOrderProcNO', title: '订单跟踪号', hide: true }
                                            , { field: 'hbillno', title: '派工单号', hide: true }
@@ -2081,7 +2082,7 @@
                                            option.cols[0][i + 1]["width"] = 135;
                                            break;
                                        case '出站数量':
                                            option.cols[0][i + 1]["width"] = 90;
                                            option.cols[0][i + 1]["width"] = 102;
                                            break;
                                        case '工作中心':
                                            option.cols[0][i + 1]["width"] = 145;
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Gy_ProcessBatchReport.html
New file
@@ -0,0 +1,678 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>批量汇报</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <style>
        .main-btn { /*头部主按钮*/
            padding: 0 2px; /*调整按钮左右空隙大小*/
            height: 30px;
            line-height: 30px;
        }
        .btn-title {
            font-size: 16px;
        }
        /* é˜²æ­¢ä¸‹æ‹‰æ¡†çš„下拉列表被隐藏---必须设置--- */
        .layui-table-cell {
            overflow: visible !important;
        }
        /* ä½¿å¾—下拉框与单元格刚好合适 */
        td .layui-form-select {
            margin-top: -10px;
            margin-left: -15px;
            margin-right: -15px;
        }
        .layui-form-item .layui-inline {
            margin-top: 5px;
            margin-bottom: 5px;
            margin-right: 0px;
        }
        .layui-form-label {
            width: 25%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                            <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">打印</button>-->
                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">隐藏列设置</button>-->
                        </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                            <li lay-id="2" style="padding:1px;">其他信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--基本信息-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">汇报日期</label>
                                            <div class="layui-input-inline">
                                                <input type="date" class="layui-input" name="HDate" id="HDate">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs6 layui-inline">
                                            <label class="layui-form-label" style="width:12.5%">备注</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" style="width:600px;">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--其他信息-->
                            <div class="layui-tab-item">
                                <div class="layui-form-item">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">制单人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">审核人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关闭人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">制单日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">审核日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关闭日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">作废人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">作废日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <!--<div class="layui-btn-container">
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                        </div>-->
                    </script>
                </form>
            </div>
        </div>
    </div>
</body>
</html>
<script type="text/html" id="barDemo">
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
</script>
<!--行下拉选择(是否委外)-->
<script type="text/html" id="HSupFlag">
    <select name="HSupFlag" lay-filter="HSupFlag" id="HSupFlag{{d.LAY_TABLE_INDEX+1}}">
        <option value="false">否</option>
        <option value="true">是</option>
    </select>
</script>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , laydate = layui.laydate
            , element = layui.element;
        var option;
        var StationOutID = [];
        var StationOutBillNo = [];
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        //初始化界面
        set_ClearBill();
        //获取组织
        Organ();
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = -1;//操作类型
        } else {
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HEntryID = params[params[2]];//源单子id
            var HIeID = params[params[3]]; //源单id + æºå•子id
            var HReportNum = params[params[4]]; //汇报数量
        }
        //工序派工新增
        if (OperationType == 1) {
            for (let i = 0; i < HReportNum; i++) {
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3791' },
                    async: false,
                    success: function (d) {
                        StationOutID.push(d.data[0].HInterID);
                        StationOutBillNo.push(d.data[0].HBillNo);
                    }
                });
            }
            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
            $("#HMaker").val(sessionStorage["HUserName"]);
            //查询工序流转卡
            get_ProcessExchange();
            //初始化界面
            set_ClearBill();
        } else if (OperationType == 3) {
            //禁用组织选项
            $("#HUSEORGID").attr("disabled", true);
            //初始化界面
            set_ClearBill();
            RoadBillMain(linterid);
        }
        //#endregion
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //头工具栏事件
        table.on('toolbar(mainTable)', function (obj) {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            //新增行表格数据
            var NewRow = {
                "lngBillKey": 0, "lngBillSubKey": 0, "HProcExchBillNo": "", "HSourceBillType": "",
                "HProcNo": 0, "HProcName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "",
                "HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "",
                "HPlanQty": 0, "HQty": 0, "HWasterQty": 0, "HICMOBillNo": "", "HICMOInterID": 0, "HICMOEntryID": 0,
                "HInterID": 0, "HBillNo": "", "HProcID": 0, "HCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "",
                "HICMOQty": 0, "HPlanQty": 0
            };
            switch (obj.event) {
                case 'btn-AddLine':
                    table.cache["mainTable"].push(NewRow);
                    option.data = table.cache["mainTable"];
                    table.render(option);
                    for (var i = 1; i <= option.data.length; i++) {
                        $('#HSupFlag' + i + '').find("option[value='" + option.data[i - 1].HSupFlag + "']").attr("selected", true);
                    }
                    form.render('select');
                    break;
                case 'btn-CopyLine':
                    var copydata = JSON.stringify(data);
                    if (data.length <= 0) {
                        layer.msg("请选择需要复制的一行!");
                    }
                    else if (data.length > 1) {
                        layer.msg("只能选择复制一行!");
                    }
                    else {
                        var copydata2 = copydata.substring(1, copydata.length);//去除首行字符'['
                        var copyrow = copydata2.substring(0, copydata2.length - 1);//去除末尾字符']'
                        table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                        option.data = table.cache["mainTable"];//将数据绑定到data上
                        table.render(option);//将数据渲染到表格上
                        for (var i = 1; i <= option.data.length; i++) {
                            $('#HSupFlag' + i + '').find("option[value='" + option.data[i - 1].HSupFlag + "']").attr("selected", true);
                        }
                        form.render('select');
                    }
                    break;
            }
        });
        //行内事件
        table.on('tool(mainTable)', function (obj) {
            var data = obj.data;
            var rowIndex = $(obj.tr).attr("data-index");
            if (obj.event === 'del') {
                layer.confirm('真的删除行吗?', function (index) {
                    if (rowIndex === '0') {
                        layer.msg('首行无法删除!!!');
                    } else {
                        obj.del();
                        option.data = table.cache["mainTable"];//将数据绑定到data上
                        layer.close(index);
                    }
                });
            } else if (obj.event == 'inputHQty') {
                $(obj.tr).find(".layui-table-edit").keyup(function () {
                    var $input = $(this), val = $input.val();
                    if (!val) {
                        val = "0";
                    }
                    if (val.length > 1) {
                        var firstNum = val.substring(0, 1); //截取字符串第一位数,判断是否为0;
                        if (firstNum == 0) { //如果第一位数为0,则删除第一位数
                            val = val.substring(1, val.length);
                        }
                    }
                    $input.val(val.replace(/[^\d]/g, ''));
                });
            } else if (obj.event == 'inputWasterHQty') {
                $(obj.tr).find(".layui-table-edit").keyup(function () {
                    var $input = $(this), val = $input.val();
                    if (!val) {
                        val = "0";
                    }
                    if (val.length > 1) {
                        var firstNum = val.substring(0, 1); //截取字符串第一位数,判断是否为0;
                        if (firstNum == 0) { //如果第一位数为0,则删除第一位数
                            val = val.substring(1, val.length);
                        }
                    }
                    $input.val(val.replace(/[^\d]/g, ''));
                });
            }
            //#region [ è¡¨ä½“F7事件 ]
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    if (obj.event == 'HSourceCheck') {
                        layer.open({
                            type: 2,
                            skin: 'layui-layer-rim', //加上边框
                            title: '生产资源列表',
                            closeBtn: 1,
                            shift: 2,
                            area: ['90%', '90%'],
                            maxmin: true,
                            content: ['../../../views/基础资料/生产基础资料/Gy_Source.html', 'yes'],
                            btn: ['确定', '取消']
                            , btn1: function (index, layero) {
                                //按钮【按钮一】的回调
                                var iframeWindow = window['layui-layer-iframe' + index];
                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                                if (checkStatus.data.length === 0) {
                                    return layer.msg('请选择数据');
                                }
                                obj.update({
                                    HSourceName: checkStatus.data[0].生产资源名称
                                    , HSourceID: checkStatus.data[0].HItemID
                                    , HSourceNumber: checkStatus.data[0].生产资源代码
                                });
                                layer.close(layer.index);
                            }
                            , btn2: function (index, layero) {
                            },
                            end: function () {
                            }
                        });
                    }
                    if (obj.event == 'HEmpNumber') {
                        layer.open({
                            type: 2,
                            skin: 'layui-layer-rim', //加上边框
                            title: '操作员列表',
                            closeBtn: 1,
                            shift: 2,
                            area: ['90%', '90%'],
                            maxmin: true,
                            content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html', 'yes'],
                            btn: ['确定', '取消']
                            , btn1: function (index, layero) {
                                //按钮【按钮一】的回调
                                var iframeWindow = window['layui-layer-iframe' + index];
                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                                if (checkStatus.data.length === 0) {
                                    return layer.msg('请选择数据');
                                }
                                obj.update({
                                    HEmpName: checkStatus.data[0].HName
                                    , HEmpID: checkStatus.data[0].HItemID
                                    , HEmpNumber: checkStatus.data[0].HNumber
                                });
                                layer.close(layer.index);
                            }
                            , btn2: function (index, layero) {
                            },
                            end: function () {
                            }
                        });
                    }
                    obj.event = "";
                    return false;
                }
            })
            //#endregion
        });
        //保存提交
        form.on('submit(btnSave)', function (data) {//提交
            if (AllowLoadData(data)) {
                set_AddNew(data);
            }
        });
        //退出
        form.on('submit(Cancel)', function (data) {
            if (OperationType != "") {
                Pub_Close(1);
            }
        });
        //打印
        form.on('submit(btn_print)', function (data) {
            get_print(data);
        });
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
        // åˆå§‹åŒ–界面
        function set_ClearBill() {
            $("#HDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//开始日期
            $("#HPlanBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//工序计划开工日期
            $("#HPlanEndDate").val(Format(new Date().setMonth(new Date().getMonth() + 1), "yyyy-MM-dd"));//工序计划完工日期
            //初始化表格
            set_InitGrid();
        }
        //获取组织
        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");
                }
            })
        }
        //初始化表格
        function set_InitGrid() {
            //表头
            columns = [ //表头
                { type: 'checkbox', totalRowText: '合计行' }
                , { type: 'numbers', title: '序号', totalRow: true }
                , { field: 'lngBillKey', title: '流转卡ID', hide: true }
                , { field: 'lngBillSubKey', title: '流转卡子ID', hide: true }
                , { field: 'HCenterID', title: '工作中心ID', hide: true }
                , { field: 'HWorkCenterName', title: '工作中心名称' }
                , { field: 'HProcExchBillNo', title: '派工单号', width: 150 }
                , { field: 'HSourceBillType', title: '单据类型', hide: true }
                , { field: 'HProcNo', title: '流水号', width: 80 }
                , { field: 'HICMOQty', title: '任务单数量', hide: true }
                , { field: 'HPlanQty', title: '计划数量', hide: true }
                , { field: 'HProcID', title: '工序ID', hide: true }
                , { field: 'HProcName', title: '工序名称' }
                , { field: 'HMaterID', title: '产品ID', hide: true }
                , { field: 'HMaterNumber', title: '产品代码'}
                , { field: 'HMaterName', title: '产品名称' }
                , { field: 'HMaterModel', title: '规格型号' }
                , { field: 'HQty', title: '合格数量', edit: 'text', width: 90, event:"inputHQty" }
                , { field: 'HWasterQty', title: '报废数量', edit: 'text', width: 90, event: "inputWasterHQty" }
                , { field: 'HEmpID', title: '操作员ID', hide: true }
                , { field: 'HEmpNumber', title: '操作员代码', edit: 'text', event: "HEmpNumber" }
                , { field: 'HEmpName', title: '操作员名称' }
                , { field: 'HPlanQty', title: '流转卡数量', width: 100 }
                , { field: 'HInterID', title: '工序汇报ID', hide: true }
                , { field: 'HBillNo', title: '工序汇报单号', width: 195 }
                , { field: 'HWorkCenterNumber', title: '工作中心代码', edit: 'text'}
                , { field: 'HSourceID', title: '生产资源ID', hide: true }
                , { field: 'HSourceNumber', title: '生产资源代码', edit: 'text', event: "HSourceCheck" }
                , { field: 'HSourceName', title: '生产资源名称' }
                , { field: 'HICMOBillNo', title: '任务单号', hide: true }
                , { field: 'HICMOInterID', title: '任务单ID', hide: true }
                , { field: 'HICMOEntryID', title: '任务单子内码', hide: true }
                //, { fixed: 'right', title: '操作', toolbar: '#barDemo' }
            ];
            option = {
                id: 'mainTable'
                , elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , page: false
                , cellMinWidth: 120
                , height: 400
                , cols: [columns]
                , limit: Number.MAX_VALUE//默认显示全部
                , done: function (res, curr, count) {
                    option.data = res.data;
                    //去掉下拉框失焦事件否则在下拉框里输入值
                    $('.layui-form-select').find('input').unbind("blur");
                    //表格重载回显下拉框里的数据
                    $('tr').each(function (e) {
                        var $cr = $(this);
                        var dataIndex = $cr.attr("data-index");
                        $.each(option.data, function (index, value) {
                            if (value.LAY_TNDEX == dataIndex) {
                                $cr.find('input').val(value.HSupFlag);
                            }
                        });
                    });
                }
                , done: function (res, curr, count) {
                }
            };
            option.data = [{
                "lngBillKey": 0, "lngBillSubKey": 0, "HProcExchBillNo": "", "HSourceBillType": "",
                "HProcNo": 0, "HProcName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "",
                "HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "",
                "HPlanQty": 0, "HQty": 0, "HWasterQty": 0, "HICMOBillNo": "", "HICMOInterID": 0, "HICMOEntryID": 0, "HInterID": 0,
                "HBillNo": "", "HProcID": 0, "HCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "", "HICMOQty": 0, "HPlanQty": 0
            }];
            table.render(option);
        }
        //查询工序流转卡
        function get_ProcessExchange() {
            var sWhere = "  where hmainid in (" + linterid + ") and  HEntryID in (" + HEntryID + ") and ieid in (" + HIeID + ")";
            //编辑加载数据
            $.ajax({
                url: GetWEBURL() + 'Sc_ProcExchSendWorkBill/GetProcessExchangeBillSub',
                type: "GET",
                data: { "sWhere": sWhere },
                success: function (result) {
                    if (result.count == 1) {
                        var rowdata = [];
                        for (var i = 0; i < result.data.length; i++) {
                            rowdata.push(
                                {
                                    "lngBillKey": result.data[i]["hmainid"], "lngBillSubKey": result.data[i]["HEntryID"], "HProcExchBillNo": result.data[i]["单据号"], "HSourceBillType": result.data[i]["HBillType"],
                                    "HProcNo": result.data[i]["流水号"], "HProcName": result.data[i]["工序名称"], "HMaterID": result.data[i]["HMaterID"], "HMaterNumber": result.data[i]["产品代码"], "HMaterName": result.data[i]["产品名称"], "HMaterModel": result.data[i]["规格型号"],
                                    "HSourceID": result.data[i]["HSourceID"], "HSourceNumber": result.data[i]["生产资源代码"], "HSourceName": result.data[i]["生产资源"], "HEmpID": result.data[i]["HWorkerID"], "HEmpNumber": result.data[i]["操作工代码"], "HEmpName": result.data[i]["操作工"],
                                    "HPlanQty": result.data[i]["流转卡数量"], "HQty": 0, "HWasterQty": 0, "HICMOBillNo": result.data[i]["任务单号"], "HICMOInterID": result.data[i]["hicmointerid"], "HICMOEntryID": result.data[i]["HICMOEntryID"], "HBillNo": StationOutBillNo[i], "HInterID": StationOutID[i], "HProcID": result.data[i]["HProcID"], "HCenterID": result.data[i]["HCenterID"], "HWorkCenterNumber": result.data[i]["工作中心代码"], "HWorkCenterName": result.data[i]["工作中心"]
                                }
                            )
                        }
                        option.data = rowdata;
                        table.render(option);
                        form.render('select');
                    } else {
                        layer.msg(result.code + result.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index0);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //非空验证
        function AllowLoadData(data) {
            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i] != "") {
                    //流水号不为空
                    if (option.data[i]["HProcNo"] == "") {
                        layer.msg("第" + (i + 1) + "行:流水号不能为空!");
                        return false;
                    }
                    //工序不为空
                    if (option.data[i]["HProcID"] == "0") {
                        layer.msg("第" + (i + 1) + "行:工序不能为空!");
                        return false;
                    }
                    //操作员不为空
                    if (option.data[i]["HEmpID"] == "0") {
                        layer.msg("第" + (i + 1) + "行:操作员不能为空!");
                        return false;
                    }
                    //派工单号不为空
                    if (option.data[i]["lngBillKey"] == "0") {
                        layer.msg("第" + (i + 1) + "行:派工单不能为空!");
                        return false;
                    }
                    //物料不为空
                    if (option.data[i]["HMaterID"] == "0") {
                        layer.msg("第" + (i + 1) + "行:物料不能为空!");
                        return false;
                    }
                    //合格数量+报废数量必须大于0
                    if (option.data[i]["HQty"] + option.data[i]["HWasterQty"] == "0") {
                        layer.msg("第" + (i + 1) + "行:合格数量+报废数量必须大于0!");
                        return false;
                    }
                }
            }
            return true;
        }
        //保存HMaker
        function set_AddNew(data) {
            var num_1 = [];
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    num_1.push(table.cache["mainTable"][i])
                }
            }
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num_1);
            var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + sSubStr + ";" + OperationType;
            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Cj_StationOutBill/BatchAddBill",
                async: true,
                data: { "oMain": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {
                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                        layer.close(index);
                        layer.msg("提交成功");
                    }
                    else {
                        layer.close(index);
                        layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
        }
        function get_UrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }
        //#endregion
    })
</script>
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
@@ -221,7 +221,7 @@
            //
            var HModName = "Sc_ProcessExchangeBillList";
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆä¸»è¡¨ï¼‰
            var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "生产车间代码", "生产车间", "材质", "成品编号", "版本", "总装图号", "图号版本", "子件代码", "子件名称", "子件规格", "批号", "委外加工单位代码", "委外加工单位", "设备名称", "设备代码", "原料批次", "补料标记", "项目编号", "主要材料", "关键材料", "产品CODE", "销售订单号", "客户简称", "客户要求材料成分", "产品名称2", "客户名称", "生产备注", "重要提示", "原材料编号A", "原材料编号B", "原材料编号C", "原材料编号D", "原材料内码A", "原材料内码B", "原材料内码C", "原材料内码D", "日计划工单号", "客户编码", "芯体规格型号", "芯体物料代码", "源单客户代码", "HEmpID","HCusID"];
            var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "生产车间代码", "材质", "成品编号", "版本", "总装图号", "图号版本", "子件代码", "子件名称", "子件规格", "批号", "委外加工单位代码", "委外加工单位", "设备名称", "设备代码", "原料批次", "补料标记", "项目编号", "主要材料", "关键材料", "产品CODE", "销售订单号", "客户简称", "客户要求材料成分", "产品名称2", "客户名称", "生产备注", "重要提示", "原材料编号A", "原材料编号B", "原材料编号C", "原材料编号D", "原材料内码A", "原材料内码B", "原材料内码C", "原材料内码D", "日计划工单号", "客户编码", "芯体规格型号", "芯体物料代码", "源单客户代码", "HEmpID","HCusID"];
             //不需要显示的字段 å¯æ‰©å±• ï¼ˆå·¥è‰ºæµç¨‹ï¼‰
            var titleData2 = ["工序号", "出站报废关联数量", "HProcID", "工序代码", "HBackProc", "加工说明", "模具编号", "HCenterID", "工作中心代码", "HDeptID", "加工车间代码", "加工车间", "HGroupID", "班组代码", "班组", "HWorkerID", "操作工代码f", "操作工", "HSourceID", "生产资源代码", "生产资源", "计划数量", "hmainid", "单据号", "hicmointerid", "任务单号", "HICMOEntryID", "HWorkShopID", "生产车间代码", "生产车间", "HMaterID", "产品代码", "产品名称", "规格型号", "批号", "HUnitID", "单位代码", "单位", "生产数量", "计划开工日期", "计划完工日期", "摘要", "内部单据号", "委外订单内码", "委外订单子内码", "委外订单号", "HSupID", "供应商", "供应商代码", "表头备注", "HBillType", "isEntrust", "时间单位", "工序计划加工时间", "子计划开工日期", "子计划完工日期", "实际开工日期", "实际完工日期", "开工余量天数", "开工余量固数", "上道固定天数", "生产周期", "加工单价", "最后汇报日期", "加工费用金额", "末道工序", "首道工序", "行关闭人", "关闭类型", "流转卡数量", "委外工单数量", "不合格数量", "超额比例", "良率", "累计良率", "图纸编号", "本工序确认记录", "源单主内码", "源单子内码", "源单单号", "源单类型", "汇报数量", "HEntryID", "hsubid", "HPRDORGID", "组织", "HOrderProcNO"];
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆå™¨å…·æ¸…单)
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeIssueBillList.html
@@ -105,8 +105,9 @@
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Issue"><i class="layui-icon layui-icon-file-b"></i>下达</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelIssue"><i class="layui-icon layui-icon-file-b"></i>反下达</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SendWork"><i class="layui-icon layui-icon-file-b"></i>工序派工</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_PlanDate"><i class="layui-icon layui-icon-file-b"></i>指派日期</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SendWork"><i class="layui-icon layui-icon-file-b"></i>工序派工</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchReport"><i class="layui-icon layui-icon-file-b"></i>批量汇报</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-file-b"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                   <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print_Convenient"><i class="layui-icon layui-icon-print"></i>一键打印</button>
@@ -181,6 +182,9 @@
                    //工序派工
                    case 'set_SendWork': set_SendWork();
                        break;
                    //批量汇报
                    case 'set_BatchReport': set_BatchReport();
                        break;
                    //指派日期
                    case 'set_PlanDate': set_PlanDate();
                        break;
@@ -793,7 +797,7 @@
                }               
                var HEntryID = array.join(",");//用逗号分割数组
                var HInterID = interid.join(",");
                var HIeID = ieid.join(",");
                var HIeID = ieid.join(",");
                if (checkStatus.data.length >= 1) {
                    if (checkStatus.data[0]["流水号"] != "9999") {
                        layer.open({
@@ -821,6 +825,49 @@
                }
            }            
            
            //批量汇报
            function set_BatchReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var array = [];
                var interid = [];
                var ieid = [];
                for (let i = 0; i < data.length; i++) {
                    array.push(checkStatus.data[i]["HEntryID"]);   //获取流转卡子表ID
                    interid.push(checkStatus.data[i]["hmainid"]);
                    ieid.push(checkStatus.data[i]["hmainid"].toString() + checkStatus.data[i]["HEntryID"].toString());
                }
                var HEntryID = array.join(",");//用逗号分割数组
                var HInterID = interid.join(",");
                var HIeID = ieid.join(",");
                var HReportNum = checkStatus.data.length;//选择批量汇报数量
                if (checkStatus.data.length >= 1) {
                    if (checkStatus.data[0]["流水号"] != "9999") {
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "批量汇报"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["100%", "100%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ['../../车间管理/工序流转卡/Gy_ProcessBatchReport.html?OperationType=1&linterid=' + HInterID.toString() + '&HEntryID=' + HEntryID.toString() + '&HIeID=' + HIeID + '&HReportNum=' + HReportNum, "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //刷新表格数据
                                DisPlay_HideColumn();
                                //更新表格缓存的数据
                                layer.close(index);//关闭弹窗
                            }
                        })
                    } else {
                        layer.msg('汇报工序不能是转工序!');
                    }
                } else {
                    layer.msg('请选择数据编辑!');
                }
            }
            //#region æŒ‡æ´¾æ—¥æœŸ
            function set_PlanDate() {
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_EmployeePiecePayReport.html
@@ -224,7 +224,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/EmployeePiecePayReport',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_EmployeePiecePaySumReport.html
@@ -224,7 +224,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/EmployeePiecePaySumReport',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_EmployeePieceWorkReport.html
@@ -224,7 +224,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/EmployeePieceWorkReport',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_WorkShopProcessWIPReport.html
@@ -224,7 +224,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/WorkShopProcessWIPReport',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_WorkShopProcessWIPSumReport.html
@@ -224,7 +224,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/WorkShopProcessWIPSumReport',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {