优化出厂检验单,设备履历报表,异常反馈单

zrg

2024-12-13 a961353471623d780a2e51f410d002a11ab60211

优化出厂检验单,设备履历报表,异常反馈单

 WebTM/WebTM.csproj.user

@@ -2,9 +2,9 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html

@@ -323,7 +323,8 @@
                                                        <label class="layui-form-label">影响面程度:</label>
                                                        <div class="layui-input-inline">
                                                            <select name="HErrLev" lay-filter="HErrLev" id="HErrLev">
                                                                <option value="无法判断" selected="selected">无法判断</option>
                                                                <option value="" selected="selected"></option>
                                                                <option value="无法判断">无法判断</option>
                                                                <option value="停线">停线</option>
                                                                <option value="批量不良">批量不良</option>
                                                                <option value="偶发不良">偶发不良</option>
@@ -827,6 +828,7 @@
                $("#HSendMan").val(sessionStorage["HUserName"]); //发送人
                $("#HCenterName").val(sessionStorage["HWorkCenter"]); //工作中心
                $("#HCenterID").val(sessionStorage["HWorkCenterID"]); //工作中心
                $("#HReceiveMan").val(sessionStorage["HUserName"]);   //接收人
            }

            //有源单新增
@@ -839,7 +841,7 @@
                $("#HSendMan").val(sessionStorage["HUserName"]);   //发送人
                $("#HDeptID").val(sessionStorage["HDeptID"]);  //部门ID
                $("#HDeptName").val(sessionStorage["HDept"]);  //部门

                $("#HReceiveMan").val(sessionStorage["HUserName"]);   //接收人
                $.ajax(
                    {
                        type: "GET",
@@ -1649,7 +1651,10 @@
                layer.msg("QE责任人不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }

            if ($("#HErrLev").val() == '' || $("#HErrLev").val() == null) {
                layer.msg("影响面程度不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if (OperationType == "2") {
                if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
                    layer.msg("源单单号不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

 WebTM/views/É豸¹ÜÀí/É豸±¨±í/Sb_EquipResumeCheckQuery.html

@@ -127,8 +127,8 @@
                    //退出按钮
                    case 'get_Exit': get_Exit();                                            
                        break;
                    //退出按钮
                    case 'get_Search': get_DisplayResume();
                    //查询履历按钮
                    case 'get_Search': get_DisplayLV();
                        break;
                };
            });
@@ -313,24 +313,14 @@
            }

            //查询履历
            function get_DisplayResume(HInterID) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (OperationType!=3) {
                    if (checkStatus.data.length === 1) {
                        var HInterID = data[0].hmainid.toString();
                    } else {
                        layer.msg('请选择一行数据查询！');
                        return;
                    }
                }                
            function get_DisplayResume(HInterID) {                   
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_EquipFileMain/GetResumeList',
                    type: "GET",
                    data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                        if (data1.code == 1) {
                            var data = [];
                            var col = [];
                            var totalArray = ["数量", "关联数量", "未关联数量", "打印条码数量", "未打印条码数量", "实收数量", "金额", "计划金额"];
@@ -376,6 +366,20 @@
                
            }

            //全程报表跳转后,在页面点击查询履历方法
            function get_DisplayLV() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    get_DisplayResume(HInterID);
                } else {
                    layer.msg('请选择一行数据查询！');
                    return;
                }               

            }

            //快速过滤
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();

 WebTM/views/ÖÊÁ¿¹ÜÀí/³ö³§¼ìÑéµ¥/QC_OutCompCheckBill.html

@@ -1683,6 +1683,82 @@
                }
            });

            //#region ã€åºŸå¼ƒä»£ç (斯莫尔已启用)】
            table.on('edit(mainTable)', function (obj) {
                var cell = $(this);
                var rowIndex = cell.closest('tr').data('index'); // èŽ·å–当前行数据索引
                // å•å…ƒæ ¼ç¼–辑之前的值
                var oldText = $(this).prev().text();
                var value = obj.value //得到修改后的值
                    , data = obj.data //得到所在行所有键值
                    , field = obj.field; //得到字段               
                var HInspectVal = $("#HInspectVal").val(); //检验值
                var HTargetVal = $("#HTargetVal").val(); //目标值
                var HComparator = $("#HComparator").val(); //比较符
                var HEntryID = rowIndex;
                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //分析方法
                var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //上限值
                var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //下限值
                switch (field) {
                    case "HInspectVal":  //检验值
                        value = isNaN(value) ? 0 : parseFloat(value);
                        if (HAnalysisMethod == "2") {
                            if (value <= HUpLimit && value >= HDownLimit) {
                                obj.update({
                                    "HResult": "1"
                                });

                                $('#HResult' + (HEntryID + 1)).find("option[value='1']").attr("selected", true);

                            } else {
                                obj.update({
                                    "HResult": "2"
                                });

                                $('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
                            }
                            form.render('select');
                            LastResult();
                        }
                        break;
                    case "HTargetVal":  //目标值
                        value = isNaN(value) ? 0 : value;


                        break;
                    default:
                }
            });

            function createArr(rowIndex) {
                var arr_value = table.cache['ValueTable']; //获取检测值单元格数据

                arr_value_add = []; //新增行号字段
                arr_value.map((item, index) => {
                    arr_value_add.push(Object.assign({}, item, { rowNum: rowIndex }))
                })

                if (Array.length > 0) {//如果数组不为空则遍历数组
                    var whetherAdd = false; //是否已经添加过当前行号的数组
                    //遍历数组
                    Array.some(item => {
                        if (item[0].rowNum == rowIndex) {
                            whetherAdd = true;
                            return true;//跳出遍历
                        } else {
                            whetherAdd = false;
                        }
                    })
                    //没有添加过当前行号的数组则添加进去
                    if (whetherAdd == false) {
                        Array.push(arr_value_add);
                    }
                } else {
                    Array.push(arr_value_add);//数组为空则不做判断，直接把数据添加进数组
                }
            }
            //#endregion

            //#endregion

            //#region æ–‡æœ¬æ¡†ç›‘听，光标移开时触发
@@ -2949,7 +3025,7 @@
                                //子表  èµ‹å€¼
                                rowdata.push(
                                    {
                                        "HQCCheckClassID": data[i]["HQCCheckClassID"], "检验项目类别": data[i].检验项目分类,"HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器代码": data[i]["检验仪器代码"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["状态"],
                                        "HQCCheckClassID": data[i]["HQCCheckClassID"], "检验项目类别": data[i].检验项目分类,"HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器代码": data[i]["检验仪器代码"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["重点检查"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].上限值, "HDownLimit": + data[i].下限值, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HSampleSchemeName": data[i].抽样方案名称, "HSampleQty": data[i].样本量, "HAcceptQty": data[i].允许数, "HInspectionLevel": data[i].检验水平, "HRejectQty": data[i].拒绝数,