wtt
2024-07-04 3b57005ff0ece33bde3cce11bc3a93ab57722071
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
18个文件已修改
904 ■■■■ 已修改文件
WebTM/WebTM.csproj.user 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig2.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/IpadIndex.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/增加不良评审单/QC_Add_NoPassProdCheckBill.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html 167 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/Sc_MESExecptFeedBackBillType.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/Sc_Reply_MESExecptFeedBackBill.html 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBillSumSave.html 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/安灯逐级呼叫规则/OA_AndengFlowRuleBillMain.html 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html 131 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html 120 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/异常反馈/OA_ErrMsgBackSelfQuery.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html 124 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-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>
@@ -16,8 +16,9 @@
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>views/user/login.html</StartPageUrl>
          <StartAction>SpecificPage</StartAction>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>
WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,10 +6,10 @@
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    /*var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置*/
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
WebTM/layuiadmin/Scripts/webConfig2.js
@@ -1,13 +1,13 @@
function GetWEBURL() {
    var WEBURL = "http://localhost:8082/SMEAPI/";   //本地环境
    //var WEBURL = 'http://61.130.182.102:18181/WebAPI/';   //斯莫尔客户环境 å¤–网
    //var WEBURL = "http://localhost:8082/SMEAPI/";   //本地环境
    var WEBURL = 'http://30.10.7.6:8080/WebAPI/';   //斯莫尔客户环境 å¤–网
    //var WEBURL = 'http://10.11.18.195:8080/WebAPI/';   //斯莫尔客户环境
    //WEBURL = "http://192.168.2.168:8082/WebAPI/";   //本地环境
    return WEBURL
}
function GetWEBURL1() {
    var WEBURL = "http://localhost:8082/SMEAPI/";   //本地环境
    //var WEBURL = 'http://61.130.182.102:18181/WebAPI/';   //斯莫尔客户环境 å¤–网
    //var WEBURL = "http://localhost:8082/SMEAPI/";   //本地环境
    var WEBURL = 'http://30.10.7.6:8080/WebAPI/';   //斯莫尔客户环境 å¤–网
    //var WEBURL = 'http://10.11.18.195:8080/WebAPI/';   //斯莫尔客户环境
    //WEBURL = "http://192.168.2.168:8082/WebAPI/";   //本地环境
    return WEBURL
WebTM/views/IpadIndex.html
@@ -1160,7 +1160,8 @@
                    var data = [];
                    data.push({
                        "HICMOBillNo": HICMOBillNo,//工单号
                        "HSourceName": HSBName //设备
                        "HSourceName": HSBName, //设备
                        "HSourceBillNo": HSourceBillNo //工序流转卡
                    });
                    //通过索引获取到当前iframe弹出层
@@ -1404,7 +1405,7 @@
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4" onclick="Abnormal(event,this)">
                                <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-unlink imgicon"></span>
                                    <span class="imgtitle">异常</span>
                                </div>
WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/Ôö¼Ó²»Á¼ÆÀÉóµ¥/QC_Add_NoPassProdCheckBill.html
@@ -2,12 +2,13 @@
<html>
<head>
    <meta charset="utf-8" />
        <title>新增不良评审单</title>
    <title>新增不良评审单</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
@@ -3804,8 +3805,13 @@
            });
            form.on('submit(Cancel)', function () {
                if (linterid == null || linterid == 0) {
                    Pub_Close(2);
                } else {
                    Pub_Close(1);
                }
                //sessionStorage["SourceFlag"] = false;
                parent.location.href = "../../../views/index.html"
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
            })
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackCheckBillMain.html
@@ -551,6 +551,8 @@
                                    var LoadData = data.data;
                                    $("#HDeptID").val(LoadData[0].HDeptID); //部门ID
                                    $("#HDeptName").val(LoadData[0].发送部门); //发送部门
                                    $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //异常类型名称ID
                                    $("#HErrMsgBackTypeName").val(LoadData[0].异常类型名称); //异常类型名称
                                    $("#HSendMan").val(LoadData[0].发送人); //发送人
                                    $("#HReceiveMan").val(LoadData[0].接收人); //接收人
                                    $("#HCopyMan").val(LoadData[0].抄送); //抄送
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html
@@ -121,7 +121,14 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">主题:<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" style="width:485px" readonly>
                                                            <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" readonly>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">异常类型:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HErrMsgBackTypeName" id="HErrMsgBackTypeName" class="layui-input" value="" disabled>
                                                            <input type="hidden" name="HErrMsgBackTypeID" id="HErrMsgBackTypeID" lay-verify="HErrMsgBackTypeID" value="0">
                                                        </div>
                                                    </div>
                                                </div>
@@ -376,12 +383,14 @@
        var HICMOBillNo = "";  //工单号
        var HSourceName = "";  //设备
        var HType = ""; //异常类型
        var HSourceBill = "";//工序流转卡
        var edit = function (data) {
            HICMOBillNo = data[0].HICMOBillNo;
            HSourceName = data[0].HSourceName;
            HType = data[0].HType;
            HSourceBill = data[0].HSourceBillNo;
        }
        var HBillType = "";  //单据类型
        var HMainSourceInterID = ""; //源单主内码
@@ -390,8 +399,8 @@
        var HMainSourceBillType = "";  //源单类型
        var refSav = "";   //提交类型
        var Qty = "";
        //var edit = function (data) {
        //    HBillType = data[0].HBillType;
@@ -438,6 +447,25 @@
            //初始化表单插件
            set_InitFrom();
            //判断是否新增
            if (linterid == null || linterid == 0) {
                //获取最大单据号 new
                $("#HInterID").val("0");
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '4502' },
                    success: function (d) {
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HInterID").val(d.data[0].HInterID);
                    }
                });
            }
            else {//如果修改则走下面 new
                $("#HInterID").val(linterid);//修改时主表ID
            }
            //判断操作类型
            if (OperationType == 1) {//无源单
                set_AddFNew();
@@ -450,14 +478,17 @@
            }
            else if (OperationType == 4) {
                set_AddFNew();
                set_Sc_ICMOBillStatus();//获取工单的 ç‰©æ–™ æ•°é‡
                set_ErrMsgBackType();   //获取异常类型
                set_UserSuperiors();    //获取当前登录人的上级
                var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
                var Person = sessionStorage["HUserName"];
                var Person = sessionStorage["HUserName"];
                //报工台跳转页面自动生成内容
                $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType));
                $("#HContext").val(HType);
                $("#HContext").val(HType);//主题
            }
            else if (OperationType == 5) {  //查看
                set_EditFromGrid();
                set_EditFromGrid();
                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                $('#VerIfySaver').addClass("layui-btn-disabled").attr("disabled", true);
            }
@@ -501,6 +532,98 @@
                    , type: 'datetime'
                });
            }
            //#region   æŠ¥å·¥å°æŒ‘战 è‡ªåŠ¨å¸¦å‡ºæ•°æ®
            //获取报工台跳转信息  ç‰©æ–™ æ•°é‡
            function set_Sc_ICMOBillStatus() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus", //方法所在页面和方法名
                    async: false,
                    data: {
                        "HSourceBill": HSourceBill
                    },
                    success: function (data) {
                        if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        {
                            var LoadData = data.data;
                            $("#HMaterNumber").val(LoadData[0].物料代码); //产品名称
                            $("#HMaterName").val(LoadData[0].物料名称); //产品名称
                            $("#HMaterModel").val(LoadData[0].规格型号); //产品规格
                            $("#HMainSourceBillNo").val(LoadData[0].流转卡号); //源单单号
                            $("#HMainSourceInterID").val(LoadData[0].流转卡主内码); //源单主内码
                            $("#HMainSourceEntryID").val(LoadData[0].流转卡子内码); //源单子内码
                            $("#HMainSourceBillType").val(3772); //源单类型
                            $("#HQty").val(LoadData[0].计划数量); //计划数量
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 });
                    }
                });
            }
            //获取报工台跳转 èŽ·å– å¼‚常类型
            function set_ErrMsgBackType() {
                $.ajax(
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_ErrMsgBackType", //方法所在页面和方法名
                        async: false,
                        data: {
                            "TypeName": HType
                        },
                        success: function (data) {
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var LoadData = data.data;
                                $("#HErrMsgBackTypeID").val(LoadData[0].HItemID); //产品名称
                                $("#HErrMsgBackTypeName ").val(LoadData[0].HName); //产品名称
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
                            }
                        },
                        error: function (err) {
                            layer.alert(err, { icon: 5 });
                        }
                    });
            }
            //获取报工台跳转 èŽ·å– å½“前登录人的上级
            function set_UserSuperiors() {
                $.ajax(
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_UserSuperiors", //方法所在页面和方法名
                        async: false,
                        data: {
                            "HName": sessionStorage["HUserName"]
                        },
                        success: function (data) {
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var LoadData = data.data;
                                $("#HReceiveMan ").val(LoadData[0].用户名称); //接收人
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
                            }
                        },
                        error: function (err) {
                            layer.alert(err, { icon: 5 });
                        }
                    });
            }
            //#endregion
            //无源单新增
            function set_AddFNew() {
@@ -622,27 +745,7 @@
                        layer.alert("发生错误!", { icon: 5 });
                    }
                });
            }
            //判断是否新增
            if (linterid == null || linterid == 0) {
                //获取最大单据号 new
                $("#HInterID").val("0");
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '4502' },
                    success: function (d) {
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HInterID").val(d.data[0].HInterID);
                    }
                });
            }
            else {//如果修改则走下面 new
                $("#HInterID").val(linterid);//修改时主表ID
            }
            }
            //获取下拉选中值
            form.on('select(SourceType)', function (data) {
@@ -1019,16 +1122,18 @@
                });
            });
            //报工太异常跳转自动生成内容
            function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType) {
                // æ‹¼æŽ¥å­—符串
                var result = Datetime + ', ' + Person + '在' + HSourceName + '上生产工单为' + HICMOBillNo + ', å‘生异常类型为:' + HType;
                var result = '异常类型:' + HType + ',订单号:' + HICMOBillNo + ',流转卡号:' + HICMOBillNo
                    + ', äº§å“ç¼–码:' + $("#HMaterNumber").val() + ',产品名称:' + $("#HMaterName").val() + ',规格型号:' + $("#HMaterModel").val()
                    + ',发送人:' + Person + ',发生时间:' + Datetime + ',生产资源:' + HSourceName;
                return result;
            }
            //以上为layui模块
        });
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_MESExecptFeedBackBillType.html
@@ -173,6 +173,7 @@
        //获取参数
        var HICMOBillNo = "";  //工单号
        var HSourceName = "";  //设备
        var HSourceBillNo = "";//工序流转卡
        var HNumber = "";
        var HName = "";
        var HModel = "";
@@ -181,6 +182,7 @@
        var edit = function (data) {
            HICMOBillNo = data[0].HICMOBillNo;
            HSourceName = data[0].HSourceName;
            HSourceBillNo = data[0].HSourceBillNo;
            //HNumber = data[0].HNumber;
            //HName = data[0].HName;
            //HModel = data[0].HModel;
@@ -230,7 +232,8 @@
                                data.push({
                                    "HICMOBillNo": HICMOBillNo,//工单号
                                    "HSourceName": HSourceName, //设备
                                    "HType": value      //异常类型
                                    "HType": value,     //异常类型
                                    "HSourceBillNo": HSourceBillNo      //流转卡号
                                });
                                //通过索引获取到当前iframe弹出层
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Reply_MESExecptFeedBackBill.html
@@ -107,7 +107,7 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">单据号:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off" style="        background-color: #f7f4f4;">
                                                            <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off" style="        background-color: #f7f4f4;">
                                                            <input id="HInterID" name="HInterID" type="hidden" />
                                                            <input id="HEntryID" name="HEntryID" type="hidden" />
                                                        </div>
@@ -121,7 +121,14 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">主题:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" disabled autocomplete="off" style="width:485px;background-color: #f7f4f4;">
                                                            <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" disabled autocomplete="off" style="background-color: #f7f4f4;">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">异常类型:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HErrMsgBackTypeName" id="HErrMsgBackTypeName" class="layui-input" value="" style="background-color: #f7f4f4;" disabled>
                                                            <input type="hidden" name="HErrMsgBackTypeID" id="HErrMsgBackTypeID" lay-verify="HErrMsgBackTypeID" value="0">
                                                        </div>
                                                    </div>
                                                </div>
@@ -148,7 +155,7 @@
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">紧急程度:</label>
                                                            <div class="layui-input-inline">
                                                                <select name="HLevel" lay-filter="HLevel" id="HLevel" disabled>
                                                                <select name="HLevel" lay-filter="HLevel" id="HLevel"  disabled>
                                                                    <option value="普通" selected="selected">普通</option>
                                                                    <option value="紧急">紧急</option>
                                                                </select>
@@ -602,6 +609,9 @@
                                , "HMainSourceBillNo": data.HSourceBillNo                   //源单单号
                                , "HMainSourceBillType": data.HSourceBillType               //源单类型
                                , "HHasten": data.HHasten
                                , "HErrMsgBackTypeID": data.HErrMsgBackTypeID
                                , "HErrMsgBackTypeName": data.HErrMsgBackTypeName
                                , "HMaterNumber": data.HMaterNumber
                                , "HMaterName": data.HMaterName
                                , "HMaterModel": data.HMaterModel
                                , "HQty": data.HQty
WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBill.html
@@ -83,12 +83,12 @@
                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <!--<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="HBadReasonHQty" id="HBadReasonHQty" value="0">
                                            </div>
                                        </div>
                                        </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -383,7 +383,7 @@
            //var HSouceBillType = 3722;
            get_Display_UserList();
            get_ConfigFileInfo_EquipFile();
            //get_ConfigFileInfo_EquipFile();
            //判断操作类型
            if (OperationType == 1) {//无源单新增
@@ -398,9 +398,12 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                        $("#HMaker").val(sessionStorage["HUserName"]);
                        $("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                        $("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组
                        $("#HProcID").val(sessionStorage["HProcID"]); //工序ID
                        $("#HProcNo").val(sessionStorage["HProcName"]); //工序名称
                        $("#HSourceID").val(sessionStorage["HSource"]); //生产资源ID
                        $("#HSourceName").val(sessionStorage["HSourceID"]); //生产资源名称
                        layer.close(ajaxLoad);
                    }
                });
@@ -417,10 +420,7 @@
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                        $("#HMaker").val(sessionStorage["HUserName"]);
                        $("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                        $("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                        layer.close(ajaxLoad);
                    }
                });
@@ -470,7 +470,31 @@
            //#region æ‰¹é‡ä¿å­˜æŒ‰é’®
            form.on('submit(btnSumSave)', function () {
            form.on('submit(btnSumSave)', function (data) {
                var sMainStr = JSON.stringify(data.field);
                var oMain = sMainStr + ';' + OperationType;
                var ajaxLoad = layer.load();
                $("#HBarCode").val("");
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_QualityReportBill/set_SaveBarCode",
                    async: true,
                    data: { "oMain": oMain },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            layer.close(ajaxLoad);
                        }
                        else {
                            layer.close(ajaxLoad);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(ajaxLoad);
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
                get_SumSave();
            });
            //#endregion
@@ -601,7 +625,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',
                    type: "GET",
                    data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"],"HBadReasonHQty": $("#HBadReasonHQty").val() },
                    data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"]/*,"HBadReasonHQty": $("#HBadReasonHQty").val()*/ },
                    success: function (result) {
                        if (result.count == 1) {
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -686,6 +710,10 @@
                            $("#HCheckManName").val(data1.data[0]["质检员"]);
                            $("#HGroupID").val(data1.data[0]["HGroupID"]);
                            $("#HGroupName").val(data1.data[0]["生产班组"]);
                            $("#HProcID").val(data1.data[0]["HProcID"]); //工序ID
                            $("#HProcNo").val(data1.data[0]["工序"]); //工序名称
                            $("#HSourceID").val(data1.data[0]["HSourceID"]); //生产资源ID
                            $("#HSourceName").val(data1.data[0]["生产资源"]); //生产资源名称
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
@@ -806,6 +834,7 @@
                            "HInterID":$("#HInterID").val(),
                            "HBillNo":$("#HBillNo").val(),
                            "HMaterID": $("#HMaterID").val(),
                            "HMaterNumber": $("#HMaterNumber").val(),
                            "HMaterName": $("#HMaterName").val(),
                            "HProcID": $("#HProcID").val(),
                            "HProcNo": $("#HProcNo").val(),
WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillSumSave.html
@@ -35,9 +35,7 @@
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 2px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">反审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <h1 style="text-align: center; padding: 10px 0;"><b>不良采集批量保存</b></h1>
@@ -53,7 +51,7 @@
                                        <div class="layui-col-xs4  layui-inline">
                                            <label class="layui-form-label">单据号<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline" >
                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HBillNo_bak" lay-verify="HBillNo_bak" id="HBillNo_bak" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
                                            </div>
                                        </div>
@@ -98,14 +96,14 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label"><span style="color:red;">*</span>生产资源</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label"><span style="color:red;">*</span>生产班组</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HGroupID" id="HGroupID" value="0">
                                            </div>
                                        </div>
@@ -218,6 +216,7 @@
    </script>
    <script>
        var HMaterID = "";        // ç‰©æ–™ID
        var HMaterNumber = "";        // ç‰©æ–™ä»£ç 
        var HMaterName = "";      // ç‰©æ–™åç§°
        var HGroupID = "";        // ç­ç»„ID
        var HGroupName = "";      // ç­ç»„名称
@@ -232,13 +231,14 @@
        var HProcID = "";           //工序
        var HProcNo = "";           //工序名称
        var HInterID = "";
        var HBillNo = "";
        var HBillNo_bak = "";
       
        var edit = function (data) {
            HInterID = data[0].HInterID;
            HBillNo = data[0].HBillNo;
            HBillNo_bak = data[0].HBillNo;
            HMaterID = data[0].HMaterID;
            HMaterNumber = data[0].HMaterNumber;
            HMaterName = data[0].HMaterName;
            HProcID = data[0].HProcID;
            HProcNo = data[0].HProcNo;
@@ -307,8 +307,9 @@
                OperationType = 1;
                $("#HInterID").val(HInterID),
                $("#HBillNo").val(HBillNo),
                $("#HMaterID").val(HMaterID);
                $("#HBillNo_bak").val(HBillNo_bak),
                $("#HMaterID").val(HMaterID);
                $("#HMaterNumber").val(HMaterNumber);
                $("#HMaterName").val(HMaterName);
                $("#HProcID").val(HProcID);
                $("#HProcNo").val(HProcNo);
@@ -356,9 +357,7 @@
            //#region æ“ä½œæŒ‰é’®è§¦å‘事件
            //#region ä¿å­˜æäº¤
            form.on('submit(btnSave)', function (data) {//提交
                if (AllowLoadData(data)) {
                    set_AddNew(data);
                }
                set_AddNew(data);
            });
            //#endregion
@@ -385,16 +384,16 @@
                var NewRow =
                {
                    "HInterID": $("#HInterID").val(),
                    "HBillNo_bak": $("#HBillNo").val(),
                    "HBillNo_bak": $("#HBillNo_bak").val(),
                    "HMaterID": $("#HMaterID").val(),
                    "HMaterName": $("#HMaterName").val(),
                    "HBadReasonID": "",
                    "HBadReasonNumber": "",
                    "HBadReasonHName": "",
                    "HEmpID": $("#HMaker").val(sessionStorage["HEmpID"]),
                    "HEmpID": sessionStorage["HEmpID"],
                    "HCheckMan": $("#HMaker").val(),
                    "HGroupID": $("#HGroupID").val(),
                    "HGroupName": $("#HGroupName").val(),
                    "HGroupName": HGroupName,
                    "HSourceID": $("#HSourceID").val(),
                    "HSourceName": $("#HSourceName").val(),
                    "HQty": "",
@@ -535,7 +534,7 @@
                        , { field: 'HMaterID', title: '物料id', hide: true }
                        , { field: 'HMaterName', title: '物料名称', style: 'background-color: #f9f9f9;' }
                        , { field: 'HBadReasonID', title: '不良原因id', hide: true }
                        , { field: 'HBadReasonNumber', title: '不良原因代码', event: "HBadReasonNumber"}
                        , { field: 'HBadReasonNumber', title: '不良原因代码', edit: 'text' , event: "HBadReasonNumber"}
                        , { field: 'HBadReasonHName', title: '不良原因', style: 'background-color: #f9f9f9;' }
                        , { field: 'HEmpID', title: '检验员id', hide: true }
                        , { field: 'HCheckMan', title: '检验员', event: "HCheckMan" }
@@ -563,16 +562,16 @@
                var rowdata = [
                    {
                        "HInterID": $("#HInterID").val(),
                        "HBillNo_bak": $("#HBillNo").val(),
                        "HBillNo_bak": $("#HBillNo_bak").val(),
                        "HMaterID": $("#HMaterID").val(),
                        "HMaterName": $("#HMaterName").val(),
                        "HBadReasonID": "",
                        "HBadReasonNumber": "",
                        "HBadReasonHName": "",
                        "HEmpID": $("#HMaker").val(sessionStorage["HEmpID"]),
                        "HEmpID": sessionStorage["HEmpID"],
                        "HCheckMan": $("#HMaker").val(),
                        "HGroupID": $("#HGroupID").val(),
                        "HGroupName": $("#HGroupName").val(),
                        "HGroupName": HGroupName,
                        "HSourceID": $("#HSourceID").val(),
                        "HSourceName": $("#HSourceName").val(),
                        "HQty": "",
@@ -633,7 +632,7 @@
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Sc_MESTransFerWorkBill/SaveOA_AndengFlowRuleBill",
                    url: GetWEBURL() + "Sc_QualityReportBill/SaveSc_QualityReportBillSub",
                    async: true,
                    data: { "msg": sMainSub },
                    dataType: "json",
@@ -656,27 +655,7 @@
                });
            }
            //#endregion
            //#region éžç©ºéªŒè¯
            function AllowLoadData(data) {
                //#region è¡¨å¤´æ•°æ®æ£€éªŒ
                if ($("#HBillNo").val() == "") {
                    layer.msg("单据号不能为空!");
                    return false;
                }
                //#endregion
                return true;
            }
            //#endregion
            //#region å­è¡¨ï¼šåˆ é™¤æŒ‡å®šè¡Œ
            function set_GridDelete(obj) {
WebTM/views/ÖÊÁ¿¹ÜÀí/°²µÆÖ𼶺ô½Ð¹æÔò/OA_AndengFlowRuleBillMain.html
@@ -225,7 +225,14 @@
            <option value="消息">消息</option>
            <option value="同时接收">同时接收</option>
        </select>
    </script>
    </script>
    <!--复选框 å®Œæˆæ ‡è®°-->
    <script type="text/html" id="HIsRece">
        <div class="layui-input-block" style="margin-left: 20px;">
            <input type="checkbox" name="HIsRece" lay-filter="HIsRece" id="HIsRece{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
        </div>
    </script>
    <script>
@@ -395,6 +402,8 @@
                    , "HDutyNumber": ""
                    , "HDutyName": ""
                    , "HTimes": ""
                    ,"HReceiveType":""
                    , "HIsRece": false
                    , "HRemark": ""
                    , "HReceiveType": ""
                    , "HSourceInterID": "0"
@@ -407,11 +416,19 @@
                        table.cache["mainTable"].push(NewRow);
                        option.data = table.cache["mainTable"];
                        table.render(option);
                        CheckedSet_tableSub();
                        for (var i = 1; i <= option.data.length; i++) {
                            $('#HReceiveType' + i + '').find("option[value='" + option.data[i - 1].HReceiveType + "']").attr("selected", true);
                            $('#HReceiveType' + i + '').find("option[value='" + option.data[i - 1].HReceiveType + "']").attr("selected", true);
                        }
                        for (var i = 1; i <= option.data.length; i++) {
                            //完成标记
                            if (option.data[i - 1].HIsRece) {
                                $('#HIsRece' + i + '').attr("checked", true);
                            }
                        }
                        form.render('select');
                        form.render('checkbox');
                        break;
                    case 'btn-CopyLine':
                        var copydata = JSON.stringify(data);
@@ -427,11 +444,19 @@
                            table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.render(option);//将数据渲染到表格上
                            CheckedSet_tableSub();
                            for (var i = 1; i <= option.data.length; i++) {
                                $('#HReceiveType' + i + '').find("option[value='" + option.data[i - 1].HReceiveType + "']").attr("selected", true);
                            }
                            for (var i = 1; i <= option.data.length; i++) {
                                //完成标记
                                if (option.data[i - 1].HIsRece) {
                                    $('#HIsRece' + i + '').attr("checked", true);
                                }
                            }
                            form.render('select');
                            form.render('checkbox');
                        }
                        break;
                    //上一行
@@ -550,7 +575,7 @@
                        , { field: 'HDutyName', title: '职务名称', edit: 'text', event: "HDutyName", style: 'background-color: #f9f9f9;' } //f7
                        , { field: 'HTimes', title: '触发时间', edit: 'text', style: 'background-color: #f9f9f9;', }
                        , { field: 'HReceiveType', title: '接收模式', style: 'background-color: #f9f9f9;', templet: '#HReceiveType' }
                        , { field: 'HIsRece', title: '完成标记', templet: "#HIsRece" }//checkbox
                        , { field: 'HRemark', title: '备注', edit: 'text' }
                        , { field: 'HSourceInterID', title: '源单内码', hide: true, style: 'background-color: #f9f9f9;' }     //f7
                        , { field: 'HSourceEntryID', title: '源单子内码', hide: true, style: 'background-color: #f9f9f9;' }     //f7
@@ -568,7 +593,8 @@
                        , "HDutyName": ""
                        , "HTimes": ""
                        , "HRemark": ""
                        , "HReceiveType": "短信"
                        , "HReceiveType": "短信"
                        , "HIsRece": false
                        , "HSourceInterID": "0"
                        , "HSourceEntryID": "0"
                        , "HSourceBillNo": ""
@@ -590,6 +616,19 @@
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HReceiveType = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
            //#endregion
            //#region å®Œæˆæ ‡è®°
            form.on('checkbox(HIsRece)', function (data) {
                //获取下拉框选中的值
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HIsRece = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
@@ -789,7 +828,7 @@
                                {
                                    "HSNO": tableSub[i].流程号, "HDutyID": tableSub[i].HDutyID, "HDutyNumber": tableSub[i].职务编码,
                                    "HDutyName": tableSub[i].职务, "HTimes": tableSub[i].触发时间, "HRemark": tableSub[i].备注,
                                    "HReceiveType": tableSub[i].接收模式
                                    "HReceiveType": tableSub[i].接收模式, "HIsRece": tableSub[i].是否发送
                                }
                            )
                        }
@@ -797,14 +836,14 @@
                        table.render(option);
                        for (var i = 0; i < rowdata.length; i++) {
                            $('#HReceiveType' + (i + 1)).find("option[value='" + tableSub[i].接收模式 + "']").attr("selected", true);
                            $('#HIsRece' + (i + 1)).attr("checked", true);
                        }
                        form.render('select');
                        form.render('checkbox');
                    }
                })
            }
            //#endregion
            //#endregion
            //#region å®¡æ ¸
@@ -956,6 +995,19 @@
            }
            //#endregion
            //#region åˆ·æ–°è®¾ç½®å¤é€‰æ¡†çŠ¶æ€
            function CheckedSet_tableSub() {
                var tableSub = option.data;
                //对子表中的复选框进行选中
                for (var i = 0; i < tableSub.length; i++) {
                    if (tableSub[i].HIsRece) {
                        $('#HIsRece' + (i + 1)).attr("checked", true);
                    }
                }
                form.render('checkbox');
            }
            //#endregion
            //#region éšè—åˆ—设置
            function get_HideColumn() {
@@ -1102,7 +1154,7 @@
                $("#HReceiveDeptName").val(obj[0].部门名称);
                $("#HReceiveDeptID").val(obj[0].HItemID);
            }
        }
        //异常呼叫类型
        function GetErrMsgBackTypeValue(obj) {
WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckOtherill.html
@@ -216,9 +216,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>
@@ -358,13 +362,13 @@
                                    <div class="layui-inline">
                                        <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="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
                                            <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <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="HSampleDamageQty" id="HSampleDamageQty" style="">
                                            <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" value="0" style="">
                                        </div>
                                    </div>
                                </div>
@@ -407,7 +411,7 @@
                                    <div class="layui-inline">
                                        <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="HRejectQty" id="HRejectQty" style="background-color:#efefef4d;" readonly>
                                            <input type="text" class="layui-input" name="HRejectQty" id="HRejectQty"  value="0" style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                    <!--<div class="layui-inline">
@@ -739,7 +743,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);//有源单时流转卡号按钮禁用
@@ -841,6 +845,7 @@
            //根据源单id获取源单信息(工序流转卡)
            function LoadingInformation_ProcExchange() {
                $('#btnSearchSource').removeClass("layui-btn-disabled").attr("disabled", false);//生产资源按钮启用
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/QC_PatrolProcCheckOtherBill/get_ProcessExchangeBill',
@@ -1003,8 +1008,8 @@
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
                    "HStrictness": "", "HSampleUnRightQty": "0", "HAQL": "", "HSamplingType": ""
                };
                switch (obj.event) {
@@ -1523,7 +1528,7 @@
                            for (var i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目": 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,
@@ -2040,6 +2045,7 @@
                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                        get_ICMOBillStatusList();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
@@ -2053,6 +2059,46 @@
                    }
                });
            });
            //表头信息工序
            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(btnHShifts)', function () {
@@ -2189,7 +2235,7 @@
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
                    "HStrictness": "", "HSampleUnRightQty": "0", "HAQL": "", "HSamplingType": ""
                }];
                option = {
@@ -2203,6 +2249,7 @@
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号', totalRow: true }
                        , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
                        , { field: '检验项目代码', title: '检验项目代码' }
                        , { field: '检验项目', title: '检验项目', edit: 'text', event: 'HQCCheckItemID' }
                        , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
                        , { field: '检验仪器', title: '检验仪器', edit: 'text', event: 'HInspectInstruMentID' }
@@ -2212,6 +2259,9 @@
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HInspectVal', title: '检验值' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值'  }
                        , { field: 'HMax', title: '最大值', edit: 'text', totalRow: true }
                        , { field: 'HMin', title: '最小值', edit: 'text', totalRow: true }
                        , { field: 'HAvg', title: '平均值', edit: 'text', totalRow: true }
@@ -2231,10 +2281,7 @@
                        , { field: 'xxx', title: '比较符', edit: 'text', hide: true }
                        , { field: 'HUnitID', title: '单位ID', edit: 'text', hide: true }
                        , { field: 'HUnit', title: '单位', edit: 'text', hide: true }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text', hide: true }
                        , { field: 'HTargetVal', title: '目标值', edit: 'text', hide: true }
                        , { field: 'HUpLimit', title: '上限值', edit: 'text', hide: true }
                        , { field: 'HDownLimit', title: '下限值', edit: 'text', hide: true }
                        , { field: 'HUpOffSet', title: '上偏差', edit: 'text', hide: true }
                        , { field: 'HDownOffSet', title: '下偏差', edit: 'text', hide: true }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 85 }
@@ -2629,21 +2676,21 @@
                    $("#HDownLimit").val(0);
                    $("#HUpOffSet").val(0);
                    $("#HDownOffSet").val(0);
                    $("#HSampleDamageQty").val("")
                    $("#HSampleQty").val("")
                    $("#HSampleDamageQty").val("0")
                    $("#HSampleQty").val("0")
                    $("#HSampleQty2").val("")
                    $("#HAcceptQty").val("0")
                    $("#HInspectionLevel").val("")
                    $("#HRejectQty").val("")
                    $("#HRejectQty").val("0")
                    $("#HStrictness").val("")
                    $("#HSampleUnRightQty").val("")
                    $("#HSampleUnRightQty2").val("")
                    $("#HSampleUnRightQty").val("0")
                    $("#HSampleUnRightQty2").val("0")
                    $("#HAQL").val("")
                    $("#HSamplingType").val("")
                    $("#HSampleQty").val("")
                    $("#HSampleQty").val("0")
                    $("#HInspectResultToSee").val("")
                    $("#HInspectResultToSee2").val("")
                    $("#HSampleUnRightQty").val("")
                    $("#HSampleUnRightQty").val("0")
                    $("#HUnitID").val("0")
                    $("#HUnitName").val("")
                    $("#HInspectValB").val("0")
@@ -3217,7 +3264,47 @@
                $("#HInspectResultToSee2").val(HInspectResultToSee);
                LastResult();
            };
             //#endregion
             //#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: "温馨提示" });
                    }
                })
            }
            //获取不合格数总数
            function addUnRightQty() {
WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html
@@ -212,6 +212,16 @@
                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="不合格">
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1">
                                            <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>
                                </div>
                            </div>
@@ -354,13 +364,13 @@
                                    <div class="layui-inline">
                                        <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="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
                                            <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <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="HSampleDamageQty" id="HSampleDamageQty" style="">
                                            <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" value="0" style="">
                                        </div>
                                    </div>
                                </div>
@@ -917,6 +927,7 @@
            //根据源单id获取源单信息(工序流转卡)
            function LoadingInformation_ProcExchange() {
                $('#btnSearchSource').removeClass("layui-btn-disabled").attr("disabled", false);//生产资源按钮启用
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
@@ -965,8 +976,8 @@
                var NewRow = {
                     "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": 0, "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                };
                switch (obj.event) {
@@ -1469,7 +1480,7 @@
                            for (var i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目": 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,
@@ -1873,9 +1884,9 @@
                                    //"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                                    //}
                                    {
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "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": "",
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "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].抽样类型
                                    }
@@ -2061,6 +2072,46 @@
                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                        $("#HSourceID").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(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) {
                        //按钮【按钮二】的回调
@@ -2128,8 +2179,8 @@
                rowdata = [{
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": 0, "检验仪器": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                }];
                option = {
@@ -2143,6 +2194,7 @@
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号', totalRow: true }
                        , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
                        , { field: '检验项目代码', title: '检验项目代码' }
                        , { field: '检验项目', title: '检验项目', edit: 'text', event: 'HQCCheckItemID' }
                        , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
                        , { field: '检验仪器', title: '检验仪器', edit: 'text', event: 'HInspectInstruMentID' }
@@ -2153,6 +2205,9 @@
                        //, { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HInspectVal', title: '检验值' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值' }
                        , { field: 'HMax', title: '最大值', edit: 'text', totalRow: true}
                        , { field: 'HMin', title: '最小值', edit: 'text', totalRow: true }
                        , { field: 'HAvg', title: '平均值', edit: 'text', totalRow: true }
@@ -2173,10 +2228,7 @@
                        , { field: 'xxx', title: '比较符', edit: 'text', hide: true }
                        , { field: 'HUnitID', title: '单位ID', edit: 'text', hide: true }
                        , { field: 'HUnit', title: '单位', edit: 'text', hide: true }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text', hide: true }
                        , { field: 'HTargetVal', title: '目标值', edit: 'text', hide: true }
                        , { field: 'HUpLimit', title: '上限值', edit: 'text', hide: true }
                        , { field: 'HDownLimit', title: '下限值', edit: 'text', hide: true }
                        , { field: 'HUpOffSet', title: '上偏差', edit: 'text', hide: true }
                        , { field: 'HDownOffSet', title: '下偏差', edit: 'text', hide: true }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 85  }
@@ -2970,8 +3022,8 @@
                    $("#HDownLimit").val(0);
                    $("#HUpOffSet").val(0);
                    $("#HDownOffSet").val(0);
                    $("#HSampleDamageQty").val("")
                    $("#HSampleQty").val("")
                    $("#HSampleDamageQty").val("0")
                    $("#HSampleQty").val("0")
                    $("#HSampleQty2").val("")
                    $("#HAcceptQty").val("0")
                    $("#HInspectionLevel").val("")
@@ -2981,7 +3033,7 @@
                    $("#HSampleUnRightQty2").val("")
                    $("#HAQL").val("")
                    $("#HSamplingType").val("")
                    $("#HSampleQty").val("")
                    $("#HSampleQty").val("0")
                    $("#HInspectResultToSee").val("")
                    $("#HInspectResultToSee2").val("")
                    $("#HSampleUnRightQty").val("")
@@ -3260,6 +3312,44 @@
                })
            }
            //根据生产资源或者 å·¥åº æŸ¥è¯¢ç”Ÿäº§å·¥å•信息
            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: "温馨提示" });
                    }
                })
            }
            //获取不合格数总数
            function addUnRightQty() {
                //循环检验值表格数据,获取不合格数量
WebTM/views/ÖÊÁ¿¹ÜÀí/Òì³£·´À¡/OA_ErrMsgBackSelfQuery.html
@@ -326,13 +326,14 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].HInterID.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '新增异常反馈接收单'
                        , shift: 0//弹出动画
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                        , btn: [],
                        end: function (index, layero, that) {
                            //刷新页面
@@ -348,13 +349,14 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].HInterID.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '新增异常反馈签到单'
                        , shift: 0//弹出动画
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                        , btn: [],
                        end: function (index, layero, that) {
                            //刷新页面
@@ -370,13 +372,14 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].HInterID.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '新增异常反馈验收单'
                        , shift: 0//弹出动画
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                        , btn: [],
                        end: function (index, layero, that) {
                            //刷新页面
@@ -387,7 +390,7 @@
            }
            //#region æ±‡æŠ¥
            //#region æŸ¥çœ‹
            function View() {
                var activeTab = getActiveTab();
@@ -402,15 +405,16 @@
                        , data = checkStatus.data;
                }
                var HInterID = data[0].HInterID;
                var HInterID = data[0].HInterID.toString();
                var HEntryID = data[0].HEntryID.toString();
                if (data.length == 1) {
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '工作任务-下推'
                        , title: '异常反馈单查看'
                        , shift: 0//弹出动画
                        , content: '../../生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html?OperationType=5&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
                        , content: '../../生产管理/异常反馈单/Sc_Reply_MESExecptFeedBackBill.html?OperationType=3&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        btn1: function (index, layero, that) {
@@ -420,7 +424,7 @@
                    })
                }
                else {
                    layer.msg('请选择一行数据下推!');
                    layer.msg('无法查看!');
                }
            }
            //#endregion
WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_InspectionFormReport.html
@@ -203,6 +203,8 @@
            var sWhere = "";
            var option = [];
            var HModName = "QC_InspectionFormReport";
            var optionAVG = [];
            var optionS = [];
            //#endregion
            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
@@ -302,14 +304,15 @@
                set_InitGrid();
                //get_FastQuery();
                DisPlay_HideColumn();
                //set_Line();
                set_Line();
            }
            //初始化表格
            function set_InitGrid() {
                var columns = [];
                columns.push({ type: 'numbers', title: '序号' });
                //columns.push({ type: 'numbers', title: '序号' });
                columns.push({ field:"Id", title: "序号", width: 70 });
            
                //获取两个月期之间的相差
                var time1 = Date.parse(new Date($("#HBeginDate").val()));//开始时间
@@ -326,7 +329,7 @@
                var k = 0;//收集循环次数
                for (var j = 0; j <= (Days - k); j++) {
                    columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
                    columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 120 })
                    //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                    if (MM == 12 && (HBEGINDATE + j) == 31) {
                        yyyy += 1;
@@ -350,7 +353,6 @@
                    , height: 'full-50'
                    , cellMinWidth: 90
                    , limit: 500
                    , totalRow: true
                    , loading: false
                    , cols: [columns]
                    , done: function (res, curr, count) {
@@ -370,9 +372,13 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var limit = parseInt($("#limit").val());//样本数
                            option.data = data1.data;
                            optionAVG = data1.data[limit + 1];
                            optionS = data1.data[limit + 2];
                            table.render(option);
                            layer.close(wait);
                            set_Line();
                        } else {
                            layer.close(wait);
                            layer.alert(data1.Message, { icon: 5 });
@@ -394,21 +400,58 @@
                let H_X = [];//x轴标题
                let HAvg = [];//平均值
                let HDifference = [];//差值
                for (let i = 1; i <= 25; i++) {
                //获取两个月期之间的相差
                var time1 = Date.parse(new Date($("#HBeginDate").val()));//开始时间
                var time2 = Date.parse(new Date($("#HEndDate").val()));//结束时间
                var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
                //获取年
                var yyyy = new Date($("#HBeginDate").val()).getFullYear();
                //获取月份
                var MM = new Date($("#HBeginDate").val()).getMonth() + 1;
                //获取开始月份的最大天数
                var SumMonth = new Date(yyyy, MM, 0).getDate(); //动态两月之差
                //获取开始日期的天数
                var HBEGINDATE = new Date(new Date($("#HBeginDate").val())).getDate(); //获取开始日期天数
                var k = 0;//收集循环次数
                for (var j = 0; j <= (Days - k); j++) {
                    /* columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 120 })*/
                    if (optionAVG != [] || optionS != []) {
                        HAvg.push(optionAVG[Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')]);
                        HDifference.push(optionS[Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')]);
                    } else {
                        HAvg.push(0);
                        HDifference.push(0);
                    }
                    //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                    if (MM == 12 && (HBEGINDATE + j) == 31) {
                        yyyy += 1;
                        MM = 1;
                        SumMonth = new Date(yyyy, MM, 0).getDate();
                        HBEGINDATE = 0;
                        k += j;
                        j = 0;
                    } else if ((HBEGINDATE + j) == SumMonth) { //跨月 æœˆæ•°åР䏀  å¤©æ•°ä»Žä¸€å¼€å§‹
                        HBEGINDATE = 0;
                        MM += 1;
                        SumMonth = new Date(yyyy, MM, 0).getDate();
                        k += j;
                        j = 0;
                    }
                }
                for (let i = 1; i <= Days; i++) {
                    H_X.push(i);
                }
                for (let j = 1; j <= 25; j++) {
                    var avg = 0;
                    for (let i = 0; i < option.data.length; i++) {
                        avg += Number(option.data[i][j]);
                    }
                    avg = avg / option.data.length;
                    HAvg.push(avg.toFixed(2));
                }
                option_ZXT_Avg = {
                    title: {
                        text: '平均值',
                        left: 'center'
                    },
                    grid: {
                        x: '3%', //相当于距离左边效果:padding-left
                        //y: '5%',  //相当于距离上边效果:padding-top
@@ -448,6 +491,7 @@
                                    { type: 'average', name: 'Avg', lineStyle: { color: 'blue' } },
                                    { type: 'min', name: 'Min', lineStyle: { color: 'green' } },
                                ]
                            },
                        }
                    ]
@@ -459,21 +503,11 @@
                var myChart = echarts.init(chartDom);
                var option_ZXT_Diff;
                let HDifference = [];//差值
                var HArr = []; //装检验值
                for (let j = 1; j <= 25; j++) {
                    HArr = [];
                    for (let i = 0; i < option.data.length; i++) {
                        HArr.push(option.data[i][j]);
                    }
                    var HMaxValue = Math.max(...HArr);//获取数组中的最大值
                    var HMinValue = Math.min(...HArr);//获取数组中的最小值
                    HDifference.push(Number(HMaxValue) - Number(HMinValue));
                }
                option_ZXT_Diff = {
                    title: {
                        text: '差值',
                        left: 'center'
                    },
                    grid: {
                        x: '3%', //相当于距离左边效果:padding-left
                        //y: '5%',  //相当于距离上边效果:padding-top
@@ -586,7 +620,8 @@
                    , HMaterID: HMaterID
                    , HQCCheckItemID: HQCCheckItemID
                }
                //初始化表格
                set_InitGrid();
                get_Display(JSON.stringify(sWhere));
                //调用接口后清空sWhere缓存
                sWhere = "";
WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html
@@ -219,9 +219,13 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1" style="margin-left:20px;">
                                            <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>
@@ -366,13 +370,13 @@
                                    <div class="layui-inline">
                                        <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="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
                                            <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty"  value="0"  style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <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="HSampleDamageQty" id="HSampleDamageQty" style="">
                                            <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty"  value="0" style="">
                                        </div>
                                    </div>
                                </div>
@@ -867,6 +871,8 @@
            //根据源单id获取源单信息(工序流转卡)
            function LoadingInformation_ProcExchange() {
                $('#btnSearchSource').removeClass("layui-btn-disabled").attr("disabled", false);//生产资源按钮启用
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
@@ -1032,8 +1038,8 @@
                var NewRow = {
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                };
@@ -1574,7 +1580,7 @@
                            for (var i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目": 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,
@@ -1935,9 +1941,9 @@
                                //子表  èµ‹å€¼
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "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": "",
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "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].抽样类型
                                    }
@@ -2125,6 +2131,7 @@
                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                        get_ICMOBillStatusList();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
@@ -2139,6 +2146,46 @@
                });
            });
            //表头信息工序
            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(btnHShifts)', function () {
                //页面层-自定义
@@ -2233,8 +2280,8 @@
                rowdata = [{
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                }];
                option = {
@@ -2248,6 +2295,7 @@
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号', totalRow: true }
                        , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
                        , { field: '检验项目代码', title: '检验项目代码'}
                        , { field: '检验项目', title: '检验项目', edit: 'text', event: 'HQCCheckItemID' }
                        , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
                        , { field: '检验仪器', title: '检验仪器', edit: 'text', event: 'HInspectInstruMentID' }
@@ -2256,11 +2304,13 @@
                        , { field: 'HKeyInspect', title: '重点检查', templet: '#HKeyInspect', unresize: false }
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HInspectVal', title: '检验值' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值' }
                        , { field: 'HMax', title: '最大值', edit: 'text', totalRow: true }
                        , { field: 'HMin', title: '最小值', edit: 'text', totalRow: true }
                        , { field: 'HAvg', title: '平均值', edit: 'text', totalRow: true }
                        , { field: 'HSampleSchemeID', title: '抽样方案ID', edit: 'text', hide: true }
                        , { field: 'HSampleSchemeName', title: '抽样方案', edit: 'text', hide: true }
                        , { field: 'HSampleQty', title: '样本量', edit: 'text', hide: true }
@@ -2276,10 +2326,7 @@
                        , { field: 'xxx', title: '比较符', edit: 'text', hide: true }
                        , { field: 'HUnitID', title: '单位ID', edit: 'text', hide: true }
                        , { field: 'HUnit', title: '单位', edit: 'text', hide: true }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text', hide: true }
                        , { field: 'HTargetVal', title: '目标值', edit: 'text', hide: true }
                        , { field: 'HUpLimit', title: '上限值', edit: 'text', hide: true }
                        , { field: 'HDownLimit', title: '下限值', edit: 'text', hide: true }
                        , { field: 'HUpOffSet', title: '上偏差', edit: 'text', hide: true }
                        , { field: 'HDownOffSet', title: '下偏差', edit: 'text', hide: true }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 85 }
@@ -3088,8 +3135,8 @@
                    $("#HDownLimit").val(0);
                    $("#HUpOffSet").val(0);
                    $("#HDownOffSet").val(0);
                    $("#HSampleDamageQty").val("")
                    $("#HSampleQty").val("")
                    $("#HSampleDamageQty").val("0")
                    $("#HSampleQty").val("0")
                    $("#HSampleQty2").val("")
                    $("#HAcceptQty").val("0")
                    $("#HInspectionLevel").val("")
@@ -3099,7 +3146,7 @@
                    $("#HSampleUnRightQty2").val("")
                    $("#HAQL").val("")
                    $("#HSamplingType").val("")
                    $("#HSampleQty").val("")
                    $("#HSampleQty").val("0")
                    $("#HInspectResultToSee").val("")
                    $("#HInspectResultToSee2").val("")
                    $("#HSampleUnRightQty").val("")
@@ -3656,6 +3703,45 @@
                });
            }
            //根据生产资源或者 å·¥åº æŸ¥è¯¢ç”Ÿäº§å·¥å•信息
            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/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
@@ -770,9 +770,10 @@
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'"
                }
                if (HDeptName!="0") {
                if (HDeptName != "0") {
                    sWhere += " and HWorkShopID like '%" + HDeptName + "%'"
                }
                if (HErpID) {
                    sWhere += " and å”¯ä¸€ID like '%" + HErpID + "%'";
                }
@@ -1007,7 +1008,12 @@
                            }
                            $("#HDeptName").append(HDeptName);
                            if (sessionStorage["HDeptID"] != "0") {
                                $("#HDeptName").val(sessionStorage["HDeptID"]);
                            }
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }