yusijie
2025-10-23 8b72cfe37b28964954fef7eb9cdec88f563932a1
首件检验单优化
2个文件已修改
105 ■■■■ 已修改文件
WebTM/App_Data/MssqlReportData.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html 103 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/App_Data/MssqlReportData.cs
@@ -37,7 +37,7 @@
    //public const string SqlConnStr = "Data Source=192.168.6.5;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//舜成
    //public const string SqlConnStr = "Data Source=172.16.1.89;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//迦南
    //public const string SqlConnStr = "Data Source=172.16.1.30;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//海诚
    public const string SqlConnStr = "Data Source=172.16.20.60; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//小卫
    //public const string SqlConnStr = "Data Source=172.16.20.60; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//小卫
    //public string sServer;
    //public string sDataBase;
WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html
@@ -2134,7 +2134,8 @@
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
                                );
                                SampleNum.push(5);
                                //SampleNum.push(5);
                                SampleNum.push(data[0].样本量);
                            }
                            //检验项目
@@ -2168,10 +2169,59 @@
                            $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
                            trindex = result.data.length - 1;
                            $("#HEntryID").val() - 1
                            $("#HEntryID").val() - 1
                            //携带出质检方案
                            ReturnSampleScheme(data);
                        }
                    }
                })
            }
            //根据质检方案自动带出抽样方案信息
            function ReturnSampleScheme(data) {
                $("#HSampleSchemeID").val(data[data.length - 1].hmainid);
                $("#HSampleSchemeName").val(data[data.length - 1].抽样方案名称);
                $("#HSamplingType").val(data[data.length - 1].抽样类型);
                $("#HInspectionLevel").val(data[data.length - 1].检验水平);
                $("#HStrictness").val(data[data.length - 1].严格度);
                $("#HAQL").val(data[data.length - 1].AQL);
                $("#HSampleQty").val(data[data.length - 1].样本量);
                $("#HSampleQty2").val(data[data.length - 1].样本量);
                $("#HAcceptQty").val(data[data.length - 1].允许数);
                $("#HRejectQty").val(data[data.length - 1].拒绝数);
                //显示最后一行的检测值页签中的目标值、上限值、下限值
                $("#HTargetVal").val(data[data.length - 1].目标值);
                $("#HUpLimit").val(data[data.length - 1].上限值);
                $("#HDownLimit").val(data[data.length - 1].下限值);
                if ($("#HEntryID").val() - 1 >= 0) {
                    option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].hmainid;
                    option.data[$("#HEntryID").val() - 1].HSampleSchemeName = data[data.length - 1].抽样方案名称;
                    option.data[$("#HEntryID").val() - 1].HSamplingType = data[data.length - 1].抽样类型;
                    option.data[$("#HEntryID").val() - 1].HInspectionLevel = data[data.length - 1].检验水平;
                    option.data[$("#HEntryID").val() - 1].HStrictness = data[data.length - 1].严格度;
                    option.data[$("#HEntryID").val() - 1].HAQL = data[data.length - 1].AQL;
                    option.data[$("#HEntryID").val() - 1].HSampleQty = data[data.length - 1].样本量;
                    option.data[$("#HEntryID").val() - 1].HSampleQty2 = data[data.length - 1].样本量;
                    option.data[$("#HEntryID").val() - 1].HAcceptQty = data[data.length - 1].允许数;
                    option.data[$("#HEntryID").val() - 1].HRejectQty = data[data.length - 1].拒绝数;
                    option.data[$("#HEntryID").val() - 1].HUpLimit = data[data.length - 1].上限值;
                    option.data[$("#HEntryID").val() - 1].HDownLimit = data[data.length - 1].下限值;
                }
                rowdata_Value = [];
                for (let i = 1; i <= data[data.length - 1].样本量; i++) {
                    rowdata_Value.push({
                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                    });
                }
                option_Value.data = rowdata_Value;
                table.render(option_Value);
                IsHide(table.cache["mainTable"][$("#HEntryID").val() - 1].HAnalysisMethod); //隐藏检测值字段
            }
            //用于双击检验方案使用
@@ -2198,7 +2248,8 @@
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
                                );
                                SampleNum.push(5);
                                //SampleNum.push(5);
                                SampleNum.push(data[0].样本量);
                            }
                            //检验项目
@@ -2570,6 +2621,7 @@
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HTargetVal', title: '目标值' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值' }
                        , { field: 'HMax', title: '最大值', edit: 'text', totalRow: true }
@@ -2627,7 +2679,7 @@
                    elem: '#ValueTable'
                    //, toolbar: '#toolbarDemo_Value'
                    , limit: 500 //每页默认显示的数量
                    , height: 'full-50'
                    , height: 'full-370'
                    , cellMinWidth: 150
                    , totalRow: true
                    , cols: [[ //表头
@@ -2876,9 +2928,16 @@
                editIndex = Number(nowindex) + Number(1);
                LastIndex = nowindex;
                $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
                //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
                //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].检验项目);
                if (option_Check.length > 0) {
                    $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
                    $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
                    $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].检验项目);
                    //显示当前双击行的检测值页签中的目标值、上限值、下限值
                    $("#HTargetVal").val(option_Check[nowindex].目标值);
                    $("#HUpLimit").val(option_Check[nowindex].上限值);
                    $("#HDownLimit").val(option_Check[nowindex].下限值);
                }
                //选中行改变颜色
                check_row(obj);
@@ -2903,7 +2962,7 @@
                    var row_value = [];
                    for (let i = 0; i < SampleNum[nowindex]; i++) {
                        row_value.push({
                            "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                            "HSEQ": (i+1), "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                        });
                    }
                    //刷新检验值表格
@@ -3547,17 +3606,17 @@
                            HSampleQty: option.data[nowindex].HSampleQty, //样本量
                            HInspectResultToSee: '', //检验结果
                            HInspectResultToSee2: '', //检验结果2
                            HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//样本不合格数
                            HUnitID: option.data[nowindex].HUnitID, //单位ID
                            //HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//样本不合格数
                            //HUnitID: option.data[nowindex].HUnitID, //单位ID
                            HUnitName: option.data[nowindex].HUnit, //单位
                            HInspectValB: option.data[nowindex].HInspectValB,//检验值ID
                            HInspectVal: option.data[nowindex].HInspectVal, //检验值
                            //HInspectVal: option.data[nowindex].HInspectVal, //检验值
                            HTargetValB: option.data[nowindex].HTargetValB, //目标值ID
                            HTargetVal: option.data[nowindex].HTargetVal,//目标值
                            HUpLimit: option.data[nowindex].HUpLimit, //上限值
                            HDownLimit: option.data[nowindex].HDownLimit, //下限值
                            HUpOffSet: option.data[nowindex].HUpOffSet, //上偏差
                            HDownOffSet: option.data[nowindex].HDownOffSet, //下偏差
                            //HTargetVal: option.data[nowindex].HTargetVal,//目标值
                            //HUpLimit: option.data[nowindex].HUpLimit, //上限值
                            //HDownLimit: option.data[nowindex].HDownLimit, //下限值
                            //HUpOffSet: option.data[nowindex].HUpOffSet, //上偏差
                            //HDownOffSet: option.data[nowindex].HDownOffSet, //下偏差
                        };
                    }
                    //if (option.data[0].HSampleSchemeID == 0) {
@@ -3607,9 +3666,9 @@
                    $("#HUnitID").val(maindata[nowindex].HUnitID);
                    $("#HUnit").val(maindata[nowindex].HUnit);
                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].目标值 : "") : maindata[nowindex].HTargetVal );
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].上限值 : "") : maindata[nowindex].HUpLimit );
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].下限值 : "") : maindata[nowindex].HDownLimit );
                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
                    $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
                    $("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
@@ -3632,7 +3691,7 @@
                    $("#HInspectValB").val(maindata[nowindex].HInspectValB);
                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
                    $("#HTargetValB").val(maindata[nowindex].HTargetValB);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
                    //$("#HTargetVal").val(maindata[nowindex].HTargetVal);
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
@@ -3691,6 +3750,9 @@
                            }];
                            table.render(option_Value);
                            //layer.msg(result.code + result.Message, { icon: 5 });
                            IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //隐藏检测值字段
                            form.render('select');
                        }
                    }
                })
@@ -4242,6 +4304,7 @@
                            if (result.code == 1) {
                                $("#HQCSchemeID").val(result.data[0].hmainid);
                                $("#HQCSchemeName").val(result.data[0].检验方案名称);
                                //带出检验项目、抽样方案
                                get_CheckItem();
                            } else {
                                layer.msg(result.code + result.Message, { icon: 5 });