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

wtt

2024-10-10 39cacad489a269c9ea7cd6ff9d055734bb4108c2

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

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -8,7 +8,7 @@
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */  //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)

 WebTM/views/¹¤×ʹÜÀí/¿¼Çڻ㱨µ¥/Pay_WorkTimesBillEdit.html

@@ -446,10 +446,10 @@
                        , { field: 'HEmpID', title: 'HEmpID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
                        , { field: 'HEmpNumber', title: '职员代码', width: 100, edit: 'text', event: "HEmpNumber" }                 //F7
                        , { field: 'HEmpName', title: '职员名称', width: 100, style: 'background-color:#efefef4d;' }
                        , { field: 'HEmpRate', title: '职员系数', width: 100, edit: 'text' }
                        , { field: 'HEmpRate', title: '职员系数', width: 100, edit: 'text', event: "HEmpRate" }
                        , { field: 'HAMTimes', title: '上午工时', width: 100, edit: 'text', totalRow: true }
                        , { field: 'HPMTimes', title: '下午工时', width: 100, edit: 'text', totalRow: true }
                        , { field: 'HBaseTimes', title: '基本工时', width: 100, edit: 'text', totalRow: true }
                        , { field: 'HBaseTimes', title: '基本工时', width: 100, edit: 'text', totalRow: true, event: "HBaseTimes" }
                        , { field: 'HBaseDays', title: '基本天数', width: 100, edit: 'text', totalRow: true }
                        , { field: 'HOverTimes', title: '加班工时', width: 100, edit: 'text', totalRow: true }
                        , { field: 'HOverDays', title: '加班天数', width: 100, edit: 'text', totalRow: true }
@@ -1189,9 +1189,93 @@
                                }
                            })
                        }
                        //obj.event = "";
                        return false;
                    }


                    //#region æ‰¹é‡å¡«å……
                    //数值格式校验工具
                    var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                    var temp = "";
                    //操作行索引
                    var rowIndex = $(obj.tr).attr("data-index");

                    if (event.key == "F6") {
                        //职员系数
                        if (obj.event == "HEmpRate") {
                            var oldText = table.cache["mainTable"][rowIndex].HEmpRate;
                            var value = e.target.value; //得到修改后的值

                            //数据格式校验
                            temp = value + "";
                            if (!ref.test(temp) || temp == 0) {
                                //恢复数据到编辑前
                                option.data[rowIndex].HEmpRate = oldText;
                                table.render(option);
                                //刷新设置复选框状态
                                CheckedSet_tableSub();

                                layer.msg("所输入值必须为大于0的数字!");
                                return;
                            }


                            for (var i = rowIndex * 1; i < option.data.length; i++) {
                                //数据校验合格，重算记录
                                var HEmpRate = isNaN(value) ? 0 : value * 1;    //职员系数

                                //同步更新表格和缓存对应的值
                                option.data[i].HEmpRate = HEmpRate;
                            }
                            table.render(option);
                            //刷新设置复选框状态
                            CheckedSet_tableSub();
                        }

                        //基本工时
                        if (obj.event == "HBaseTimes") {
                            var oldText = table.cache["mainTable"][rowIndex].HBaseTimes;
                            var value = e.target.value; //得到修改后的值

                            //数据格式校验
                            temp = value + "";
                            if (!ref.test(temp) || temp == 0) {
                                //恢复数据到编辑前
                                option.data[rowIndex].HBaseTimes = oldText;
                                table.render(option);
                                //刷新设置复选框状态
                                CheckedSet_tableSub();

                                layer.msg("所输入值必须为大于0的数字!");
                                return;
                            }


                            for (var i = rowIndex * 1; i < option.data.length; i++) {
                                //数据校验合格，重算记录
                                var HBaseTimes = isNaN(value) ? 0 : value * 1;                                  //基本工时
                                var HAMTimes = HBaseTimes / 2;                                                  //上午工时
                                var HPMTimes = HBaseTimes / 2;                                                  //下午工时
                                var HPayMoney = isNaN(option.data[i].HPayMoney) ? 0 : option.data[i].HPayMoney; //小时工资
                                var HMoney = HPayMoney * HBaseTimes;                                            //工资=小时工资*基本工时

                                //同步更新表格和缓存对应的值
                                option.data[i].HBaseTimes = HBaseTimes;
                                option.data[i].HAMTimes = HAMTimes;
                                option.data[i].HPMTimes = HPMTimes;
                                option.data[i].HMoney = HMoney;
                            }
                            table.render(option);
                            //刷新设置复选框状态
                            CheckedSet_tableSub();
                        }

                        obj.event = "";
                        return false;
                    }

                    //#endregion
                })
            }
            //#endregion
@@ -1227,7 +1311,7 @@
                        }

                        //数据校验合格，重算记录
                        var HAMTimes = isNaN(value) ? 0 : value;                            //上午工时
                        var HAMTimes = isNaN(value) ? 0 : value * 1;                        //上午工时
                        var HPMTimes = isNaN(obj.data.HPMTimes) ? 0 : obj.data.HPMTimes;    //下午工时
                        var HBaseTimes = Number(HPMTimes) + Number(HAMTimes);               //基本工时=上午工时+下午工时
                        var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //小时工资
@@ -1260,7 +1344,7 @@
                        }

                        //数据校验合格，重算记录
                        var HPMTimes = isNaN(value) ? 0 : value;                            //下午工时
                        var HPMTimes = isNaN(value) ? 0 : value * 1;                        //下午工时
                        var HAMTimes = isNaN(obj.data.HAMTimes) ? 0 : obj.data.HAMTimes;    //上午工时
                        var HBaseTimes = Number(HPMTimes) + Number(HAMTimes);               //基本工时=上午工时+下午工时
                        var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //小时工资
@@ -1270,6 +1354,40 @@
                        obj.update({
                            HPMTimes: HPMTimes
                            , HBaseTimes: HBaseTimes
                            , HMoney: HMoney
                        });
                        table.render(option);
                        //刷新设置复选框状态
                        CheckedSet_tableSub();
                        break;
                    case "HBaseTimes":        //基本工时
                        //数据格式校验
                        temp = value + "";
                        if (!ref.test(temp) || temp == 0) {
                            //恢复数据到编辑前
                            obj.update({
                                HBaseTimes: oldText
                            });
                            table.render(option);
                            //刷新设置复选框状态
                            CheckedSet_tableSub();

                            layer.msg("所输入值必须为大于0的数字!");
                            return;
                        }

                        //数据校验合格，重算记录
                        var HBaseTimes = isNaN(value) ? 0 : value * 1;                      //基本工时
                        var HAMTimes = HBaseTimes / 2;                                      //上午工时
                        var HPMTimes = HBaseTimes / 2;                                      //下午工时
                        var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //小时工资
                        var HMoney = HPayMoney * HBaseTimes;                                //工资=小时工资*基本工时

                        //同步更新表格和缓存对应的值
                        obj.update({
                            HBaseTimes: HBaseTimes
                            , HAMTimes: HAMTimes
                            , HPMTimes: HPMTimes
                            , HMoney: HMoney
                        });
                        table.render(option);
@@ -1293,7 +1411,7 @@
                        }

                        //数据校验合格，重算记录
                        var HPayMoney = isNaN(value) ? 0 : value;                               //小时工资
                        var HPayMoney = isNaN(value) ? 0 : value * 1;                           //小时工资
                        var HBaseTimes = isNaN(obj.data.HBaseTimes) ? 0 : obj.data.HBaseTimes;  //基本工时
                        var HMoney = HPayMoney * HBaseTimes;                                    //工资=小时工资*基本工时


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

@@ -211,8 +211,8 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">判断结论</label>
                                            <div class="layui-input-block">
                                                <input type="radio" name="HLastResult" id="HLastResult" value="true" title="合格" checked>
                                                <input type="radio" name="HLastResult" id="HLastResult" value="false" title="不合格">
                                                <input type="radio" name="HLastResult" id="HLastResult" value="true" title="合格" >
                                                <input type="radio" name="HLastResult" id="HLastResult" value="false" title="不合格" checked>
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1">
@@ -1526,6 +1526,8 @@
                                , "HBatchNo": data.批号
                                , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
                                , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
                                , "HProcID": data.HProcID   
                                , "HProcName": data.HProcName
                            });
                            $("input[name=HLastResult][value=true]").prop("checked", data.判定结论 === "合格");
                            $("input[name=HLastResult][value=false]").prop("checked", data.判定结论 === "不合格");
@@ -1864,7 +1866,7 @@
                                    {
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器": 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"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].上限值, "HDownLimit": + data[i].下限值, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HSampleSchemeName": data[i].抽样方案名称, "HSampleQty": data[i].样本量, "HAcceptQty": data[i].允许数 == null ? 0 : data[i].允许数, "HInspectionLevel": data[i].检验水平, "HRejectQty": data[i].拒绝数 == null ? 0 : data[i].拒绝数,
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "0", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
@@ -2270,7 +2272,7 @@
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HInspectVal', title: '检验值' }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值'  }
                        , { field: 'HMax', title: '最大值', edit: 'text', totalRow: true }
@@ -2409,10 +2411,10 @@
                }
                if (HQty > 0) {
                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //添加选择属性
                } else {
                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //添加选择属性
                }
                form.render('radio');
            }           

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

@@ -208,8 +208,8 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">判断结论</label>
                                            <div class="layui-input-block">
                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="合格" checked>
                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="不合格">
                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="合格" >
                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="不合格" checked>
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1">
@@ -645,7 +645,6 @@
                    <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
                    <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="1">
                    <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo">
                    <input type="hidden" name="HProcID" id="HProcID" value="1">
                </form>
            </div>
        </div>
@@ -1485,7 +1484,13 @@
                                , "HBatchNo": data.批号
                                , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
                                , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
                                , "HProcID": data.HProcID
                                , "HProcName": data.HProcName
                            });

                            $("input[name=HCheckerResult][value=true]").prop("checked", data.判定结论 === "合格");
                            $("input[name=HCheckerResult][value=false]").prop("checked", data.判定结论 === "不合格");
                            form.render();
                            data = result.data;
                            //子表  èµ‹å€¼
                            var rowdata = [];
@@ -1898,7 +1903,7 @@
                                    {
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器": 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": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "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].拒绝数,
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
@@ -2219,7 +2224,7 @@
                        //, { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HInspectVal', title: '检验值' }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值' }
                        , { field: 'HMax', title: '最大值', edit: 'text', totalRow: true}

 WebTM/views/ÖÊÁ¿¹ÜÀí/¿â´æ¼ìÑéµ¥/QC_Add_Edit_StockCheckBill.html

@@ -1418,6 +1418,10 @@
                    layer.msg("检验员未选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HBatchNo").val() == "") {
                    layer.msg("批次号不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var sSubTable = table.cache['mainTable'];
                for (var i = 0; i < sSubTable.length; i++) {
                    if (!sSubTable[i].HQCCheckItemID) {
@@ -2386,10 +2390,10 @@
                }
                if (HQty > 0) {
                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //添加选择属性
                } else {
                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //添加选择属性
                }
                form.render('radio');
            }           

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_CheckProjectList.html

@@ -33,15 +33,21 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">检验方案名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDate1" id="HDate1">
                                        <input type="date" class="layui-input" name="HDate1" id="HDate1">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDate2" id="HDate2">
                                        <input type="date" class="layui-input" name="HDate2" id="HDate2">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -295,6 +301,10 @@
                var HBillNo = $("#HBillNo").val();
                var HDate1 = $("#HDate1").val();
                var HDate2 = $("#HDate2").val();
                var HQCCheckProjectName = $("#HQCCheckProjectName").val();
                if (HQCCheckProjectName) {
                    sWhere += " and æ£€éªŒæ–¹æ¡ˆåç§° like '%" + HQCCheckProjectName + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }

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

@@ -682,7 +682,7 @@

                option_ZXT_Avg = {
                    title: {
                        text: '平均值',
                        text: 'x̄管制图',
                        left: 'center'
                    },
                    grid: {
@@ -741,7 +741,7 @@

                option_ZXT_Diff = {
                    title: {
                        text: '差值',
                        text: 'R管制图',
                        left: 'center'
                    },
                    grid: {

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

@@ -150,9 +150,13 @@
                                            </div>
                                        </div>
                                        <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="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly value="1">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -733,7 +737,7 @@
                $("#HInterID").val("");
                $("#HBillNo").val("");
                $('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//有源单时新增按钮禁用
                $('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//有源单时生产资源按钮禁用
                //$('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//有源单时生产资源按钮禁用
                $('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//有源单时任务单号按钮禁用
                $('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//有源单时产品内码按钮禁用
                $('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//有源单时流转卡号按钮禁用
@@ -1035,6 +1039,45 @@
                }
            });
            //#endregion

            //表头信息工序
            form.on('submit(btnHProc)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工序列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HProcName").val(checkStatus.data[0].工序名称);
                        $("#HProcID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        get_ICMOBillStatusList();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //退出按钮
            form.on('submit(btn-Exit)', function (data) {
@@ -1504,6 +1547,8 @@
                                , "HShiftsID": data.HShiftsID
                                , "HShiftsName": data.班次名称
                                , "HErrTreatment": data.异常临时处理方案
                                , "HProcID": data.HProcID
                                , "HProcName": data.HProcName
                            });
                            $("input[name=HLastResult][value=true]").prop("checked", data.判定结论 === "合格");
                            $("input[name=HLastResult][value=false]").prop("checked", data.判定结论 === "不合格");
@@ -2031,6 +2076,7 @@
                        }
                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        get_ICMOBillStatusList();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -2343,10 +2389,10 @@
                }
                if (HQty > 0) {
                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //添加选择属性
                } else {
                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //添加选择属性
                }
                form.render('radio');
            }           
@@ -3535,6 +3581,45 @@
            }          
            //#endregion

            //根据生产资源或者 å·¥åº æŸ¥è¯¢ç”Ÿäº§å·¥å•ä¿¡æ¯
            function get_ICMOBillStatusList() {
                var sWhere = "";
                var HProcID = $("#HProcID").val();
                var HSourceID = $("#HSourceID").val();
                var HProcExchInterID = $("#HProcExchInterID").val();

                if (HProcID != "0") {
                    sWhere += " and HProcID=" + HProcID;
                }
                if (HSourceID != "0") {
                    sWhere += " and HSourceID=" + HSourceID
                }

                sWhere += " and HSourceInterID=" + HProcExchInterID;

                $.ajax({
                    url: GetWEBURL() + "/CheckBill/GetICMOBillStatusList",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            $("#HProcID").val(result.data[0]["HProcID"]);
                            $("#HProcName").val(result.data[0]["工序"]);
                            $("#HSourceID").val(result.data[0]["HSourceID"]);
                            $("#HSourceName").val(result.data[0]["生产资源"]);

                        } else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                })
            }


            //#region ã€éšè—æ£€æµ‹å€¼å­—段】
            function IsHide(HAnalysisMethod_Value) {
                if (HAnalysisMethod_Value == 1) { //如果选中【定性分析】，则隐藏定量、其他分析

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

@@ -214,8 +214,8 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">判断结论</label>
                                            <div class="layui-input-block">
                                                <input type="radio" name="HLastResult" id="HLastResult" value="true" title="合格" checked>
                                                <input type="radio" name="HLastResult" id="HLastResult" value="false" title="不合格">
                                                <input type="radio" name="HLastResult"  value="true" title="合格" >
                                                <input type="radio" name="HLastResult"  value="false" title="不合格" checked>
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1" style="margin-left:20px;">
@@ -1274,7 +1274,7 @@
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../基础资料/公用基础资料/Gy_InspectInstruMentList.html', 'yes'],
                                content: ['../../基础资料/公用基础资料/Gy_InspectInstruMent.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {

@@ -1527,6 +1527,8 @@
                                , "HICMOEntryID": data.HICMOEntryID
                                , "HMaterID": data.HMaterID
                                , "HMaterName": data.物料名称
                                , "HProcID": data.HProcID
                                , "HProcName": data.HProcName
                                , "HProcExchQty": data.HProcExchQty
                                , "HProcExchBillNo": data.HProcExchBillNo
                                , "HProcExchInterID": data.HProcExchInterID
@@ -1589,7 +1591,7 @@
                            for (var i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目代码": data[i].检验项目代码, "检验项目": data[i].检验项目名称, "HInspectInstruMentID": data[i].HInspectInstruMentID, "检验仪器": data[i].检验仪器, "HQCStd": data[i].检验标准,
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目代码": data[i].检验项目代码, "检验项目": data[i].检验项目名称, "HInspectInstruMentID": data[i].HInspectInstruMentID, "检验仪器": data[i].检验仪器名称, "HQCStd": data[i].检验标准,
                                        "HUnit": data[i].单位名称, "HQCNote": data[i].检验记录, "HResult": data[i].结论 == "合格" ? 1 : 2,
                                        "HMax": data[i].最大值, "HMin": data[i].最小值, "HAvg": data[i].平均值, "HRemark": data[i].表体备注,
                                        "HAnalysisMethod": data[i].分析方法 == "定性分析" ? 1 : (data[i].分析方法 == "定量分析" ? 2 : 3), "HKeyInspect": data[i].重点检查 == "否" ? false : true,
@@ -1952,7 +1954,7 @@
                                    {
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器": 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": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "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].拒绝数,
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
@@ -2423,7 +2425,7 @@

                //选择的select对象值；
                var selectValue = data.value;
                if (selectValue == 1) {
                if (selectValue == "1") {
                    selectValue = "合格"
                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色
                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色
@@ -2454,12 +2456,12 @@
                }
                if (HQty > 0) {
                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value='false']").prop("checked", "true"); //添加选择属性
                } else {
                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value='true']").prop("checked", "true"); //添加选择属性
                }
                form.render('radio');
                form.render("radio");
            }

            ////行选择处理（检验结果）-- å¤‡ä»½
@@ -3769,9 +3771,11 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            if (result.data.length > 0) {
                            $("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
                            $("#HTakeSampleCheckBillNo").val(result.data[0]["单据号"]);
                        } 
                        } 
                    },
                    error: function (err) {
                        layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

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

@@ -460,9 +460,10 @@
            //#region æŸ¥è¯¢
            function RoadHBillNo(sqlWhere) {
                var ajaxLoad = layer.load();
                sqlWhere+=" order by å•æ®å· desc "
                $.ajax({
                    //h_v_QC_FirstPieceCheckBill
                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList',
                    url: GetWEBURL() + '/QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainList',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] },

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_CollectionOfSingleProductDefects.html

@@ -359,8 +359,8 @@
                    layer.msg("条形码不能为空！")
                    return;
                } else {
                    if (HBarCode.length != 29) {
                        layer.alert("子件条码长度不为29位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                    if (HBarCode.length != 29 && HBarCode.length != 50) {
                        layer.alert("子件条码长度不为29位或50位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        return;
                    }


 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemBGA.html

@@ -387,8 +387,8 @@
                        layer.msg("条形码不能为空！")
                        return;
                    } else {
                        if (HBarCode.length != 29) {
                            layer.alert("子件条码长度不为29位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        if (HBarCode.length != 29 && HBarCode.length != 50) {
                            layer.alert("子件条码长度不为29位或50位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            return;
                        }


 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemStationPlatform.html

@@ -338,8 +338,8 @@
                        layer.msg("条形码不能为空！")
                        return;
                    } else {
                        if (HBarCode.length != 29) {
                            layer.alert("子件条码长度不为29位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        if (HBarCode.length != 29 && HBarCode.length != 50) {
                            layer.alert("子件条码长度不为29位或50位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            return;
                        }


 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeArrangement_PG.html

@@ -520,7 +520,11 @@

            //查询未派工的流转卡
            function get_Display2(sWhere) {
                sWhere += " and ç”Ÿäº§èµ„源 is null  and HBillSubType<>'SUB'";
                sWhere += " and ç”Ÿäº§èµ„源 is null  and HBillSubType<>'SUB' and å·¥åº<>'转工序' ";
                if ($("#HDeptName").val() != "") {
                    sWhere += " and éƒ¨é—¨='" + $("#HDeptName").val() + "'";
                }

                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_ProcessExchangeBillList_PG',

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -345,6 +345,12 @@
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">原料批次</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMateOutBatchNo" id="HMateOutBatchNo">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs3 layui-inline">
@@ -573,12 +579,7 @@
                                                <input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">原料批次</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMateOutBatchNo" id="HMateOutBatchNo" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                       
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">材质</label>
                                            <div class="layui-input-inline">

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -385,7 +385,7 @@
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆä¸»è¡¨ï¼‰
            var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HICMOInterID", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "生产车间代码", "生产车间", "材质", "成品编号", "版本", "总装图号", "图号版本", "子件代码", "子件名称", "子件规格", "委外加工单位代码", "委外加工单位", "设备名称", "设备代码", "原料批次", "补料标记", "项目编号", "主要材料", "关键材料", "产品CODE", "客户简称", "客户要求材料成分", "产品名称2", "客户名称", "生产备注", "重要提示", "原材料编号A", "原材料编号B", "原材料编号C", "原材料编号D", "原材料内码A", "原材料内码B", "原材料内码C", "原材料内码D", "日计划工单号", "客户编码", "芯体规格型号", "芯体物料代码", "源单客户代码", "HEmpID", "HCusID","HBillSubType"];
             //不需要显示的字段 å¯æ‰©å±• ï¼ˆå·¥è‰ºæµç¨‹ï¼‰
            var titleData2 = ["工序号", "出站报废关联数量", "HProcID", "工序代码", "HBackProc", "加工说明", "模具编号", "HCenterID", "工作中心代码", "HDeptID", "加工车间代码", "加工车间", "HGroupID", "班组代码", "班组", "HWorkerID", "操作工代码f", "操作工", "HSourceID", "生产资源代码", "生产资源", "计划数量", "hmainid", "单据号", "hicmointerid", "任务单号", "HICMOEntryID", "HWorkShopID", "生产车间代码", "生产车间", "HMaterID", "产品代码", "产品名称", "规格型号", "HUnitID", "单位代码", "单位", "生产数量", "计划开工日期", "计划完工日期", "摘要", "内部单据号", "委外订单内码", "委外订单子内码", "委外订单号", "HSupID", "供应商", "供应商代码", "表头备注", "HBillType", "isEntrust", "时间单位", "工序计划加工时间", "子计划开工日期", "子计划完工日期", "实际开工日期", "实际完工日期", "开工余量天数", "开工余量固数", "上道固定天数", "生产周期", "加工单价", "最后汇报日期", "加工费用金额", "末道工序", "首道工序", "行关闭人", "关闭类型", "流转卡数量", "委外工单数量", "不合格数量", "超额比例", "良率", "累计良率", "图纸编号", "本工序确认记录", "源单主内码", "源单子内码", "源单单号", "源单类型", "汇报数量", "HEntryID", "hsubid", "HPRDORGID", "组织", "HOrderProcNO"];
            var titleData2 = ["工序号", "出站报废关联数量", "HProcID", "工序代码", "HBackProc", "加工说明", "模具编号", "HCenterID", "工作中心代码", "HDeptID", "加工车间代码", "加工车间", "HGroupID", "班组代码", "班组", "HWorkerID", "操作工代码", "操作工", "HSourceID", "计划数量", "hmainid", "单据号", "hicmointerid", "任务单号", "HICMOEntryID", "HWorkShopID", "生产车间代码", "生产车间", "HMaterID", "产品代码", "产品名称", "规格型号", "批号", "HUnitID", "单位代码", "单位", "生产数量", "计划开工日期", "计划完工日期", "摘要", "内部单据号", "委外订单内码", "委外订单子内码", "委外订单号", "HSupID", "供应商", "供应商代码", "表头备注", "HBillType", "isEntrust", "时间单位", "工序计划加工时间", "子计划开工日期", "子计划完工日期", "实际开工日期", "实际完工日期", "开工余量天数", "开工余量固数", "上道固定天数", "生产周期", "加工单价", "最后汇报日期", "加工费用金额", "末道工序", "首道工序", "行关闭人", "关闭类型", "流转卡数量", "委外工单数量", "不合格数量", "超额比例", "良率", "累计良率", "图纸编号", "本工序确认记录", "源单主内码", "源单子内码", "源单单号", "源单类型", "汇报数量", "HEntryID", "hsubid", "HPRDORGID", "组织", "HOrderProcNO"];
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆå™¨å…·æ¸…单）
            var titleData3 = ["HEntryID", "HMouldID", "HMaterID", "HUnitID", "hmainid","hicmointerid"];
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆå·¥è‰ºå‚数清单）

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html

@@ -252,48 +252,6 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产资源2</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产资源3</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产资源4</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产资源5</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">进站时间</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HStationInTime" id="HStationInTime" style="background-color:#efefef4d;" readonly>