yxj
2023-10-13 8499d2746c9ec190bcdda6c57aca44dbcfe65473
新增工序异常过站报表模块
5个文件已修改
1个文件已添加
518 ■■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index_QiaoYi.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Kf_MateOutSumReport_QiaoYi.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_ProcessErrStationReport.html 510 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -283,6 +283,7 @@
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillList_His.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillSubList.html" />
    <Content Include="views\车间管理\工序流转\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProcessErrStationReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_MateOutSumReport_QiaoYi.html" />
    <Content Include="views\车间管理\报表分析\Kf_BrushingOutReport.html" />
    <Content Include="views\车间管理\产线组装追溯\Cj_AssemblyTraceability.html" />
WebTM/views/index.html
@@ -548,6 +548,7 @@
                                        <dd><a lay-href="车间管理/报表分析/Sc_WorkShopProcessWIPReport.html">生产车间工序报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Sc_WorkShopProcessWIPSumReport.html">工序在制品报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Sc_EmployeePieceWorkReport.html">工序汇报日报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Sc_ProcessErrStationReport.html">工序异常过站报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Sc_EmployeePiecePayReport.html">计件工资报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Sc_EmployeePiecePaySumReport.html">计件工资汇总报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/sc_ICOMReport.html">(按生产订单)客户订单报表</a></dd>
WebTM/views/index_QiaoYi.html
@@ -489,6 +489,7 @@
                                                <dd><a lay-href="车间管理/报表分析/sc_ICOMRKReport.html">生产入库报表</a></dd>
                                                <dd><a lay-href="车间管理/报表分析/SC_DayRkReport.html">生产日记</a></dd>
                                                <dd><a lay-href="车间管理/报表分析/SemiFinishedProductsReport.html">半成品报表</a></dd>
                                                <dd><a lay-href="车间管理/报表分析/Sc_ProcessErrStationReport.html">工序异常过站报表</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
@@ -504,6 +505,7 @@
                                                <dd><a lay-href="车间管理/报表分析/Kf_ProdProcessSumReport_DyeColor.html">染厂汇总报表</a></dd>
                                                <dd><a lay-href="车间管理/报表分析/Kf_ProdProcessEntryReport_DyeColor.html">染厂明细报表</a></dd>
                                                <dd><a lay-href="车间管理/报表分析/Kf_ProdProcessSumReport_DyeColor_third.html">染厂产量报表</a></dd>
                                                <dd><a lay-href="车间管理/报表分析/Kf_MateOutSumReport_QiaoYi.html">领料统计报表</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Kf_MateOutSumReport_QiaoYi.html
@@ -70,7 +70,7 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width:10px;">吨</label>
                                    <label class="layui-form-label" style="width:30px;">公斤</label>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -401,7 +401,6 @@
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));   //结束日期
                $("#HMaterNumber").val("");         //物料代码
                $("#HMaterName").val("");           //物料名称
                $("#HStockOrgID").val(sessionStorage["Organization"])   //组织
                form.render('select');
            }
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_ProcessErrStationReport.html
New file
@@ -0,0 +1,510 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>工序异常过站报表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <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/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <style>
        .layui-form-select .layui-input {
            padding-right: 15px;
            cursor: pointer;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width:50px;">工序</label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="float: left; width: 190px; background-color: #efefef4d; display: inline-block;" readonly>
                                        <input type="hidden" name="HProcID" id="HProcID" value="0">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcID" id="btnHProcID" style="width: 40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:40px;width:60px;padding:0 10px">查询</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="width: 60px; padding: 0 10px">重置</button>
                            </div>
                        </div>
                        <table class="" 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_Export" id="Export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>查询</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>保存列宽</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>默认列宽</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        //#region æŠ˜å æ³¨é‡Š
        //#endregion
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
        //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            var sWhere = "";
            var option = [];
            var ins;                        //用于导出excel
            var columns = "";
            var HModName = "Sc_ProcessErrStationReport";
            var titleData = [];     //不需要显示的字段
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化界面
            set_ClearBill();
            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
            }
            //#endregion
            //#region åˆå§‹åŒ–表格
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , totalRow: true
                    , height: 'full-50'
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                };
            }
            //#endregion
            //#region èŽ·å–åˆ—å®½
            function getColumnsWidth() {
                var result = [];
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                //获取列宽
                $.ajax({
                    type: "Get",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
                    async: false,
                    dataType: "json",
                    data: { "colNum": colNum, "Name": HModName },
                    success: function (data1) {
                        if (data1.code == 1) {
                            result = data1.data;
                        }
                        else if (data1.code == -1) {
                        }
                        else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                return result;
            }
            //#endregion
            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    async: false,
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                ////设置列宽
                                //if (dataCols[3] > 0) {
                                //    option.cols[0][i + 1]["width"] = dataCols[3];
                                //}
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }
                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion
        //#endregion
        //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            //#region å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //导出按钮
                    case 'btn_Export': get_Export();
                        break;
                    //查询按钮
                    case 'btn_Query': get_Display();
                        break;
                    //退出按钮
                    case 'btn_Exit': Pub_Close(2);
                        break;
                    //保存列宽按钮
                    case 'btn-Cell': set_SaveGridColWidth();
                        break;
                    //默认列宽按钮
                    case 'btn-RefreshCell': set_DefaultGridColWidth();
                        break;
                    //列设置
                    case 'btn_HideColumn': get_HideColumn();
                        break;
                };
            });
            //#endregion
            //#region å¯¼å‡ºExecel
            function get_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_Display();
            });
            //#region æŸ¥è¯¢
            function get_Display() {
                var HProcID = $("#HProcID").val();      //工序ID
                sWhere = "'" + HProcID + "'";
                var ajaxLoad = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReportController/GetSc_ProcessErrStationReport_Json',
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                //动态获取列表所有列名
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //获取不需要显示的列(H开头的列不显示)
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            //if (data[i].name == '克重') {
                                            //    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                            //} else {
                                            //    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            //}
                                    }
                                }
                            }
                            columns = col;
                            //设置赋值列宽
                            var colWidth = getColumnsWidth();
                            if (colWidth == "" || colWidth == []) {
                            }
                            else {
                                $.each(columns, function (x, m) {
                                    m["width"] = colWidth[x];
                                });
                            }
                            option.cols = [columns];
                            option.data = data1.data;
                            option.totalRow = true;
                            table.render(option);
                            ins = table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    },
                    error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                DisPlay_HideColumn();
            }
            //#endregion
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                //清空过滤条件
                set_ClearQuery();
            });
            //重置过滤条件
            function set_ClearQuery() {
                $("#HProcName").val("");    //工序名称
                $("#HProcID").val("0");     //工序ID
            }
            //#endregion
            //#region ä¿å­˜åˆ—宽
            function set_SaveGridColWidth() {
                var arr = [];
                // åˆ—æ•°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
                    if (colName != "" && colName != null) {
                        arr.push(colWidth == -1 ? 200 : colWidth);
                    }
                }
                arr.unshift(40); //首位追加
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
                    success: function (data1) {
                        if (data1.count == 1) {
                            //layer.alert(data1.Message, { icon: 1 });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //设置赋值列宽
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {
                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                //location.reload();
            }
            //#endregion
            //#region é»˜è®¤åˆ—宽
            function set_DefaultGridColWidth() {
                var arr = [];
                // åˆ—æ•°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    if (colName != "" && colName != null) {
                        arr.push(200);   //默认宽度200
                    }
                }
                arr.unshift(40); //首位追加
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
                    success: function (data1) {
                        if (data1.count == 1) {
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //设置赋值列宽
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {
                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                location.reload();
            }
            //#endregion
            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //#endregion
            //#region é€‰æ‹©å·¥åºå¼¹çª—
            form.on('submit(btnHProcID)', function () {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '工序'
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../Baseset/基础资料/Gy_ProcList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
                })
            });
            //#endregion
        //#endregion
        });
        //返回工序
        function GetHProcValue(obj) {
            $("#HProcName").val(obj[0].工序);
            $("#HProcID").val(obj[0].HItemID);
        }
    </script>
</body>
</html>
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_Fast.html
@@ -479,6 +479,7 @@
                    , { field: 'HQtyMust', title: '下架数量', width: 150, totalRow: true }
                    , { field: 'HWhName', title: '仓库', width: 150 }
                    , { field: 'HSPName', title: '仓位', width: 150 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                    , { field: 'HMaterName', title: '物料名称', width: 150 }
                    , { field: 'HMaterModel', title: '规格型号', width: 150 }
                    , { field: 'HBatchNo', title: '批次', width: 150 }