1
yangle
2024-07-24 4fc3d2d917b4fd9ce151ce205e3d252e3dc64c5f
1
6个文件已修改
357 ■■■■ 已修改文件
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html 284 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html
@@ -752,6 +752,7 @@
                        , { field: '业务员', title: '业务员', sort: true }
                        , { field: 'HWidth', title: '门幅', sort: true }
                        , { field: '规格型号', title: '规格型号', sort: true }
                        , { field: '特殊订单', title: '特殊订单', sort: true, width: 150 }
                        , { field: '生产任务单数量', title: '生产订单数量', totalRow: true, sort: true, totalRow: true }
                        , { field: '流转卡数量', title: '流转卡数量', totalRow: true, sort: true, totalRow: true }
                        , { field: '生产入库数量', title: '生产入库数量', totalRow: true, sort: true, totalRow: true }
@@ -2666,8 +2667,8 @@
            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            function setSelect_HInitTimeCycle() {
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
                var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天"];
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29,365];
                var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天","近一年"];
                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >任意间隔</option>';
                for (var i = 0; i < valueList.length; i++) {
WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_CheckProjectList.html
@@ -271,7 +271,7 @@
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + "/QC_Management/MES_QC_CheckProjectList_Json",
                    url: GetWEBURL() + "/QC_Management/MES_QC_CheckProjectList_Json_Main",
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (result) {
WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_InspectionFormReport.html
@@ -97,8 +97,6 @@
                                            <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="HUpLimit" id="HUpLimit" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" class="layui-input" name="HControlUpperLimit" id="HControlUpperLimit">
                                                <input type="hidden" class="layui-input" name="HControlLowerLimit" id="HControlLowerLimit">
                                            </div>
                                        </div>
                                    </div>
@@ -134,15 +132,21 @@
                                    </div>
                                    <div class="layui-row" style="margin-top:5px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">Std.Dev</label>
                                            <label class="layui-form-label" style="width: 85px;">控制上限</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" id="HStdDev" name="HStdDev" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HControlUpperLimit_X" id="HControlUpperLimit_X">
                                            </div>
                                        </div>
                                        <div class="layui-inline" style="margin-left: 48px;">
                                            <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="HControlLowerLimit_X" id="HControlLowerLimit_X">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">Sigma</label>
                                            <label class="layui-form-label" style="width: 85px;">X中心线</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" id="HSigma" name="HSigma" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HCenterline_X" id="HCenterline_X">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -151,36 +155,30 @@
                                                <input type="text" class="layui-input" name="HPPK" id="HPPK" 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="HPP" id="HPP" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">C a</label>
                                            <label class="layui-form-label" style="width: 85px;">控制上限</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" id="HCA" name="HCA" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HControlUpperLimit_S" id="HControlUpperLimit_S">
                                            </div>
                                        </div>
                                        <div class="layui-inline" style="margin-left: 48px;">
                                            <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="HControlLowerLimit_S" id="HControlLowerLimit_S">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">S中心线</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCenterline_S" id="HCenterline_S">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">C P K</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" id="HCPK" name="HCPK" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">C P</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCP" id="HCP" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">Grade</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HGrade" id="HGrade" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -421,6 +419,8 @@
                                optionS[0] = data1.data[limit + 2];
                                table.render(option);
                                set_Line();
                                set_PPK();
                                set_CPK();
                            }
                          
                        } else {
@@ -432,6 +432,197 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //PPK计算 x
            function set_PPK() {
                var x_AVG =0;
                var x_SUM = 0;
                var x_PPK = 0;
                var numCount = 0
                var c4 = [0.7979, 0.8862, 0.9213, 0.9400, 0.9515, 0.9594, 0.9650, 0.9693, 0.9727, 0.9754, 0.9776, 0.9794, 0.9810, 0.9823, 0.9835, 0.9845, 0.9854, 0.9862, 0.9869, 0.9876, 0.9882, 0.9887, 0.9892, 0.9896];
                for (var j = 1; j < option.cols[0].length; j++) {
                    if (optionAVG.length != 0 || optionS.length != 0) {
                        x_AVG = calc(x_AVG, parseFloat(optionAVG[0][option.cols[0][j].field]), "+");
                    }
                }
                x_AVG = calc(x_AVG, (option.cols[0].length - 1), "/");
                x_AVG = $("#HCenterline_X").val() == "" ? x_AVG : parseFloat($("#HCenterline_X").val());
                $("#HCenterline_X").val(x_AVG);
                for (var i = 1; i < option.cols[0].length; i++) {
                    for (var j = 0; j < option.data.length - 3; j++) {
                        numCount += 1;
                        x_SUM = calc(x_SUM, parseFloat(((parseFloat(option.data[j][option.cols[0][i].field]) - x_AVG) ** 2).toFixed(6)), "+")
                    }
                }
                x_PPK = Math.sqrt(calc(x_SUM, (numCount - 1), "/"));
                var limit = $("#limit").val();
                if (parseInt(limit) >= 9) {
                    $("#HCenterline_S").val(x_PPK.toFixed(4));
                }
                //上限
                if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
                    var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
                    $("#HPPK").val(HUpLimit.toFixed(4));
                }
                //下限
                else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
                    var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
                    $("#HPPK").val(HDownLimit.toFixed(4));
                } else {
                    var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
                    var HDownLimit = (x_AVG - calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+")) / ((3 * x_PPK) / c4[option.data.length - 4]);
                    $("#HPPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
                }
            }
             //CPK计算 s
            function set_CPK() {
                var x_AVG = 0;
                var s_AVG = 0;
                var s_CPK = 0;
                var d2 = [1.128, 1.693, 2.059, 2.326, 2.534, 2.704, 2.847, 3.078, 3.173, 3.258, 3.336, 3.407, 3.472, 3.532, 3.588, 3.640, 3.689, 3.735, 3.778, 3.819, 3.858, 3.895, 3.931];
                for (var j = 1; j < option.cols[0].length; j++) {
                    if (optionAVG.length != 0 || optionS.length != 0) {
                        s_AVG = calc(s_AVG, parseFloat(optionS[0][option.cols[0][j].field]), "+");
                    }
                }
                s_AVG = calc(s_AVG, (option.cols[0].length - 1), "/")
                s_AVG = $("#HCenterline_S").val() == "" || "0" ? s_AVG : parseFloat($("#HCenterline_S").val());
                $("#HCenterline_S").val(s_AVG);
                var limit = $("#limit").val();
                if (parseInt(limit) < 9) {
                    $("#HCenterline_S").val(s_AVG.toFixed(4));
                }
                for (var j = 1; j < option.cols[0].length; j++) {
                    if (optionAVG.length != 0 || optionS.length != 0) {
                        x_AVG = calc(x_AVG, parseFloat(optionAVG[0][option.cols[0][j].field]), "+");
                    }
                }
                x_AVG = calc(x_AVG, (option.cols[0].length - 1), "/");
                x_AVG = $("#HCenterline_X").val() == "" ? x_AVG : parseFloat($("#HCenterline_X").val());
                $("#HCenterline_X").val(x_AVG);
                s_CPK = calc(s_AVG, d2[option.data.length - 4], "/");
                //上限
                if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
                    var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()),"+"), s_AVG, "-"), (3 * s_CPK), "/");
                    $("#HCPK").val(HUpLimit.toFixed(4));
                }
                //下限
                else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
                    var HDownLimit = calc(calc(s_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
                    $("#HCPK").val(HDownLimit.toFixed(4));
                } else {
                    var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), s_AVG, "-"), (3 * s_CPK), "/");
                    var HDownLimit = calc(calc(s_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
                    if (s_CPK == 0) {
                        $("#HCPK").val(0);
                    } else {
                        $("#HCPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
                    }
                }
            }
            function calc(num1, num2, calcStr) {
                var str1, // è½¬æ¢ä¸ºå­—符串的数字
                    str2,
                    ws1 = 0,// ws1,ws2 ç”¨æ¥å­˜å‚¨ä¼ å…¥çš„num的小数点后的数字的位数
                    ws2 = 0,// èµ‹é»˜è®¤å€¼ï¼Œè§£å†³å½“整数和小数运算时倍数计算错误导致的结果误差
                    bigger,// bigger和smaller用于加,减,除法找出小的那个数字,给后面补0,解决位数不对从而造成的计算错误的问题;乘法需要将结果除两个数字的倍数之和
                    smaller,// ä¾‹å¦‚:加减除法中1.001 + 2.03 ï¼Œå¦‚果不给2.03进行补0,最后会变成1001+203,数字错位导致结果错误;乘法中1.12*1.1会放大为112*11,所以结果需要除以1000才会是正确的结果,112*11/1000=1.232
                    zeroCount, // éœ€è¦è¡¥å……0的个数
                    isExistDot1, // ä¼ å…¥çš„æ•°å­—是否存在小数点
                    isExistDot2,
                    sum,
                    beishu = 1;
                // å°†æ•°å­—转换为字符串
                str1 = num1.toString();
                str2 = num2.toString();
                // æ˜¯å¦å­˜åœ¨å°æ•°ç‚¹ï¼ˆåˆ¤æ–­éœ€è¦è®¡ç®—的数字是不是包含小数)
                isExistDot1 = str1.indexOf('.') != -1 ? true : false;
                isExistDot2 = str2.indexOf('.') != -1 ? true : false;
                // å–小数点后面的位数
                if (isExistDot1) {
                    ws1 = str1.split('.')[1].length;
                }
                if (isExistDot2) {
                    ws2 = str2.split('.')[1].length;
                }
                // å¦‚ws1 å’Œ ws2 æ— é»˜è®¤å€¼ï¼Œå¦‚æžœnum1 æˆ– num2 ä¸æ˜¯å°æ•°çš„话则 ws1 æˆ– ws2 çš„值将为 undefined
                // bigger å’Œ smaller çš„值会和预期不符
                bigger = ws1 > ws2 ? ws1 : ws2;
                smaller = ws1 < ws2 ? ws1 : ws2;
                switch (calcStr) {
                    // åŠ å‡æ³•æ‰¾å‡ºå°çš„é‚£ä¸ªæ•°å­—ï¼Œç»™åŽé¢è¡¥0,解决位数不对从而造成的计算错误的问题
                    // ä¾‹å¦‚:1.001 + 2.03 ï¼Œå¦‚果不给2.03进行补0,最后会变成1001+203,数字错位导致结果错误
                    case "+":
                    case "-":
                    case "/":
                        zeroCount = bigger - smaller;
                        for (var i = 0; i < zeroCount; i++) {
                            if (ws1 == smaller) {
                                str1 += "0";
                            }
                            else {
                                str2 += "0";
                            }
                        }
                        break;
                    case "*":
                        // ä¹˜æ³•需要将结果除两个数字的倍数之和
                        bigger = bigger + smaller;
                        break;
                    default:
                        return "暂不支持的计算类型,现已支持的有加法、减法、乘法、除法";
                        break;
                }
                // åŽ»é™¤æ•°å­—ä¸­çš„å°æ•°ç‚¹
                str1 = str1.replace('.', '');
                str2 = str2.replace('.', '');
                // è®¡ç®—倍数,例如:1.001小数点后有三位,则需要乘 1000 å˜æˆ 1001,变成整数后精度丢失问题则不会存在
                for (var i = 0; i < bigger; i++) {
                    beishu *= 10; // ç­‰ä»·äºŽbeishu = beishu * 10;
                }
                num1 = parseInt(str1);
                num2 = parseInt(str2);
                // è¿›è¡Œæœ€ç»ˆè®¡ç®—并除相应倍数
                switch (calcStr) {
                    case "+":
                        sum = (num1 + num2) / beishu;
                        break;
                    case "-":
                        sum = (num1 - num2) / beishu;
                        break;
                    case "*":
                        sum = (num1 * num2) / beishu;
                        break;
                    case "/":
                        sum = num1 / num2;
                        /* é™¤æ•°ä¸Žè¢«é™¤æ•°åŒæ—¶æ”¾å¤§ä¸€å®šå€æ•°ï¼Œä¸å½±å“ç»“果,
                        æ‰€ä»¥å¯¹æ•°å­—进行放大对应倍数并进行补0操作后不用另对倍数做处理 */
                        break;
                    default:
                        return "暂不支持的计算类型,现已支持的有加法、减法、乘法、除法";
                }
                return sum;
            }
            //折线图
@@ -477,9 +668,9 @@
                    },
                    yAxis: {
                        type: 'value',
                        min: parseFloat($("#HDownLimit").val()) != 0 ? (parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()) * 1.3) : 0, // è®¾ç½®æœ€å°å€¼
                        max: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()) * 1.3, // è®¾ç½®æœ€å¤§å€¼
                        interval: (parseFloat($("#HUpLimit").val()) - parseFloat($("#HDownLimit").val()))/10, // è®¾ç½®é—´è·
                        min: parseFloat($("#HDownLimit").val()) != 0 ? calc((parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HDownLimit").val()), 1.3), "*"), "+") : 0, // è®¾ç½®æœ€å°å€¼
                        max: calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HUpLimit").val()), 1.3, "*"), "+"), // è®¾ç½®æœ€å¤§å€¼
                        interval: calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HDownLimit").val()), "-"), 10, "/"), // è®¾ç½®é—´è·
                    },
                    series: [
                        {
@@ -509,10 +700,14 @@
                                        yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }
                                    },
                                    {
                                        yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HControlUpperLimit").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
                                        yAxis: parseFloat($("#HControlUpperLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
                                    },
                                    {
                                        yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HControlLowerLimit").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
                                        yAxis: parseFloat($("#HControlLowerLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
                                    }
                                    ,
                                    {
                                        yAxis: parseFloat($("#HCenterline_X").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }
                                    }
                                ]
                            },
@@ -564,14 +759,21 @@
                                }
                            },
                            itemStyle: { normal: { label: { show: true } } },
                            //markLine: {
                            //    symbol: 'none',//去掉箭头
                            //    data: [
                            //        { type: 'max', name: 'Max', lineStyle: { color: 'red' } },
                            //        { type: 'average', name: 'Avg', lineStyle: { color: 'blue' } },
                            //        { type: 'min', name: 'Min', lineStyle: { color: 'green' } },
                            //    ]
                            //},
                            markLine: {
                                symbol: 'none',//去掉箭头
                                data: [
                                    {
                                        yAxis: parseFloat($("#HControlUpperLimit_S").val()) , lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
                                    },
                                    {
                                        yAxis: parseFloat($("#HControlLowerLimit_S").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
                                    }
                                    ,
                                    {
                                        yAxis: parseFloat($("#HCenterline_S").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }
                                    }
                                ]
                            },
                        }
                    ]
                };
@@ -723,8 +925,8 @@
                            $("#HUpLimit").val(data1.data[0].上限值);
                            $("#HDownLimit").val(data1.data[0].下限值);
                            $("#HTargetVal").val(data1.data[0].目标值);
                            $("#HControlUpperLimit").val(data1.data[0].控制上限);
                            $("#HControlLowerLimit").val(data1.data[0].控制下限);
                            //$("#HControlUpperLimit").val(data1.data[0].控制上限);
                            //$("#HControlLowerLimit").val(data1.data[0].控制下限);
                        } else {
                            layer.close(wait);
                            layer.alert(data1.Message, { icon: 5 });
WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html
@@ -1572,6 +1572,7 @@
                                , "HShiftsName": data.班次名称
                                , "HErrTreatment": data.异常临时处理方案
                                , "HBatchNo": data.批号
                                , "HLastResult": data.判定结论 == "合格" ? "true" : "false"
                            });
                            data = result.data;
                            //data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html
@@ -1694,7 +1694,7 @@
                                            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 HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            if (data[i].name == '数量' || data[i].name == '出站数量' || data[i].name == '报废数量' || data[i].name == '取样数量') {
                                            if (data[i].name == '数量' || data[i].name == '出站数量' || data[i].name == '报废数量' || data[i].name == '取样数量' || data[i].name == '工时') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CurrentWork.html
@@ -61,9 +61,12 @@
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">工序:</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HProcName" value="" lay-verify="HProcName" id="HProcName" style="width: 150px; background-color: #efefef4d; " readonly>
                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
                                            <div class="layui-input-block" style="margin-left: 9px;">
                                                <input type="text" class="layui-input" name="HProcName" value="" lay-verify="HProcName" id="HProcName" style="background-color: #efefef4d; width: 43%; display: inline-block;" readonly>
                                                <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcID" id="btnHProcID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -643,6 +646,33 @@
            })
        });
        //工序
        form.on('submit(btnHProcID)', function () {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
                , area: ['90%', '90%']//大小
                , title: "工序列表"  //标题
                , shift: 2//弹出动画
                , content: ["../../基础资料/生产基础资料/Gy_Process.html", "yes"]
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#HProcID").val(checkStatus.data[0].HItemID);
                    $("#HProcName").val(checkStatus.data[0].工序名称);
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        });
        //工作中心
        form.on('submit(btnHCenterID)', function () {
            layer.open({
@@ -835,35 +865,24 @@
        //#region å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {
            //get_PanelDisplay(sWhere);
            get_Display(sWhere);
            sWhere = "";//调用接口后清空sWhere缓存
        }
        //#endregion
        function get_Display(sWhere) {
            sWhere = " and HInterID='" + HSourceInterID + "' and æºå•子内码='" + HSourceEntryID + "'";
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_CurrentTicket/list',
                url: GetWEBURL() + '/CheckBill/GetICMOBillStatusList',
                type: "GET",
                async: false,
                data: { "HSourceID": HSourceID, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HSourceInterID": HSourceInterID, "user": sessionStorage["HUserName"] },
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (result) {
                    if (result.count == 1) {
                        var data = result.data.h_p_JIT_GetCurrentTicketInfo[0];
                        $("#HICMOBillNo").text(data.HSourceBillNo);//工单号
                        $("#HICMOBillStatus").text('');//当前状态
                        $("#HMaterNumber").text(data.HMaterNumber);//产品代码
                        $("#HMaterName").text(data.HMaterName);//产品名称
                        $("#HMaterModel").text(data.HModel);//规格型号
                        $("#HPlanQty").text(data.HPlanQty);//计划数量
                        $("#HReportQty").text(data.HRelationQty);//汇报总数
                        $("#HPickMtrlStatus").text('');//领料状态
                        $("#HFCheckNum").text(data.首检次数);//首检次数
                        $("#HPrCheckNum").text(data.过程检次数);//过程检次数
                        $("#HPPCheckNum").text(data.巡检次数);//巡检次数
                        HFinishRate = data.完成率;//完成率
                        HQualifiedRate = data.合格率;//合格率
                        $("#HProcName").val(result.data[0]["工序"]);
                        $("#HProcID").val(result.data[0]["HProcID"]);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
@@ -929,8 +948,8 @@
                        $("#HDeptID").val(data1.data[0]["HDeptID"]);
                        $("#HDeptName").val(data1.data[0]["车间"]);
                        $("#HProcName").val(data1.data[0]["工序"]);
                        $("#HProcID").val(data1.data[0]["HProcID"]);
                        //$("#HProcName").val(data1.data[0]["工序"]);
                        //$("#HProcID").val(data1.data[0]["HProcID"]);
                        $("#HSourceID").val(data1.data[0]["HSourceID"]);
                        $("#HSourceName").val(data1.data[0]["生产资源"]);
                        $("#HEmpID").val(data1.data[0]["HEmpID"]);