MES-WEB-LayUI.git

parent: af31543b | 补丁 | 提交 | ignore whitespace

yangle

2024-07-03 43c1b4226774fde3a7dd0aff6663931363639766

检验单优化

7个文件已修改

	WebTM/layuiadmin/Scripts/webConfig2.js	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产工序管理/增加不良评审单/QC_Add_NoPassProdCheckBill.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html	115 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html	120 ●●●●● 补丁 \| 查看 \| 原始文档 \| 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/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/Éú²ú¹¤Ðò¹ÜÀí/Ôö¼Ó²»Á¼ÆÀÉóµ¥/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/ÖÊÁ¿¹ÜÀí/Ñ²¼ì¼ÇÂ¼µ¥/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>
@@ -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,7 +1008,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": "",
                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                };

@@ -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": "",
                    "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 }
@@ -2630,7 +2677,7 @@
                    $("#HUpOffSet").val(0);
                    $("#HDownOffSet").val(0);
                    $("#HSampleDamageQty").val("")
                    $("#HSampleQty").val("")
                    $("#HSampleQty").val("0")
                    $("#HSampleQty2").val("")
                    $("#HAcceptQty").val("0")
                    $("#HInspectionLevel").val("")
@@ -2640,7 +2687,7 @@
                    $("#HSampleUnRightQty2").val("")
                    $("#HAQL").val("")
                    $("#HSamplingType").val("")
                    $("#HSampleQty").val("")
                    $("#HSampleQty").val("0")
                    $("#HInspectResultToSee").val("")
                    $("#HInspectResultToSee2").val("")
                    $("#HSampleUnRightQty").val("")
@@ -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/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/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");
                    }

			@@ -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

			@@ -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();//å³éå½åé¡µ
			})

			@@ -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>
			@@ -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,7 +1008,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": "",
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
			};

			@@ -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": "",
			"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 }
			@@ -2630,7 +2677,7 @@
			$("#HUpOffSet").val(0);
			$("#HDownOffSet").val(0);
			$("#HSampleDamageQty").val("")
			$("#HSampleQty").val("")
			$("#HSampleQty").val("0")
			$("#HSampleQty2").val("")
			$("#HAcceptQty").val("0")
			$("#HInspectionLevel").val("")
			@@ -2640,7 +2687,7 @@
			$("#HSampleUnRightQty2").val("")
			$("#HAQL").val("")
			$("#HSamplingType").val("")
			$("#HSampleQty").val("")
			$("#HSampleQty").val("0")
			$("#HInspectResultToSee").val("")
			$("#HInspectResultToSee2").val("")
			$("#HSampleUnRightQty").val("")
			@@ -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() {

			@@ -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() {
			//å¾ªç¯æ£éªå¼è¡¨æ ¼æ°æ®ï¼è·åä¸åæ ¼æ°é

			@@ -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 = "";

			@@ -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) { //å¦æéä¸ãå®æ§åæãï¼åéèå®éãå¶ä»åæ

			@@ -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");
			}