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

wtt

2024-12-13 c4b152ab383336ba63a554aaf27e5120c0761b5a

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

 WebTM/WebTM.csproj.user

@@ -2,7 +2,7 @@
<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>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/layuiadmin/layui/css/ReportPlatform.css

@@ -108,26 +108,36 @@
.layui-show {
    padding: 5px 10px;
}

/*黄色*/
.color_border1 {
    border: 0.4em solid #ffd800;
    background-color: #ffd800;
}

/*蓝色*/
.color_border2 {
    border: 0.4em solid #09d1ea;
    background-color: #09d1ea;
}

.color_border3 {
/*灰色*/
.color_border3 { 
    border: 0.4em solid #808080;
    background-color: #808080;
}
/*绿色*/
.color_border4 {
    border: 0.4em solid #13ad4c;
    background-color: #13ad4c;
}

/*红色*/
.color_border5 {
    border: 0.4em solid #E74C3C;
    background-color: #E74C3C;
}
/*浅绿色*/
.color_border6 {
    border: 0.4em solid #B0C4DE;
    background-color: #B0C4DE;
}
.gj_icon {
    border-radius: 0.4em;
    width: 1px;

 WebTM/views/IpadIndex.html

@@ -101,8 +101,32 @@
                                html1 += '<h1><span>生产班组：</span><span id="HGroupName' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
                                //html1 += '<h1><span>当前工单：</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
                                //html1 += '<h1><span>产品名称：</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
                                //html1 += '<h1><span>产品规格：</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
                                //html1 += '<h1><span>产品规格：</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';                                
                                html1 += '<h1><span>负责人：</span><span id="us' + i + '">' + LoadData[i - 1].HEmpName + '</span></h1>';
                                switch (LoadData[i - 1].HStatus) {
                                    case "空闲":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border6"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    case "开机":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border4"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    case "停机":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border3"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    case "生产":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border2"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    case "维修进行中":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border5"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    case "维修结束":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    case "维修终止":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;                                  
                                    default:
                                }
                                html1 += '<h1 hidden> <span id="HGroupID' + i + '">' + LoadData[i - 1].HGroupID + '</span></h1>';
                                html1 += '<h1 hidden> <span id="HManagerID' + i + '">' + LoadData[i - 1].HManagerID + '</span></h1>';
                                html1 += '</dd>';
@@ -233,8 +257,7 @@
                                        break;
                                    case "完工":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">领料状态：</span><span>' + LoadData1[i].领料状态 + '</span></h1>';
                                        break;
                                    default:
                                        break;                                    
                                }
                                html1 += '<span class="prs">生产进度：</span>';
                                html1 += '<div class="layui-progress layui-progress-big" lay-showPercent="yes">';
@@ -1489,16 +1512,16 @@
                                    <span class="imgtitle">首检</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4">
                                <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%);display:none;">
                            <div class="layui-col-sm12 layui-col-md4" onclick="OpenProcess(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-search imgicon"></span>
                                    <span class="imgtitle">巡检</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4" onclick="OpenProcess(event,this)">
                                <div class="cnt bottomright">
                            <div class="layui-col-sm12 layui-col-md4">
                                <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%);display:none;">
                                    <span class="layui-icon layui-icon-search imgicon"></span>
                                    <span class="imgtitle">过程检验</span>
                                    <span class="imgtitle">末检</span>
                                </div>
                            </div>
                        </div>

 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].拒绝数,

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

@@ -725,6 +725,10 @@
            //var linterid = 11880;
            //var HSouceBillType = 3722;
            //var HICMOEntryID = 100027;

            //初始化表格
            set_InitGrid();

            //#region åˆ¤æ–­æ˜¯å¦æ–°å¢ž
            if (OperationType == 1) {
                $("#HInterID").val("");
@@ -775,26 +779,36 @@
                if (HSouceBillType == 3722 || HSouceBillType == 4610) {
                    //根据源单id获取源单信息
                    LoadingInformation2();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                //工序进站接收单列表首检
                else if (HSouceBillType == 3790) {
                    //根据源单id获取源单信息
                    LoadingInformation_StationInBill();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                //工序委外接收单列表首检
                else if (HSouceBillType == 3793) {
                    //根据源单id获取源单信息
                    LoadingInformation3();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                //生产订单列表首检
                else if (HSouceBillType == 3710) {
                    //根据源单id获取源单信息
                    LoadingInformation_ICMO();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                //工序流转卡列表首检
                else if (HSouceBillType == 3772) {
                    //根据源单id获取源单信息
                    LoadingInformation_ProcExchange();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                else {
                    layer.alert("源单类型无效！", { icon: 5 });
@@ -807,8 +821,7 @@

            $("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//禁用检验项目放大镜

            //初始化表格
            set_InitGrid();
          
            //#region æ ¹æ®æºå•èŽ·å–信息
            //根据源单id获取源单信息(进站接收单)
            function LoadingInformation_StationInBill() {
@@ -816,6 +829,7 @@
                $.ajax({
                    url: GetWEBURL() + '/QC_PatrolProcCheckOtherBill/get_StationInBill',
                    type: "GET",
                    async: false,
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
@@ -858,6 +872,7 @@
                $.ajax({
                    url: GetWEBURL() + '/QC_PatrolProcCheckOtherBill/get_ProcessExchangeBill',
                    type: "GET",
                    async: false,
                    data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
@@ -903,6 +918,7 @@
                $.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];
@@ -935,6 +951,7 @@
                $.ajax({
                    url: GetWEBURL() + "/QC_PatrolProcCheckOtherBill/get_ICMOBillStatus_Tmp",
                    type: "GET",
                    async: false,
                    data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
                    success: function (result) {
                        var data = result.data[0];
@@ -976,6 +993,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
                    type: "GET",
                    async: false,
                    data: { "sWhere": "and HInterID = " + linterid },
                    success: function (result) {
                        var data = result.data[0];
@@ -1405,6 +1423,8 @@
            });

            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 //得到修改后的值
@@ -1413,7 +1433,7 @@
                var HInspectVal = $("#HInspectVal").val(); //检验值
                //var HTargetVal = $("#HTargetVal").val(); //目标值
                //var HComparator = $("#HComparator").val(); //比较符
                var HEntryID = $("#HEntryID").val() - 1;
                var HEntryID = rowIndex;
                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //分析方法
                var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //上限值
                var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //下限值
@@ -1911,7 +1931,7 @@
            //#endregion

            //#region ã€é€‰æ£€éªŒæ–¹æ¡ˆèŽ·å–表体检验项目信息】
            window.get_CheckItem = function () {
            function get_CheckItem() {
                var HBatchQty = $("#HProcExchQty").val();
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
@@ -2120,6 +2140,7 @@
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        get_ICMOBillStatusList();
                        get_QC_TakeSampleCheckBillList();
                        GetCheckItemID();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
@@ -2160,6 +2181,7 @@
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        get_ICMOBillStatusList();
                        get_QC_TakeSampleCheckBillList();
                        GetCheckItemID();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
@@ -2238,6 +2260,7 @@
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);
                        $("#HMaterName").val(checkStatus.data[0].物料名称);
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        GetCheckItemID();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -3847,6 +3870,29 @@
            }
            //#endregion

            //自动带出检验项目
            function GetCheckItemID() {
                var HName = $("#HMaterName").val();
                var HProName = $("#HProcName").val();
                if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
                    $.ajax({
                        url: GetWEBURL() + "/Web/GetCheckItemID",
                        type: "GET",
                        async: false,
                        data: { "HName": HName, "HProName": HProName },
                        success: function (result) {
                            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 });
                            }
                        }
                    })
                }
            }

            //以上为layui模块
        });

@@ -3872,6 +3918,7 @@
            $("#HMaterNumber").val(obj.物料代码);
            $("#HMaterName").val(obj.物料名称);
            $("#HMaterID").val(obj.HItemID);
            GetCheckItemID();
        }

        function GetHEmpValue(obj) {  //质检员

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

@@ -772,6 +772,10 @@
            //var HSouceBillType = 3722;
            ////var HICMOEntryID = 100027;
            //var HICMOEntryID = "";

            //初始化表格
            set_InitGrid();

            //判断是否新增
            if (OperationType == 1) {
                $("#HInterID").val("");
@@ -827,14 +831,20 @@
                    if (HSouceBillType == 3722 || HSouceBillType == 4610) {
                        //根据源单id获取源单信息
                        LoadingInformation2();
                        //自动带出检验方案
                        GetCheckItemID();
                    } else if (HSouceBillType == 3791) {
                        //根据源单id获取源单信息
                        LoadingInformation_StationOutBill();
                        //自动带出检验方案
                        GetCheckItemID();
                    }
                    //工序流转卡列表工序检
                    else if (HSouceBillType == 3772) {
                        //根据源单id获取源单信息
                        LoadingInformation_ProcExchange();
                        //自动带出检验方案
                        GetCheckItemID();
                    }
                    else {
                        layer.alert("源单类型无效！", { icon: 5 });
@@ -847,9 +857,7 @@
            }

            $("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//禁用检验项目放大镜

            //初始化表格
            set_InitGrid();
         

            //根据源单id获取源单信息
            function LoadingInformation2() {
@@ -857,6 +865,7 @@
                $.ajax({
                    url: GetWEBURL() + "/QC_ProcessCheckBill/get_ICMOBillStatus_Tmp",
                    type: "GET",
                    async: false,
                    data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
                    success: function (result) {
                        if (result.code == 1) {
@@ -901,6 +910,7 @@
                $.ajax({
                    url: GetWEBURL() + '/QC_ProcessCheckBill/get_StationOutBill',
                    type: "GET",
                    async: false,
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
@@ -942,6 +952,7 @@
                $.ajax({
                    url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
                    type: "GET",
                    async: false,
                    data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
@@ -1308,6 +1319,8 @@


            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 //得到修改后的值
@@ -1316,7 +1329,7 @@
                var HInspectVal = $("#HInspectVal").val(); //检验值
                //var HTargetVal = $("#HTargetVal").val(); //目标值
                //var HComparator = $("#HComparator").val(); //比较符
                var HEntryID = $("#HEntryID").val() - 1;
                var HEntryID = rowIndex;
                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //分析方法
                var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //上限值
                var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //下限值
@@ -1924,7 +1937,7 @@
            });
            //#endregion

            window.get_CheckItem = function() {
            function get_CheckItem() {
                var HBatchQty = $("#HProcExchQty").val();
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
@@ -2136,6 +2149,7 @@
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        get_ICMOBillStatusList();
                        get_QC_TakeSampleCheckBillList();
                        GetCheckItemID();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
@@ -2176,6 +2190,7 @@
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        get_ICMOBillStatusList();
                        get_QC_TakeSampleCheckBillList();
                        GetCheckItemID();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
@@ -2213,6 +2228,7 @@
                        }
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        GetCheckItemID();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -3835,6 +3851,28 @@
            }
            //#endregion

            //自动带出检验项目
            function GetCheckItemID() {
                var HName = $("#HMaterName").val();
                var HProName = $("#HProcName").val();
                if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
                    $.ajax({
                        url: GetWEBURL() + "/Web/GetCheckItemID",
                        type: "GET",
                        async: false,
                        data: { "HName": HName, "HProName": HProName },
                        success: function (result) {
                            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 });
                            }
                        }
                    })
                }
            }
            //以上为layui模块
        });

@@ -3868,6 +3906,7 @@
            $("#HMaterNumber").val(obj[0].物料代码);
            $("#HMaterName").val(obj[0].物料名称);
            $("#HMaterID").val(obj[0].HItemID);
            GetCheckItemID();
        }

        function GetHEmpValue(obj) {  //质检员

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_InspectionFormReport.html

@@ -727,9 +727,17 @@
                let HDifference = [];//差值
                let HSJZ = [];//实际值

                var judge = spc_judge();

                for (var j = 1; j < option.cols[0].length; j++) {
                    if (optionAVG.length != 0 || optionS.length != 0) {
                        HAvg.push(optionAVG[0][option.cols[0][j].field]);
                        if ($.inArray(optionAVG[0][option.cols[0][j].field], judge) != -1) {
                            var data = { value: optionAVG[0][option.cols[0][j].field], itemStyle: { color: 'red' } };
                            HAvg.push(data);
                        } else {
                            HAvg.push(optionAVG[0][option.cols[0][j].field]);
                        }
                      
                        HDifference.push(optionS[0][option.cols[0][j].field]);
                        HSJZ.push(optionSJZ[0][option.cols[0][j].field]);
                    } else {
@@ -750,6 +758,10 @@
                    sum += value;
                });
                var average = sum / HSJZ.length;

                var HAreaValue = calc(calc(parseFloat($("#HControlUpperLimit_X").val()), parseFloat($("#HCenterline_X").val()), "-"), 3, "/").toFixed(5);
                var HAreaValue_A = HAreaValue * 2;
                var HAreaValue_B = HAreaValue * 1;

                option_ZXT_Avg = {
                    title: {
@@ -776,8 +788,13 @@
                        {
                            data: HAvg,
                            type: 'line',

                            itemStyle: { normal: { label: { show: true } } },
                            itemStyle: {
                                normal: {
                                    label: {
                                        show: true
                                    }
                                }
                            },
                            markLine: {
                                symbol: 'none',//去掉箭头
                                data: [
@@ -788,14 +805,30 @@
                                        name: 'LSL', yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }, label: { formatter: '{b}: {c}' }
                                    },
                                    {
                                        name: 'UCL', yAxis: parseFloat($("#HControlUpperLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
                                        name: 'UCL', yAxis: parseFloat($("#HControlUpperLimit_X").val()), lineStyle: { color: '#ff9145' }, label: { color: '#ff9145', fontSize: 10 }, label: { formatter: '{b}: {c}' }
                                    },
                                    {
                                        name: 'LCL', yAxis: parseFloat($("#HControlLowerLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
                                        name: 'LCL', yAxis: parseFloat($("#HControlLowerLimit_X").val()), lineStyle: { color: '#ff9145' }, label: { color: '#ff9145', fontSize: 10 }, label: { formatter: '{b}: {c}' }
                                    }
                                    ,
                                    {
                                        name: 'CL', yAxis: parseFloat($("#HCenterline_X").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }, label: { formatter: '{b}: {c}' }
                                        name: 'CL', yAxis: parseFloat($("#HCenterline_X").val()), lineStyle: { color: '#000000' }, label: { color: '#000000', fontSize: 10 }, label: { formatter: '{b}: {c}' }
                                    }
                                    ,
                                    {
                                        name: 'B', yAxis: parseFloat($("#HCenterline_X").val()) + HAreaValue_A, lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }, label: { formatter: '{b}: {c}' }
                                    }
                                    ,
                                    {
                                        name: '-B', yAxis: parseFloat($("#HCenterline_X").val()) - HAreaValue_A, lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }, label: { formatter: '{b}: {c}' }
                                    }
                                    ,
                                    {
                                        name: 'C', yAxis: parseFloat($("#HCenterline_X").val()) + HAreaValue_B, lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
                                    }
                                    ,
                                    {
                                        name: '-C', yAxis: parseFloat($("#HCenterline_X").val()) - HAreaValue_B, lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
                                    }
                                ],
                                precision: 3
@@ -888,7 +921,14 @@
                        {
                            data: HSJZ,
                            type: 'line',
                            itemStyle: { normal: { label: { show: true } } },
                            itemStyle: {
                                normal:
                                {
                                    label: {
                                        show: true
                                    }
                                }
                            },
                            markLine: {
                                symbol: 'none',//去掉箭头
                                data: [
@@ -918,6 +958,248 @@

            }

            //计算spc八大判定
            function spc_judge() {
                //均值
                var HAreaValue = calc(calc(parseFloat($("#HControlUpperLimit_X").val()), parseFloat($("#HCenterline_X").val()), "-"), 3, "/").toFixed(5);
                //上限部分
                var HAreaValue_A = parseFloat($("#HControlUpperLimit_X").val());
                var HAreaValue_B = calc(calc(HAreaValue, 2, "*"), parseFloat($("#HCenterline_X").val()), "+").toFixed(5);
                var HAreaValue_C = calc(calc(HAreaValue, 1, "*"), parseFloat($("#HCenterline_X").val()), "+").toFixed(5);
                //下限部分
                var HAreaValue_FA = parseFloat($("#HControlLowerLimit_X").val());
                var HAreaValue_FB = calc(parseFloat($("#HCenterline_X").val()),calc(HAreaValue, 2, "*"), "-").toFixed(5);
                var HAreaValue_FC = calc(parseFloat($("#HCenterline_X").val()),calc(HAreaValue, 1, "*"), "-").toFixed(5);


                let HAvg = [];//平均值

                for (var j = 1; j < option.cols[0].length; j++) {
                    if (optionAVG.length != 0) {
                        HAvg.push(optionAVG[0][option.cols[0][j].field]);
                    } 
                }
             
                //连续十五个点在中心线两侧的C区内
                var judge_return = [];
                if (HAvg.length >= 15) {
                    for (var i = 14; i < HAvg.length; i++) {
                        if (HAvg[i] >= HAreaValue_FC && HAvg[i] <= HAreaValue_C) {
                            for (var j = i - 14; j <= i; j++) {
                                if (HAvg[j] >= HAreaValue_FC && HAvg[j] <= HAreaValue_C) {
                                    if (i == j) {
                                        for (var j1 = i; j1 >= i - 14; j1--) {
                                            if ($.inArray(HAvg[j1], judge_return) == -1) {
                                                judge_return.push(HAvg[j1]);
                                            }
                                        }
                                    }
                                } else {
                                    break;
                                }
                            }
                        }
                    }
                }
                //连续14个点中相邻点交替上下
                if (HAvg.length >= 14) {
                    for (var i = 13; i < HAvg.length; i++) {
                        var judge = [];
                        for (var j = i - 13; j < i; j++) {
                            if (HAvg[j] > HAvg[j + 1]) {
                                judge.push(1);
                            } else if (HAvg[j] < HAvg[j + 1]) {
                                judge.push(-1);
                            }
                        }
                        for (var k = 0; k < judge.length; k++) {
                            if (judge[k] + judge[k + 1] == 0) {
                                if ((k + 1) == judge.length) {
                                    for (var j1 = i; j1 >= i - 13; j1--) {
                                        if ($.inArray(HAvg[j1], judge_return) == -1) {
                                            judge_return.push(HAvg[j1]);
                                        }
                                    }
                                }
                            } else {
                                break;
                            }
                        }
                    }
                }

                //连续9个点落在中心线的同一侧
                if (HAvg.length >= 9) {
                    for (var i = 8; i < HAvg.length; i++) {
                        var judge = [];
                        for (var j = i - 8; j <= i; j++) {
                            if (HAvg[j] > parseFloat($("#HCenterline_X").val())) {
                                judge.push(1);
                            } else if (HAvg[j] < parseFloat($("#HCenterline_X").val())) {
                                judge.push(-1);
                            }
                        }
                        var sum = 0;
                        for (var k = 0; k < judge.length; k++) {
                            sum += judge[k];
                        }
                        if (sum == 9 || sum == -9) {
                            for (var j1 = i; j1 >= i - 8; j1--) {
                                if ($.inArray(HAvg[j1], judge_return) == -1) {
                                    judge_return.push(HAvg[j1]);
                                }
                            }
                        }
                    }
                }

                //连续8点落在中心线两侧且无一在C区以内(即在C区以外)
                if (HAvg.length >= 8) {
                    for (var i = 7; i < HAvg.length; i++) {
                        if (HAvg[i] < HAreaValue_FC || HAvg[i] > HAreaValue_C) {
                            for (var j = i - 7; j <= i; j++) {
                                if (HAvg[j] < HAreaValue_FC || HAvg[j] > HAreaValue_C) {
                                    if (j == i) {
                                        for (var j1 = i; j1 >= i - 7; j1--) {
                                            if ($.inArray(HAvg[j1], judge_return) == -1) {
                                                judge_return.push(HAvg[j1]);
                                            }
                                        }
                                    }
                                } else {
                                    break;
                                }
                            }
                        }
                    }
                }

                //连续6点递增或递减
                if (HAvg.length >= 6) {
                    for (var i = 5; i < HAvg.length; i++) {
                        var judge = [];
                        for (var j = i - 5; j < i; j++) {
                            if (HAvg[j] > HAvg[j + 1]) {
                                judge.push(1);
                            } else if (HAvg[j] < HAvg[j + 1]) {
                                judge.push(-1);
                            }
                        }
                        var sum = 0;
                        for (var k = 0; k < judge.length; k++) {
                            sum += judge[k];
                        }
                        if (sum == 5 || sum == -5) {
                            for (var j1 = i; j1 >= i - 5; j1--) {
                                if ($.inArray(HAvg[j1], judge_return) == -1) {
                                    judge_return.push(HAvg[j1]);
                                }
                            }
                        }
                    }
                }

                //连续5点中有4点落在中心线同一侧的C区外
                if (HAvg.length >= 5) {
                    for (var i = 4; i < HAvg.length; i++) {
                        var judge = [];
                        if (HAvg[i] > parseFloat($("#HCenterline_X").val()) && HAvg[i] > HAreaValue_C) {
                            for (var j = i - 4; j <= i; j++) {
                                var record = [];
                                if (HAvg[j] > parseFloat($("#HCenterline_X").val()) && HAvg[j] > HAreaValue_C) {
                                    record.push(HAvg[j]);
                                    if (record.length >= 4) {
                                        for (var j1 = i; j1 >= i - 4; j1--) {
                                            if ($.inArray(HAvg[j1], judge_return) == -1) {
                                                judge_return.push(HAvg[j1]);
                                            }
                                        }
                                    }
                                }
                                
                            }
                        }
                        else if (HAvg[i] < parseFloat($("#HCenterline_X").val()) && HAvg[i] < HAreaValue_FC) {
                            for (var j = i - 4; j <= i; j++) {
                                var record = [];
                                if (HAvg[j] < parseFloat($("#HCenterline_X").val()) && HAvg[j] < HAreaValue_FC) {
                                    record.push(HAvg[j]);
                                    if (record.length >= 4) {
                                        for (var j1 = i; j1 >= i - 4; j1--) {
                                            if ($.inArray(HAvg[j1], judge_return) == -1) {
                                                judge_return.push(HAvg[j1]);
                                            }
                                        }
                                    }
                                }
                            }
                        }

                    }
                }


                //连续3点中有2点落在中心线同一侧的B区外
                if (HAvg.length >= 3) {
                    for (var i = 2; i < HAvg.length; i++) {
                        var judge = [];
                        if (HAvg[i] > parseFloat($("#HCenterline_X").val()) && HAvg[i] > HAreaValue_B) {
                            for (var j = i - 2; j <= i; j++) {
                                var record = [];
                                if (HAvg[j] > parseFloat($("#HCenterline_X").val()) && HAvg[j] > HAreaValue_B) {
                                    record.push(HAvg[j]);
                                    if (record.length >= 2) {
                                        for (var j1 = i; j1 >= i - 2; j1--) {
                                            if ($.inArray(HAvg[j1], judge_return) == -1) {
                                                judge_return.push(HAvg[j1]);
                                            }
                                        }
                                    }
                                }

                            }
                        }
                        else if (HAvg[i] < parseFloat($("#HCenterline_X").val()) && HAvg[i] < HAreaValue_FB) {
                            for (var j = i - 2; j <= i; j++) {
                                var record = [];
                                if (HAvg[j] < parseFloat($("#HCenterline_X").val()) && HAvg[j] < HAreaValue_FB) {
                                    record.push(HAvg[j]);
                                    if (record.length >= 2) {
                                        for (var j1 = i; j1 >= i - 2; j1--) {
                                            if ($.inArray(HAvg[j1], judge_return) == -1) {
                                                judge_return.push(HAvg[j1]);
                                            }
                                        }
                                    }
                                }
                            }
                        }

                    }
                }


                //1个点落在A区以外
                if (HAvg.length >= 0) {
                    for (var i = 0; i < HAvg.length; i++) {
                        var judge = [];
                        if (HAvg[i] > HAreaValue_A) {
                            if ($.inArray(HAvg[i], judge_return) == -1) {
                                judge_return.push(HAvg[i]);
                            }
                        }
                        else if (HAvg[i] < HAreaValue_FA) {
                            if ($.inArray(HAvg[i], judge_return) == -1) {
                                judge_return.push(HAvg[i]);
                            }
                        }
                    }
                }

                return judge_return;

            }

            //生产车间
            function get_Dept() {
                //获取车间列

 WebTM/views/ÖÊÁ¿¹ÜÀí/³µ¼ä×Լ쵥/QC_Add_Edit_WorkSelfCheckBill.html

@@ -712,6 +712,10 @@
            //var linterid = 11880;
            //var HSouceBillType = 3722;
            //var HICMOEntryID = 100027;

            //初始化表格
            set_InitGrid();

            //#region åˆ¤æ–­æ˜¯å¦æ–°å¢ž
            if (OperationType == 1) {
                $("#HInterID").val("");
@@ -762,26 +766,36 @@
                if (HSouceBillType == 3722 || HSouceBillType == 4610) {
                    //根据源单id获取源单信息
                    LoadingInformation2();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                //工序进站接收单列表首检
                else if (HSouceBillType == 3790) {
                    //根据源单id获取源单信息
                    LoadingInformation_StationInBill();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                //工序委外接收单列表首检
                else if (HSouceBillType == 3793) {
                    //根据源单id获取源单信息
                    LoadingInformation3();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                //生产订单列表首检
                else if (HSouceBillType == 3710) {
                    //根据源单id获取源单信息
                    LoadingInformation_ICMO();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                //工序流转卡列表首检
                else if (HSouceBillType == 3772) {
                    //根据源单id获取源单信息
                    LoadingInformation_ProcExchange();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                else {
                    layer.alert("源单类型无效！", { icon: 5 });
@@ -803,6 +817,7 @@
                $.ajax({
                    url: GetWEBURL() + '/QC_WorkSelfCheckBill/get_StationInBill',
                    type: "GET",
                    async: false,
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
@@ -844,6 +859,7 @@
                $.ajax({
                    url: GetWEBURL() + '/QC_WorkSelfCheckBill/get_ProcessExchangeBill',
                    type: "GET",
                    async: false,
                    data: { "HInterID": linterid, "HEntryID": HEntryID,  "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
@@ -888,6 +904,7 @@
                $.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];
@@ -920,6 +937,7 @@
                $.ajax({
                    url: GetWEBURL() + "/QC_WorkSelfCheckBill/get_ICMOBillStatus_Tmp",
                    type: "GET",
                    async: false,
                    data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
                    success: function (result) {
                        var data = result.data[0];
@@ -961,6 +979,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
                    type: "GET",
                    async: false,
                    data: { "sWhere": "and HInterID = " + linterid },
                    success: function (result) {
                        var data = result.data[0];
@@ -1066,6 +1085,7 @@
                        $("#HProcID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        get_ICMOBillStatusList();
                        GetCheckItemID();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
@@ -2116,6 +2136,7 @@
                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        get_ICMOBillStatusList();
                        GetCheckItemID();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -2194,6 +2215,7 @@
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);
                        $("#HMaterName").val(checkStatus.data[0].物料名称);
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        GetCheckItemID();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -3769,6 +3791,29 @@
            }
            //#endregion

            //自动带出检验项目
            function GetCheckItemID() {
                var HName = $("#HMaterName").val();
                var HProName = $("#HProcName").val();
                if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
                    $.ajax({
                        url: GetWEBURL() + "/Web/GetCheckItemID",
                        type: "GET",
                        async: false,
                        data: { "HName": HName, "HProName": HProName },
                        success: function (result) {
                            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 });
                            }
                        }
                    })
                }
            }

            //以上为layui模块
        });

@@ -3794,6 +3839,7 @@
            $("#HMaterNumber").val(obj.物料代码);
            $("#HMaterName").val(obj.物料名称);
            $("#HMaterID").val(obj.HItemID);
            GetCheckItemID();
        }

        function GetHEmpValue(obj) {  //质检员

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

@@ -727,7 +727,7 @@
            var SampleNum = [];//样本数量

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
            var HModuleType = "7504";
            var HModuleType = "7505";
            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js
            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
            $("h1").html('<b>' + HPageTitle + '</b>');
@@ -749,6 +749,10 @@
            //var linterid = 11880;
            //var HSouceBillType = 3722;
            //var HICMOEntryID = 100027;

            //初始化表格
            set_InitGrid();

            //#region åˆ¤æ–­æ˜¯å¦æ–°å¢ž
            if (OperationType == 1) {
                $("#HInterID").val("");
@@ -800,30 +804,40 @@
                if (HSouceBillType == 3722 || HSouceBillType == 4610) {
                    //根据源单id获取源单信息
                    LoadingInformation2();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                //工序进站接收单列表首检
                else if (HSouceBillType == 3790) {
                    //根据源单id获取源单信息
                    LoadingInformation_StationInBill();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                //工序委外接收单列表首检
                else if (HSouceBillType == 3793) {
                    //根据源单id获取源单信息
                    LoadingInformation3();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                //生产订单列表首检
                else if (HSouceBillType == 3710) {
                    //根据源单id获取源单信息
                    LoadingInformation_ICMO();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                //工序流转卡列表首检
                else if (HSouceBillType == 3772) {
                    //根据源单id获取源单信息
                    LoadingInformation_ProcExchange();
                    //自动带出检验方案
                    GetCheckItemID();
                }
                else {
                    layer.alert("源单类型无效！", { icon: 5 });
                }
                }               
            }
            else if (OperationType == 3) {
                RoadBillMain(linterid);
@@ -833,8 +847,7 @@

            $("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//禁用检验项目放大镜

            //初始化表格
            set_InitGrid();
            
            //#region æ ¹æ®æºå•èŽ·å–信息
            //根据源单id获取源单信息(进站接收单)
            function LoadingInformation_StationInBill() {
@@ -842,6 +855,7 @@
                $.ajax({
                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_StationInBill',
                    type: "GET",
                    async: false,
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
@@ -885,6 +899,7 @@
                $.ajax({
                    url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
                    type: "GET",
                    async: false,
                    data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data[0];
@@ -930,6 +945,7 @@
                $.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];
@@ -966,6 +982,7 @@
                $.ajax({
                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/get_ICMOBillStatus_Tmp",
                    type: "GET",
                    async:false,
                    data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
                    success: function (result) {
                        var data = result.data[0];
@@ -1006,6 +1023,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
                    type: "GET",
                    async: false,
                    data: { "sWhere": "and HInterID = " + linterid },
                    success: function (result) {
                        var data = result.data[0];
@@ -1961,11 +1979,12 @@
            //#endregion

            //#region【选检验方案获取表体检验项目信息】
            window.get_CheckItem = function () {
            function get_CheckItem() {
                var HBatchQty = $("#HProcExchQty").val();
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                    type: "GET",
                    async: false,
                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
                    success: function (result) {
                        if (result.code == 1) {
@@ -2168,6 +2187,7 @@
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        get_ICMOBillStatusList();
                        get_QC_TakeSampleCheckBillList();
                        GetCheckItemID();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
@@ -2208,6 +2228,7 @@
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        get_ICMOBillStatusList();
                        get_QC_TakeSampleCheckBillList();
                        GetCheckItemID();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
@@ -2286,6 +2307,7 @@
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);
                        $("#HMaterName").val(checkStatus.data[0].物料名称);
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        GetCheckItemID();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -3924,6 +3946,8 @@

            //#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 //得到修改后的值
@@ -3932,7 +3956,7 @@
                var HInspectVal = $("#HInspectVal").val(); //检验值
                var HTargetVal = $("#HTargetVal").val(); //目标值
                var HComparator = $("#HComparator").val(); //比较符
                var HEntryID = $("#HEntryID").val()-1;
                var HEntryID = rowIndex;
                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //分析方法
                var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //上限值
                var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //下限值
@@ -3996,6 +4020,30 @@
            }
            //#endregion

            //自动带出检验项目
            function GetCheckItemID() {
                var HName = $("#HMaterName").val();
                var HProName = $("#HProcName").val();
                if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
                    $.ajax({
                        url: GetWEBURL() + "/Web/GetCheckItemID",
                        type: "GET",
                        async: false,
                        data: { "HName": HName, "HProName": HProName },
                        success: function (result) {
                            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 });
                            }
                        }
                    })
                }
            }


            //以上为layui模块
        });

@@ -4021,6 +4069,7 @@
            $("#HMaterNumber").val(obj[0].物料代码);
            $("#HMaterName").val(obj[0].物料名称);
            $("#HMaterID").val(obj[0].HItemID);
            GetCheckItemID();
        }

        function GetHEmpValue(obj) {  //质检员

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CurrentWork.html

@@ -206,7 +206,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">穴号</label>
                                            <div class="layui-input-block" style="margin-left: 95px; width: 150px">
                                                <select name="HMouldNum" id="HMouldNum" lay-verify="required"  lay-search class="layui-input" >
                                                <select name="HMouldNum" id="HMouldNum" lay-verify="required" lay-search class="layui-input">
                                                    <option value="0#" selected>0#</option>
                                                    <option value="1#">1#</option>
                                                    <option value="2#">2#</option>
@@ -295,9 +295,17 @@
                                        <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="HMachineWorkTimes" id="HMachineWorkTimes" value="0" style="width: 150px;" >
                                                <input type="text" class="layui-input" name="HMachineWorkTimes" id="HMachineWorkTimes" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                    </div>
                                    <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="HTRQty" id="HTRQty" value="" style="width: 150px;" readonly>
                                            </div>
                                        </div>                                       
                                    </div>
                                </div>
                            </div>
@@ -1202,7 +1210,9 @@
                    return false;
                }
                var HBadCount = (parseFloat(newHWasterQty_Work) || 0) + (parseFloat($("#HBackWorkQty").val()) || 0) + (parseFloat($("#HWasterQty_Mater").val()) || 0);
                var HTRQty = (parseFloat(newHWasterQty_Work) || 0) + (parseFloat($("#HQty").val()) || 0) + (parseFloat($("#HWasterQty_Mater").val()) || 0); //投入数量
                $("#HBadCount").val(HBadCount);
                $("#HTRQty").val(HTRQty);

            });
            //#region æ–™åºŸæŠ˜æ‰£å¤±ç„¦äº‹ä»¶
@@ -1222,7 +1232,30 @@
                }

                var HBadCount = (parseFloat(newHWasterQty_Mater) || 0) + (parseFloat($("#HBackWorkQty").val()) || 0) + (parseFloat($("#HWasterQty_Work").val()) || 0);      //不良数量
                var HTRQty = (parseFloat(newHWasterQty_Mater) || 0) + (parseFloat($("#HQty").val()) || 0) + (parseFloat($("#HWasterQty_Work").val()) || 0); //投入数量
                $("#HBadCount").val(HBadCount);
                $("#HTRQty").val(HTRQty);

            });
            //#endregion

            //#region åˆæ ¼æ•°æŠ˜æ‰£å¤±ç„¦äº‹ä»¶
            var oldHQty = "";                          //修改前的值
            var newHQty = "";                          //修改后的值
            $("#HQty").on('focus', function (data) {
                oldHQty = $("#HQty").val();   //料废文本框获取焦点时获取修改前的值
            }).on('blur', function (data) {
                newHQty = $("#HQty").val();       //料废文本框失焦时获取修改后的值

                //判断输入的料废是否合法
                var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                if (!ref.test(newHQty)) {
                    layer.msg("料废请输入不小于0的数字!");
                    $("#HQty").val(oldHQty);
                    return false;
                }
                var HTRQty = (parseFloat(newHQty) || 0) + (parseFloat($("#HWasterQty_Mater").val()) || 0) + (parseFloat($("#HWasterQty_Work").val()) || 0); //投入数量
                $("#HTRQty").val(HTRQty);

            });
            //#endregion