Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

chenhaozhe

2025-10-30 de6ec938f2fdaa9afdadab14511e4d1716b0ddfe

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -2020,6 +2020,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var HEntryID = data[0].hsubid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
@@ -2028,7 +2029,7 @@
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
                        , content: ['../../质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=' + HEntryID, 'yes']
                        , resize: false
                        , cancel: function () {                         
                        }
@@ -2047,6 +2048,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var HEntryID = data[0].hsubid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
@@ -2055,7 +2057,7 @@
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
                        , content: ['../../质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=' + HEntryID, 'yes']
                        , resize: false
                        , cancel: function () {                        
                        }
@@ -2074,6 +2076,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var HEntryID = data[0].hsubid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
@@ -2082,7 +2085,7 @@
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/工序检验单/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
                        , content: ['../../质量管理/工序检验单/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=' + HEntryID, 'yes']
                        , resize: false
                        , cancel: function () {                          
                        }
@@ -2094,60 +2097,7 @@
                    layer.msg('请选择一行数据编辑！');
                }
            }
            //巡检
            function set_PatrolProcCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '巡检检验单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery(table, option);
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
            //末检
            function set_LastProcCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '末检检验单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/工序检验单/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery(table, option);
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
           
            //包装备注
            function set_Remark() {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckOtherill.html

@@ -135,7 +135,7 @@
                                        <div class="layui-inline" id="hidediv1">
                                            <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="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly value="1">
                                                <input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -783,36 +783,56 @@
                if (HSouceBillType == 3722 || HSouceBillType == 4610) {
                    //根据源单id获取源单信息
                    LoadingInformation2();
                    //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                    //自动带出检验方案
                    GetCheckItemID();
                    }
                }
                //工序进站接收单列表首检
                else if (HSouceBillType == 3790) {
                    //根据源单id获取源单信息
                    LoadingInformation_StationInBill();
                    //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                    //自动带出检验方案
                    GetCheckItemID();
                    }
                }
                //工序委外接收单列表首检
                else if (HSouceBillType == 3793) {
                    //根据源单id获取源单信息
                    LoadingInformation3();
                    //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                    //自动带出检验方案
                    GetCheckItemID();
                    }
                }
                //生产订单列表首检
                else if (HSouceBillType == 3710) {
                    //根据源单id获取源单信息
                    LoadingInformation_ICMO();
                    //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                    //自动带出检验方案
                    GetCheckItemID();
                    }
                }
                //工序流转卡列表首检
                else if (HSouceBillType == 3772) {
                    //根据源单id获取源单信息
                    LoadingInformation_ProcExchange();
                    //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                    //自动带出检验方案
                    GetCheckItemID();
                    }
                }
                else {
                    layer.alert("源单类型无效！", { icon: 5 });
@@ -925,10 +945,10 @@

                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_ICMOBill',
                    type: "GET",
                    async: false,
                    data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
                    data: { "HICMOInterID": linterid, "HICMOEntryID": HICMOEntryID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
@@ -938,11 +958,16 @@
                            $("#HSourceName").val(data.生产资源);
                            $("#HSourceID").val(data.HSourceID);
                            $("#HMaterID").val(data.HMaterID);
                            $("#HMaterNumber").val(data.产品代码);
                            $("#HMaterName").val(data.产品名称);
                            $("#HMainSourceBillNo").val(data.单据号);
                            $("#HMainSourceBillType").val(data.单据类型);
                            $("#HMainSourceInterID").val(data.hmainid);
                            $("#HICMOEntryID").val(data.HEntryID);
                            $("#HQCSchemeName").val(data.检验方案名称);
                            $("#HQCSchemeID").val(data.检验方案ID);
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
@@ -1452,7 +1477,8 @@

                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HInSpectValueB: checkStatus.data[0].检测值名称
                                        HInSpectValueB: checkStatus.data[0].HItemID,
                                        HInSpectValueB_Text: checkStatus.data[0].检测值名称
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                    var DXValue = checkStatus.data[0].检测值名称; //定性检测值
@@ -1581,6 +1607,14 @@
                    layer.msg("任务单数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }

                if (data.field.HInspectValB == "") {
                    data.field.HInspectValB = 0;
                }
                if (data.field.HTargetValB == "") {
                    data.field.HTargetValB = 0;
                }

                //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
                //    layer.msg("流转卡数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
@@ -2045,7 +2079,7 @@
                        rowdata_Value = [];
                        for (let i = 1; i <= checkStatus.data[0].样本量; i++) {
                            rowdata_Value.push({
                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                            });
                        }
                        option_Value.data = rowdata_Value;
@@ -2071,7 +2105,7 @@
            //#region ã€é€‰æ£€éªŒæ–¹æ¡ˆèŽ·å–表体检验项目信息】

            function get_CheckItem() {
                var HBatchQty = $("#HProcExchQty").val();
                var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                    type: "GET",
@@ -2092,13 +2126,14 @@
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "0", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
                                );
                                SampleNum.push(5);
                                //SampleNum.push(5);
                                SampleNum.push(data[0].样本量);
                            }

                            //检验项目
                            for (let j = 1; j <= 5; j++) {
                                rowdata_Value.push({
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                });
                            }
                            //检验项目
@@ -2129,9 +2164,58 @@
                            //检验值  ç›®æ ‡å€¼ é»˜è®¤æœª0
                            $("#HInspectValB").val(0);
                            $("#HTargetValB").val(0);

                            //携带出抽样方案
                            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": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                    });
                }
                option_Value.data = rowdata_Value;
                table.render(option_Value);

                IsHide(table.cache["mainTable"][$("#HEntryID").val() - 1].HAnalysisMethod); //隐藏检测值字段
            }

            //用于双击检验方案使用
@@ -2157,13 +2241,14 @@
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "0", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
                                );
                                SampleNum.push(5);
                                //SampleNum.push(5);
                                SampleNum.push(data[0].样本量);
                            }

                            //检验项目
                            for (let j = 1; j <= 5; j++) {
                                rowdata_Value.push({
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                });
                            }
                            //检验项目
@@ -2570,6 +2655,7 @@
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HTargetVal', title: '目标值' }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值'  }
@@ -2623,20 +2709,21 @@

                //初始表格数据
                rowdata_Value = [{
                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                }];
                option_Value = {
                    elem: '#ValueTable'
                    //, toolbar: '#toolbarDemo_Value'
                    , limit: 500 //每页默认显示的数量
                    , height: 'full-50'
                    , height: 'full-370'
                    , cellMinWidth: 150
                    , totalRow: true
                    , cols: [[ //表头
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { field: 'HSEQ', title: '序号' }
                        , { field: 'HInSpectResult', title: '检验结果', templet: '#HInSpectResult' }
                        , { field: 'HInSpectValueB', title: '检测值（定性）', edit: 'text', event: 'HInSpectValueB_Open' }
                        , { field: 'HInSpectValueB', title: '检测值ID（定性）', edit: 'text', hide: true }
                        , { field: 'HInSpectValueB_Text', title: '检测值（定性）', edit: 'text', event: 'HInSpectValueB_Open' }
                        , { field: 'HInSpectValue', title: '检测值（定量）', edit: 'text', totalRow: true }
                        , { field: 'HInSpectValueT', title: '检测值（其他）', edit: 'text' }
                        //, { fixed: 'right', title: '操作', toolbar: '#barDemo' }
@@ -2852,7 +2939,15 @@
                editIndex = Number(nowindex) + Number(1);
                LastIndex = 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);
@@ -2864,11 +2959,12 @@
                //获取单元格检验值数据
                var table_value = table.cache['ValueTable'];

                //if (OperationType == 3) {
                //    set_SaveValue(Number(nowindex) + Number(1));
                //} else {
                //    set_SaveValue(dataindex + 1);
                //}
                if (OperationType == 3) {
                    set_SaveValue(Number(nowindex) + Number(1));
                } else {
                    set_SaveValue(dataindex + 1);
                }

                //双击检验项目行事件 èµ‹å€¼ä¸Žå›žæ˜¾
                if ($("#HSampleSchemeID").val() != "0") {
                    Assignment(nowindex, dataindex);
@@ -2878,7 +2974,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": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                        });
                    }
                    //刷新检验值表格
@@ -2928,17 +3024,17 @@
                        HSampleQty: $("#HSampleQty").val(), //样本量
                        HInspectResultToSee: $("#HInspectResultToSee").val(), //检验结果
                        HInspectResultToSee2: $("#HInspectResultToSee2").val(), //检验结果2
                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //样本不合格数
                        HUnitID: $("#HUnitID").val(), //单位ID
                        //HSampleUnRightQty: $("#HSampleUnRightQty").val(), //样本不合格数
                        //HUnitID: $("#HUnitID").val(), //单位ID
                        HUnitName: $("#HUnitName").val(), //单位
                        HInspectValB: $("#HInspectValB").val() == null ? 0 : $("#HInspectValB").val(), //检验值ID
                        HInspectVal: $("#HInspectVal").val(), //检验值
                        //HInspectVal: $("#HInspectVal").val(), //检验值
                        HTargetValB: $("#HTargetValB").val() == null ? 0 : $("#HTargetValB").val(), //目标值ID
                        HTargetVal: $("#HTargetVal").val(), //目标值
                        HUpLimit: $("#HUpLimit").val(), //上限值
                        HDownLimit: $("#HDownLimit").val(), //下限值
                        HUpOffSet: $("#HUpOffSet").val(), //上偏差
                        HDownOffSet: $("#HDownOffSet").val(), //下偏差
                        //HTargetVal: $("#HTargetVal").val(), //目标值
                        //HUpLimit: $("#HUpLimit").val(), //上限值
                        //HDownLimit: $("#HDownLimit").val(), //下限值
                        //HUpOffSet: $("#HUpOffSet").val(), //上偏差
                        //HDownOffSet: $("#HDownOffSet").val(), //下偏差
                    };

                    //获取文本框值
@@ -3153,9 +3249,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);
@@ -3178,7 +3274,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);
@@ -3970,6 +4066,9 @@
                            }];
                            table.render(option_Value);
                            //layer.msg(result.code + result.Message, { icon: 5 });

                            IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //隐藏检测值字段
                            form.render('select');
                        }
                    }
                })
@@ -3979,9 +4078,9 @@
            //#region ã€éšè—æ£€æµ‹å€¼å­—段】
            function IsHide(HAnalysisMethod_Value) {
                if (HAnalysisMethod_Value == 1) { //如果选中【定性分析】，则隐藏定量、其他分析
                    option_Value.cols[0][3].hide = false; //定性
                    option_Value.cols[0][4].hide = true;  //定量
                    option_Value.cols[0][5].hide = true;  //其他
                    option_Value.cols[0][4].hide = false; //定性
                    option_Value.cols[0][5].hide = true;  //定量
                    option_Value.cols[0][6].hide = true;  //其他

                    $("#HComparator").attr("disabled", true); //比较符改为不可编辑
                    $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//改变上限值输入框背景颜色
@@ -3993,9 +4092,9 @@
                    $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//目标值按钮启用

                } else if (HAnalysisMethod_Value == 2) { //如果选中【定量分析】，则隐藏定性、其他分析
                    option_Value.cols[0][4].hide = false;  //定量
                    option_Value.cols[0][3].hide = true;  //定性
                    option_Value.cols[0][5].hide = true;  //其他
                    option_Value.cols[0][5].hide = false;  //定量
                    option_Value.cols[0][4].hide = true;  //定性
                    option_Value.cols[0][6].hide = true;  //其他

                    $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //上限值改为可编辑
                    $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //下限值改为可编辑
@@ -4009,9 +4108,9 @@


                } else if (HAnalysisMethod_Value == 3) { //如果选中【其他分析】，则隐藏定量、定性分析
                    option_Value.cols[0][5].hide = false;  //其他
                    option_Value.cols[0][3].hide = true;  //定性
                    option_Value.cols[0][4].hide = true;  //定量
                    option_Value.cols[0][6].hide = false;  //其他
                    option_Value.cols[0][4].hide = true;  //定性
                    option_Value.cols[0][5].hide = true;  //定量

                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//检验值按钮
                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//目标值按钮
@@ -4100,6 +4199,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 });

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html

@@ -301,8 +301,8 @@
                    <div class="layui-tab layui-tab-card">
                        <ul class="layui-tab-title">
                            <li class="layui-this">检验项目</li>
                            <!--<li>抽样检验</li>
                            <li>检测值</li>-->
                            <li>抽样检验</li>
                            <li>检测值</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
@@ -833,35 +833,44 @@
                    if (HSouceBillType == 3722 || HSouceBillType == 4610) {
                        //根据源单id获取源单信息
                        LoadingInformation2();
                        //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                        if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                        //自动带出检验方案
                        GetCheckItemID();
                        }
                    }
                     //工序出站单列表 æœ«ä»¶
                    else if (HSouceBillType == 3791) {
                        //根据源单id获取源单信息
                        LoadingInformation_StationOutBill();
                        //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                        if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                        //自动带出检验方案
                        GetCheckItemID();
                        }
                    }//生产订单列表末检
                    else if (HSouceBillType == 3710) {
                        //根据源单id获取源单信息
                        LoadingInformation_ICMO();
                        //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                        if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                        //自动带出检验方案
                        GetCheckItemID();
                    }
                    //生产订单列表末检
                    else if (HSouceBillType == 3710) {
                        //根据源单id获取源单信息
                        LoadingInformation_ICMO();
                        //自动带出检验方案
                        GetCheckItemID();
                    }
                    //工序流转卡列表工序检
                    else if (HSouceBillType == 3772) {
                        //根据源单id获取源单信息
                        LoadingInformation_ProcExchange();
                        //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                        if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                        //自动带出检验方案
                        GetCheckItemID();
                        }
                    }
                    else {
                        layer.alert("源单类型无效！", { icon: 5 });
@@ -973,10 +982,10 @@

                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_ICMOBill',
                    type: "GET",
                    async: false,
                    data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
                    data: { "HICMOInterID": linterid, "HICMOEntryID": HICMOEntryID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
@@ -986,11 +995,16 @@
                            $("#HSourceName").val(data.生产资源);
                            $("#HSourceID").val(data.HSourceID);
                            $("#HMaterID").val(data.HMaterID);
                            $("#HMaterNumber").val(data.产品代码);
                            $("#HMaterName").val(data.产品名称);
                            $("#HMainSourceBillNo").val(data.单据号);
                            $("#HMainSourceBillType").val(data.单据类型);
                            $("#HMainSourceInterID").val(data.hmainid);
                            $("#HICMOEntryID").val(data.HEntryID);
                            $("#HQCSchemeName").val(data.检验方案名称);
                            $("#HQCSchemeID").val(data.检验方案ID);
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
@@ -1040,42 +1054,6 @@
                            HCenterID = data.HCenterID == null ? sessionStorage["HWorkCenterID"] : data.HCenterID;//工作中心id
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //根据源单id获取源单信息--生产订单
            function LoadingInformation_ICMO() {
                $("#hidediv1").attr({ "style": "display:none" });
                $("#hidediv2").attr({ "style": "display:none" });

                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
                    type: "GET",
                    async: false,
                    data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
                            $("#HICMOBillNo").val(data.单据号);
                            $("#HICMOInterID").val(data.hmainid);
                            $("#HICMOQty").val(data.生产任务单数量);
                            $("#HSourceName").val(data.生产资源);
                            $("#HSourceID").val(data.HSourceID);
                            $("#HMaterID").val(data.HMaterID);
                            $("#HMaterName").val(data.产品名称);
                            $("#HMainSourceBillNo").val(data.单据号);
                            $("#HMainSourceBillType").val(data.单据类型);
                            $("#HMainSourceInterID").val(data.hmainid);
                            $("#HICMOEntryID").val(data.HEntryID);
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
@@ -1434,7 +1412,8 @@

                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HInSpectValueB: checkStatus.data[0].检测值名称
                                        HInSpectValueB: checkStatus.data[0].HItemID,
                                        HInSpectValueB_Text: checkStatus.data[0].检测值名称
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                    var DXValue = checkStatus.data[0].检测值名称; //定性检测值
@@ -2123,7 +2102,7 @@
                        rowdata_Value = [];
                        for (let i = 1; i <= checkStatus.data[0].样本量; i++) {
                            rowdata_Value.push({
                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                            });
                        }
                        option_Value.data = rowdata_Value;
@@ -2148,7 +2127,7 @@
            //#region ã€é€‰æ£€éªŒæ–¹æ¡ˆèŽ·å–表体检验项目信息】

            function get_CheckItem() {
                var HBatchQty = $("#HProcExchQty").val();
                var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                    type: "GET",
@@ -2176,7 +2155,8 @@
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
                                );
                                SampleNum.push(data[i].样本量);
                                //SampleNum.push(5);
                                SampleNum.push(data[0].样本量);
                            }

                            //检验项目
@@ -2211,9 +2191,58 @@

                            trindex = result.data.length - 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": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                    });
                }
                option_Value.data = rowdata_Value;
                table.render(option_Value);

                IsHide(table.cache["mainTable"][$("#HEntryID").val() - 1].HAnalysisMethod); //隐藏检测值字段
            }

            window.get_CheckItem1 = function () {
@@ -2251,7 +2280,7 @@
                            //检验项目
                            for (let j = 1; j <= data[data.length - 1].样本量; j++) {
                                rowdata_Value.push({
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                });
                            }
                            //检验项目
@@ -2575,6 +2604,7 @@
                        //, { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HTargetVal', title: '目标值' }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值' }
@@ -2628,7 +2658,7 @@

                //初始表格数据
                rowdata_Value = [{
                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                }];
                option_Value = {
                    elem: '#ValueTable'
@@ -2641,7 +2671,8 @@
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { field: 'HSEQ', title: '序号' }
                        , { field: 'HInSpectResult', title: '检验结果', templet: '#HInSpectResult' }
                        , { field: 'HInSpectValueB', title: '检测值（定性）', edit: 'text', event: 'HInSpectValueB_Open' }
                        , { field: 'HInSpectValueB', title: '检测值ID（定性）', edit: 'text', hide: true }
                        , { field: 'HInSpectValueB_Text', title: '检测值（定性）', edit: 'text', event: 'HInSpectValueB_Open' }
                        , { field: 'HInSpectValue', title: '检测值（定量）', edit: 'text' }
                        , { field: 'HInSpectValueT', title: '检测值（其他）', edit: 'text' }
                        //, { fixed: 'right', title: '操作', toolbar: '#barDemo' }
@@ -2868,9 +2899,15 @@
                editIndex = Number(nowindex) + Number(1);
                LastIndex = 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].检验项目);
                    $("[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);
@@ -2896,7 +2933,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": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                        });
                    }
                    //刷新检验值表格
@@ -3332,17 +3369,17 @@
                        HSampleQty: $("#HSampleQty").val(), //样本量
                        HInspectResultToSee: $("#HInspectResultToSee").val(), //检验结果
                        HInspectResultToSee2: $("#HInspectResultToSee2").val(), //检验结果2
                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //样本不合格数
                        HUnitID: $("#HUnitID").val(), //单位ID
                        //HSampleUnRightQty: $("#HSampleUnRightQty").val(), //样本不合格数
                        //HUnitID: $("#HUnitID").val(), //单位ID
                        HUnitName: $("#HUnitName").val(), //单位
                        HInspectValB: $("#HInspectValB").val(), //检验值ID
                        HInspectVal: $("#HInspectVal").val(), //检验值
                        //HInspectVal: $("#HInspectVal").val(), //检验值
                        HTargetValB: $("#HTargetValB").val(), //目标值ID
                        HTargetVal: $("#HTargetVal").val(), //目标值
                        HUpLimit: $("#HUpLimit").val(), //上限值
                        HDownLimit: $("#HDownLimit").val(), //下限值
                        HUpOffSet: $("#HUpOffSet").val(), //上偏差
                        HDownOffSet: $("#HDownOffSet").val(), //下偏差
                        //HTargetVal: $("#HTargetVal").val(), //目标值
                        //HUpLimit: $("#HUpLimit").val(), //上限值
                        //HDownLimit: $("#HDownLimit").val(), //下限值
                        //HUpOffSet: $("#HUpOffSet").val(), //上偏差
                        //HDownOffSet: $("#HDownOffSet").val(), //下偏差
                    };

                    //获取文本框值
@@ -3598,9 +3635,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);
@@ -3623,7 +3660,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);
@@ -3682,6 +3719,9 @@
                            }];
                            table.render(option_Value);
                            //layer.msg(result.code + result.Message, { icon: 5 });

                            IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //隐藏检测值字段
                            form.render('select');
                        }
                    }
                })
@@ -4035,9 +4075,9 @@
            //#region ã€éšè—æ£€æµ‹å€¼å­—段】
            function IsHide(HAnalysisMethod_Value) {
                if (HAnalysisMethod_Value == 1) { //如果选中【定性分析】，则隐藏定量、其他分析
                    option_Value.cols[0][3].hide = false; //定性
                    option_Value.cols[0][4].hide = true;  //定量
                    option_Value.cols[0][5].hide = true;  //其他
                    option_Value.cols[0][4].hide = false; //定性
                    option_Value.cols[0][5].hide = true;  //定量
                    option_Value.cols[0][6].hide = true;  //其他

                    $("#HComparator").attr("disabled", true); //比较符改为不可编辑
                    $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//改变上限值输入框背景颜色
@@ -4049,9 +4089,9 @@
                    $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//目标值按钮启用

                } else if (HAnalysisMethod_Value == 2) { //如果选中【定量分析】，则隐藏定性、其他分析
                    option_Value.cols[0][4].hide = false;  //定量
                    option_Value.cols[0][3].hide = true;  //定性
                    option_Value.cols[0][5].hide = true;  //其他
                    option_Value.cols[0][5].hide = false;  //定量
                    option_Value.cols[0][4].hide = true;  //定性
                    option_Value.cols[0][6].hide = true;  //其他

                    $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //上限值改为可编辑
                    $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //下限值改为可编辑
@@ -4065,9 +4105,9 @@


                } else if (HAnalysisMethod_Value == 3) { //如果选中【其他分析】，则隐藏定量、定性分析
                    option_Value.cols[0][5].hide = false;  //其他
                    option_Value.cols[0][3].hide = true;  //定性
                    option_Value.cols[0][4].hide = true;  //定量
                    option_Value.cols[0][6].hide = false;  //其他
                    option_Value.cols[0][4].hide = true;  //定性
                    option_Value.cols[0][5].hide = true;  //定量

                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//检验值按钮
                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//目标值按钮

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html

@@ -808,36 +808,59 @@
                if (HSouceBillType == 3722 || HSouceBillType == 4610) {
                    //根据源单id获取源单信息
                    LoadingInformation2();

                    //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司"))
                    {
                    //自动带出检验方案
                    GetCheckItemID();
                    }
                    
                }
                //工序进站接收单列表首检
                else if (HSouceBillType == 3790) {
                    //根据源单id获取源单信息
                    LoadingInformation_StationInBill();
                    //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                    //自动带出检验方案
                    GetCheckItemID();
                    }
                }
                //工序委外接收单列表首检
                else if (HSouceBillType == 3793) {
                    //根据源单id获取源单信息
                    LoadingInformation3();
                    //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                    //自动带出检验方案
                    GetCheckItemID();
                    }
                }
                //生产订单列表首检
                else if (HSouceBillType == 3710) {
                    //根据源单id获取源单信息
                    LoadingInformation_ICMO();
                    //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                    //自动带出检验方案
                    GetCheckItemID();
                    }
                }
                //工序流转卡列表首检
                else if (HSouceBillType == 3772) {
                    //根据源单id获取源单信息
                    LoadingInformation_ProcExchange();
                    //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                    //自动带出检验方案
                    GetCheckItemID();
                    }
                }
                else {
                    layer.alert("源单类型无效！", { icon: 5 });
@@ -952,10 +975,10 @@

                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_ICMOBill',
                    type: "GET",
                    async: false,
                    data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
                    data: { "HICMOInterID": linterid, "HICMOEntryID": HICMOEntryID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
@@ -975,6 +998,10 @@
                            $("#HMainSourceBillType").val(data.单据类型);
                            $("#HMainSourceInterID").val(data.hmainid);
                            $("#HICMOEntryID").val(data.HEntryID);
                            $("#HQCSchemeName").val(data.检验方案名称);
                            $("#HQCSchemeID").val(data.检验方案ID);
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
@@ -1450,7 +1477,8 @@

                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HInSpectValueB: checkStatus.data[0].检测值名称
                                        HInSpectValueB: checkStatus.data[0].HItemID,
                                        HInSpectValueB_Text: checkStatus.data[0].检测值名称
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                    var DXValue = checkStatus.data[0].检测值名称; //定性检测值
@@ -1545,6 +1573,9 @@
                if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
                    layer.msg("任务单数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HInspectValB").val() == "") {
                    $("#HInspectValB").val(0)
                }
                //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
                //    layer.msg("流转卡数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -2088,7 +2119,7 @@
                        rowdata_Value = [];
                        for (let i = 1; i <= checkStatus.data[0].样本量; i++) {
                            rowdata_Value.push({
                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                            });
                        }
                        option_Value.data = rowdata_Value;
@@ -2113,7 +2144,7 @@

            //#region ã€é€‰æ£€éªŒæ–¹æ¡ˆèŽ·å–表体检验项目信息】
            function get_CheckItem() {
                var HBatchQty = $("#HProcExchQty").val();
                var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                    type: "GET",
@@ -2142,7 +2173,7 @@
                            //检验项目
                            for (let j = 1; j <= 5; j++) {
                                rowdata_Value.push({
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                });
                            }
                            //检验项目
@@ -2172,7 +2203,7 @@
                            trindex = result.data.length - 1;
                            $("#HEntryID").val() - 1                            

                            //携带出质检方案
                            //携带出抽样方案
                            ReturnSampleScheme(data);
                        }
                    }
@@ -2216,7 +2247,7 @@
                rowdata_Value = [];
                for (let i = 1; i <= data[data.length - 1].样本量; i++) {
                    rowdata_Value.push({
                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                    });
                }
                option_Value.data = rowdata_Value;
@@ -2256,7 +2287,7 @@
                            //检验项目
                            for (let j = 1; j <= 5; j++) {
                                rowdata_Value.push({
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                });
                            }
                            //检验项目
@@ -2674,7 +2705,7 @@

                //初始表格数据
                rowdata_Value = [{
                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                }];
                option_Value = {
                    elem: '#ValueTable'
@@ -2687,7 +2718,8 @@
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { field: 'HSEQ', title: '序号' }
                        , { field: 'HInSpectResult', title: '检验结果', templet: '#HInSpectResult' }
                        , { field: 'HInSpectValueB', title: '检测值（定性）', edit: 'text', event: 'HInSpectValueB_Open' }
                        , { field: 'HInSpectValueB', title: '检测值ID（定性）', edit: 'text', hide: true }
                        , { field: 'HInSpectValueB_Text', title: '检测值（定性）', edit: 'text', event: 'HInSpectValueB_Open' }
                        , { field: 'HInSpectValue', title: '检测值（定量）', edit: 'text', totalRow: true }
                        , { field: 'HInSpectValueT', title: '检测值（其他）', edit: 'text' }
                        //, { fixed: 'right', title: '操作', toolbar: '#barDemo' }
@@ -2963,7 +2995,7 @@
                    var row_value = [];
                    for (let i = 0; i < SampleNum[nowindex]; i++) {
                        row_value.push({
                            "HSEQ": (i+1), "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
                            "HSEQ": (i + 1), "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                        });
                    }
                    //刷新检验值表格
@@ -4108,9 +4140,9 @@
            //#region ã€éšè—æ£€æµ‹å€¼å­—段】
            function IsHide(HAnalysisMethod_Value) {
                if (HAnalysisMethod_Value == 1) { //如果选中【定性分析】，则隐藏定量、其他分析
                    option_Value.cols[0][3].hide = false; //定性
                    option_Value.cols[0][4].hide = true;  //定量
                    option_Value.cols[0][5].hide = true;  //其他
                    option_Value.cols[0][4].hide = false; //定性
                    option_Value.cols[0][5].hide = true;  //定量
                    option_Value.cols[0][6].hide = true;  //其他

                    $("#HComparator").attr("disabled", true); //比较符改为不可编辑
                    $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//改变上限值输入框背景颜色
@@ -4122,9 +4154,9 @@
                    $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//目标值按钮启用

                } else if (HAnalysisMethod_Value == 2) { //如果选中【定量分析】，则隐藏定性、其他分析
                    option_Value.cols[0][4].hide = false;  //定量
                    option_Value.cols[0][3].hide = true;  //定性
                    option_Value.cols[0][5].hide = true;  //其他
                    option_Value.cols[0][5].hide = false;  //定量
                    option_Value.cols[0][4].hide = true;  //定性
                    option_Value.cols[0][6].hide = true;  //其他

                    $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //上限值改为可编辑
                    $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //下限值改为可编辑
@@ -4138,9 +4170,9 @@


                } else if (HAnalysisMethod_Value == 3) { //如果选中【其他分析】，则隐藏定量、定性分析
                    option_Value.cols[0][5].hide = false;  //其他
                    option_Value.cols[0][3].hide = true;  //定性
                    option_Value.cols[0][4].hide = true;  //定量
                    option_Value.cols[0][6].hide = false;  //其他
                    option_Value.cols[0][4].hide = true;  //定性
                    option_Value.cols[0][5].hide = true;  //定量

                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//检验值按钮
                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//目标值按钮