出站汇报单导出,工序基础资料别的页面打开过滤,工艺路线编辑工序号顺序强控,批量驳回,工艺路线导出
5个文件已修改
336 ■■■■■ 已修改文件
WebTM/views/基础资料/生产基础资料/Gy_Process.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 170 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html 153 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.html
@@ -1190,7 +1190,7 @@
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HOrgID = params[params[1]];
                if (typeof (openType) != "undefined") {
                    return  " and æ˜Žç»†æ ‡è®° = 'Y' and ç¦ç”¨æ ‡è®° = 'Y'";
                    return  " and æ˜Žç»†æ ‡è®° = 'Y' and ç¦ç”¨æ ‡è®° != 'Y'";
                }
                return "";
            }
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -72,6 +72,11 @@
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">反审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">关闭</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">反关闭</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_Copy" id="set_Copy">复制</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckFlowInfo" id="set_CheckFlowInfo">查看审批进度</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill_Flow" id="set_CheckBill_Flow">多级审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck_Flow" id="set_AbandonCheck_Flow">多级反审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_RejectCheck_Flow" id="set_RejectCheck_Flow">驳回</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
@@ -787,6 +792,7 @@
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                        $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
                    }
                });
            }
@@ -988,6 +994,29 @@
                set_CancelCloseBill(data);
            });
            //查看审批进度
            form.on('submit(set_CheckFlowInfo)', function (data) {
                set_CheckFlowInfo();
            });
            //多级审核
            form.on('submit(set_CheckBill_Flow)', function (data) {
                set_CheckBill_Flow(0);
            });
            //多级反审核
            form.on('submit(set_AbandonCheck_Flow)', function (data) {
                set_CheckBill_Flow(1);
            });
            //驳回
            form.on('submit(set_RejectCheck_Flow)', function (data) {
                set_RejectCheck_Flow();
            });
            //复制
            form.on('submit(set_Copy)', function (data) {
                set_Copy();
            });
            //是否默认工艺
            form.on('checkbox(checkboxHStandard)', function (data) {
@@ -1342,11 +1371,24 @@
            //保存提交
            form.on('submit(btnSave)', function (data) {//提交
                if (AllowLoadData(data)) {
                    set_AddNew(data);
                const procNos = table.cache["mainTable"].map(item => item.HProcNo);
                if (isSortedAscending(procNos)) {
                    if (AllowLoadData(data)) {
                        set_AddNew(data);
                    }
                } else {
                    layer.msg('请注意流水号次序');
                }
            });
            // å‡½æ•°ï¼šåˆ¤æ–­æ•°ç»„是否从小到大排序
            function isSortedAscending(arr) {
                for (let i = 0; i < arr.length - 1; i++) {
                    if (arr[i] > arr[i + 1]) {
                        return false;
                    }
                }
                return true;
            }
            //退出
            form.on('submit(btnEdit)', function (data) {
                if (params[1] != null) {
@@ -1865,6 +1907,128 @@
                })
            }
            //#region å¤šçº§ åå®¡æ ¸/审核数据
            function set_CheckBill_Flow(num) {
                var InterID = $("#HInterID").val();
                if (InterID != 0) {
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/AuditFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择请选择在审批流的单据审核!');
                }
            }
            //#endregion
            //#region é©³å›ž
            function set_RejectCheck_Flow() {
                var InterID = $("#HInterID").val();
                if (InterID != 0) {
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                });
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择在审批流的单据驳回!');
                }
            }
            //#endregion
            //#region å¤åˆ¶
            function set_Copy() {
                //制单人
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#hmakers").val(sessionStorage["HUserName"]);
                $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
                //设置hinterid
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    async: false,
                    data: { "HBillType": '3301' },
                    success: function (d) {
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                    }
                });
                OperationType = 2;
            }
            //#endregion
            //#region æŸ¥çœ‹å®¡æ‰¹è¿›åº¦
            function set_CheckFlowInfo() {
                var InterID = $("#HInterID").val();
                if (InterID != 0) {
                    layer.open({
                        type: 2
                        , area: ['70%', '70%']
                        , title: '单据审批进度'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../系统管理/多级审批/审批进度/Xt_CheckFlowProgressList.html?linterid=' + InterID + '&HSouceBillType=3301'
                        , resize: false,
                        end: function () {
                            ////修改为功后刷新界面
                            //if (get_needClose_Bar == 0) {
                            //    $("#btnSearch").trigger('click');
                            //} else if (get_needClose_Bar == 1) {
                            //    $("#get_needClose").trigger('click');
                            //}
                        }
                        , cancel: function () {
                        }
                    })
                } else {
                    layer.msg('请选择正确数据查看!');
                }
            }
            //#endregion
            //行内删除快捷键
            function set_GridCellCheck(obj) {
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillCheckQuery.html
@@ -944,13 +944,14 @@
            function set_RejectCheck_Flow(tableName) {
                var checkStatus = table.checkStatus(tableName)
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                if (checkStatus.data.length !=0 ) {
                    var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//将对象数组id提取去重
                    var queryString = uniqueIds.join(",");//将ids变成数组
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
                        url: GetWEBURL() + "/Gy_Routing/RejectAllCheckFlow", //方法所在页面和方法名
                        data: { "HInterIDS": queryString, "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -1594,7 +1594,7 @@
                return data;
            }
            //#endregin
            //#endregion
            //#region å‘起审批
            function set_startCheckBill() {
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html
@@ -2424,7 +2424,7 @@
            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Cj_StationOutBillList_ExportExcel";
                var data = getExportData();
                //逻辑审核方法
                $.ajax({
                    type: "GET",
@@ -2432,7 +2432,6 @@
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = option.data
                            data.forEach((item) => {
                                for (let itemobj in item) {
                                    if (item[itemobj] == null) {
@@ -2458,6 +2457,156 @@
            }
            //#endregion
            //#region èŽ·å–å¯¼å‡ºæ•°æ®
            function getExportData() {
                var data;;//导出的数据
                var ajaxLoad = layer.load();
                if (typeof (params[params[0]]) != "undefined" && lookDownBar == 0) {
                    $("#HProcExchBillNo").val(params[params[0]]);
                    $("#HBeginDate").val("1990-01-01");
                    $("#HEndDate").val("2200-12-30");
                    lookDownBar = 1;
                }
                var HStatus = $("select[name='HStatus']").val();//状态
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HWorkBillNo = $("#HWorkBillNo").val();
                var HBillNo = $("#HBillNo").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//复选框
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val();
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val();
                var ColContent1 = $("#ColContent1").val();
                var HNumber = $("#HNumber").val(); //产品代码 å³ç‰©æ–™ç¼–码
                var HName = $("#HName").val(); //当前工序
                var HEmpNumber = $("#HEmpNumber").val(); //操作员代码
                var HEmpName = $("#HEmpName").val(); //操作员名称
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com = "";
                    switch (Comparator1) {
                        case "7":
                            com = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com;
                }
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),出站时间, 23) >= '" + HBeginDate + "'";
                }
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),出站时间, 23) <= '" + HEndDate + "'";
                }
                if (HWorkBillNo) {
                    sWhere += " and ä»»åŠ¡å• like '%" + HWorkBillNo + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
                if (HProcExchBillNo) {
                    sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
                }
                if (HProcExchBillNo) {
                    sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
                }
                if (checkHWasterQty) {
                    sWhere += "  and æŠ¥åºŸæ•°é‡>0 ";
                }
                if (HNumber) {
                    sWhere += " and äº§å“ä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and å½“前工序 like '%" + HName + "%'";
                }
                if (HEmpNumber) {
                    sWhere += " and æ“ä½œå‘˜ä»£ç  like '%" + HEmpNumber + "%'";
                }
                if (HEmpName) {
                    sWhere += " and æ“ä½œå‘˜ like '%" + HEmpName + "%'";
                }
                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //全部
                            sWhere += "";
                            break;
                        case '0':    //未审核
                            sWhere += " and å®¡æ ¸äºº='";
                            break;
                        case '1':    //已审核
                            sWhere += " and å®¡æ ¸äºº<>'";
                            break;
                        case '2':    //已关闭
                            sWhere += " and å…³é—­äºº<>'";
                        default:
                    }
                }
                sWhere += "  and HBillSubType<>'SUB'";
                //查询语句
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
                    success: function (data1) {
                        if (data1.count == 1) {
                            data = data1.data;//列字段数据
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";
                return data;
            }
            //#endregion
            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';