From de6ec938f2fdaa9afdadab14511e4d1716b0ddfe Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 30 十月 2025 10:01:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html |  202 +++++++++++++++-----
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html                 |  216 ++++++++++++--------
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html     |   94 ++++++---
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html                     |   64 -----
 4 files changed, 349 insertions(+), 227 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 358febd..71f28fc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -2020,6 +2020,7 @@
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
                     var linterid = data[0].hmainid.toString();
+                    var HEntryID = data[0].hsubid.toString();
                     var OperationType = 2;
                     layer.open({
                         type: 2
@@ -2028,7 +2029,7 @@
                         , shade: 0.6
                         , maxmin: false
                         , anim: 0
-                        , content: ['../../璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
+                        , content: ['../../璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=' + HEntryID, 'yes']
                         , resize: false
                         , cancel: function () {                         
                         }
@@ -2047,6 +2048,7 @@
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
                     var linterid = data[0].hmainid.toString();
+                    var HEntryID = data[0].hsubid.toString();
                     var OperationType = 2;
                     layer.open({
                         type: 2
@@ -2055,7 +2057,7 @@
                         , shade: 0.6
                         , maxmin: false
                         , anim: 0
-                        , content: ['../../璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
+                        , content: ['../../璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=' + HEntryID, 'yes']
                         , resize: false
                         , cancel: function () {                        
                         }
@@ -2074,6 +2076,7 @@
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
                     var linterid = data[0].hmainid.toString();
+                    var HEntryID = data[0].hsubid.toString();
                     var OperationType = 2;
                     layer.open({
                         type: 2
@@ -2082,7 +2085,7 @@
                         , shade: 0.6
                         , maxmin: false
                         , anim: 0
-                        , content: ['../../璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
+                        , content: ['../../璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=' + HEntryID, 'yes']
                         , resize: false
                         , cancel: function () {                          
                         }
@@ -2094,60 +2097,7 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
             }
-            //宸℃
-            function set_PatrolProcCheck() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var linterid = data[0].hmainid.toString();
-                    var OperationType = 2;
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '宸℃妫�楠屽崟-缂栬緫'
-                        , shade: 0.6
-                        , maxmin: false
-                        , anim: 0
-                        , content: ['../../璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
-                        , resize: false
-                        , cancel: function () {
-                            btnIs();
-                        }
-                        , end: function () {
-                            get_FastQuery(table, option);
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
-            //鏈
-            function set_LastProcCheck() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var linterid = data[0].hmainid.toString();
-                    var OperationType = 2;
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '鏈妫�楠屽崟-缂栬緫'
-                        , shade: 0.6
-                        , maxmin: false
-                        , anim: 0
-                        , content: ['../../璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
-                        , resize: false
-                        , cancel: function () {
-                            btnIs();
-                        }
-                        , end: function () {
-                            get_FastQuery(table, option);
-                        }
-                    })
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
+           
             //鍖呰澶囨敞
             function set_Remark() {
                 var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index 6fadef0..6a2e715 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -135,7 +135,7 @@
                                         <div class="layui-inline" id="hidediv1">
                                             <label class="layui-form-label" style="width: 85px;">娴佽浆鍗℃暟閲�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly value="1">
+                                                <input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly value="0">
                                             </div>
                                         </div>
                                     </div>
@@ -783,36 +783,56 @@
                 if (HSouceBillType == 3722 || HSouceBillType == 4610) {
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                     LoadingInformation2();
-                    //鑷姩甯﹀嚭妫�楠屾柟妗�
-                    GetCheckItemID();
+                    //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        //鑷姩甯﹀嚭妫�楠屾柟妗�
+                        GetCheckItemID();
+                    }
                 }
                 //宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
                 else if (HSouceBillType == 3790) {
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                     LoadingInformation_StationInBill();
-                    //鑷姩甯﹀嚭妫�楠屾柟妗�
-                    GetCheckItemID();
+                    //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        //鑷姩甯﹀嚭妫�楠屾柟妗�
+                        GetCheckItemID();
+                    }
                 }
                 //宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
                 else if (HSouceBillType == 3793) {
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                     LoadingInformation3();
-                    //鑷姩甯﹀嚭妫�楠屾柟妗�
-                    GetCheckItemID();
+                    //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        //鑷姩甯﹀嚭妫�楠屾柟妗�
+                        GetCheckItemID();
+                    }
                 }
                 //鐢熶骇璁㈠崟鍒楄〃棣栨
                 else if (HSouceBillType == 3710) {
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                     LoadingInformation_ICMO();
-                    //鑷姩甯﹀嚭妫�楠屾柟妗�
-                    GetCheckItemID();
+                    //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        //鑷姩甯﹀嚭妫�楠屾柟妗�
+                        GetCheckItemID();
+                    }
                 }
                 //宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
                 else if (HSouceBillType == 3772) {
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                     LoadingInformation_ProcExchange();
-                    //鑷姩甯﹀嚭妫�楠屾柟妗�
-                    GetCheckItemID();
+                    //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        //鑷姩甯﹀嚭妫�楠屾柟妗�
+                        GetCheckItemID();
+                    }
                 }
                 else {
                     layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
@@ -925,10 +945,10 @@
 
                 var wait = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_ICMOBill',
                     type: "GET",
                     async: false,
-                    data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
+                    data: { "HICMOInterID": linterid, "HICMOEntryID": HICMOEntryID, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         var data = result.data[0];
                         if (result.count == 1) {
@@ -938,11 +958,16 @@
                             $("#HSourceName").val(data.鐢熶骇璧勬簮);
                             $("#HSourceID").val(data.HSourceID);
                             $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterNumber").val(data.浜у搧浠ｇ爜);
                             $("#HMaterName").val(data.浜у搧鍚嶇О);
                             $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
                             $("#HMainSourceBillType").val(data.鍗曟嵁绫诲瀷);
                             $("#HMainSourceInterID").val(data.hmainid);
                             $("#HICMOEntryID").val(data.HEntryID);
+                            $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+                            $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+                            //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+                            get_CheckItem();
                         } else {
                             layer.alert(result.Message, { icon: 5 });
                         }
@@ -1452,7 +1477,8 @@
 
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
-                                        HInSpectValueB: checkStatus.data[0].妫�娴嬪�煎悕绉�
+                                        HInSpectValueB: checkStatus.data[0].HItemID,
+                                        HInSpectValueB_Text: checkStatus.data[0].妫�娴嬪�煎悕绉�
                                     });
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
                                     var DXValue = checkStatus.data[0].妫�娴嬪�煎悕绉�; //瀹氭�ф娴嬪��
@@ -1581,6 +1607,14 @@
                     layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
+
+                if (data.field.HInspectValB == "") {
+                    data.field.HInspectValB = 0;
+                }
+                if (data.field.HTargetValB == "") {
+                    data.field.HTargetValB = 0;
+                }
+
                 //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
                 //    layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 //    return;
@@ -2045,7 +2079,7 @@
                         rowdata_Value = [];
                         for (let i = 1; i <= checkStatus.data[0].鏍锋湰閲�; i++) {
                             rowdata_Value.push({
-                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                             });
                         }
                         option_Value.data = rowdata_Value;
@@ -2071,7 +2105,7 @@
             //#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
 
             function get_CheckItem() {
-                var HBatchQty = $("#HProcExchQty").val();
+                var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
@@ -2092,13 +2126,14 @@
                                         "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "0", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
                                     }
                                 );
-                                SampleNum.push(5);
+                                //SampleNum.push(5);
+                                SampleNum.push(data[0].鏍锋湰閲�);
                             }
 
                             //妫�楠岄」鐩�
                             for (let j = 1; j <= 5; j++) {
                                 rowdata_Value.push({
-                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                 });
                             }
                             //妫�楠岄」鐩�
@@ -2129,9 +2164,58 @@
                             //妫�楠屽��  鐩爣鍊� 榛樿鏈�0
                             $("#HInspectValB").val(0);
                             $("#HTargetValB").val(0);
+
+                            //鎼哄甫鍑烘娊鏍锋柟妗�
+                            ReturnSampleScheme(data);
                         }
                     }
                 })
+            }
+
+            //鏍规嵁璐ㄦ鏂规鑷姩甯﹀嚭鎶芥牱鏂规淇℃伅
+            function ReturnSampleScheme(data) {
+                $("#HSampleSchemeID").val(data[data.length - 1].hmainid);
+                $("#HSampleSchemeName").val(data[data.length - 1].鎶芥牱鏂规鍚嶇О);
+                $("#HSamplingType").val(data[data.length - 1].鎶芥牱绫诲瀷);
+                $("#HInspectionLevel").val(data[data.length - 1].妫�楠屾按骞�);
+                $("#HStrictness").val(data[data.length - 1].涓ユ牸搴�);
+                $("#HAQL").val(data[data.length - 1].AQL);
+                $("#HSampleQty").val(data[data.length - 1].鏍锋湰閲�);
+                $("#HSampleQty2").val(data[data.length - 1].鏍锋湰閲�);
+                $("#HAcceptQty").val(data[data.length - 1].鍏佽鏁�);
+
+                $("#HRejectQty").val(data[data.length - 1].鎷掔粷鏁�);
+                //鏄剧ず鏈�鍚庝竴琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+                $("#HTargetVal").val(data[data.length - 1].鐩爣鍊�);
+                $("#HUpLimit").val(data[data.length - 1].涓婇檺鍊�);
+                $("#HDownLimit").val(data[data.length - 1].涓嬮檺鍊�);
+
+
+                if ($("#HEntryID").val() - 1 >= 0) {
+                    option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].hmainid;
+                    option.data[$("#HEntryID").val() - 1].HSampleSchemeName = data[data.length - 1].鎶芥牱鏂规鍚嶇О;
+                    option.data[$("#HEntryID").val() - 1].HSamplingType = data[data.length - 1].鎶芥牱绫诲瀷;
+                    option.data[$("#HEntryID").val() - 1].HInspectionLevel = data[data.length - 1].妫�楠屾按骞�;
+                    option.data[$("#HEntryID").val() - 1].HStrictness = data[data.length - 1].涓ユ牸搴�;
+                    option.data[$("#HEntryID").val() - 1].HAQL = data[data.length - 1].AQL;
+                    option.data[$("#HEntryID").val() - 1].HSampleQty = data[data.length - 1].鏍锋湰閲�;
+                    option.data[$("#HEntryID").val() - 1].HSampleQty2 = data[data.length - 1].鏍锋湰閲�;
+                    option.data[$("#HEntryID").val() - 1].HAcceptQty = data[data.length - 1].鍏佽鏁�;
+                    option.data[$("#HEntryID").val() - 1].HRejectQty = data[data.length - 1].鎷掔粷鏁�;
+                    option.data[$("#HEntryID").val() - 1].HUpLimit = data[data.length - 1].涓婇檺鍊�;
+                    option.data[$("#HEntryID").val() - 1].HDownLimit = data[data.length - 1].涓嬮檺鍊�;
+                }
+
+                rowdata_Value = [];
+                for (let i = 1; i <= data[data.length - 1].鏍锋湰閲�; i++) {
+                    rowdata_Value.push({
+                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                    });
+                }
+                option_Value.data = rowdata_Value;
+                table.render(option_Value);
+
+                IsHide(table.cache["mainTable"][$("#HEntryID").val() - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
             }
 
             //鐢ㄤ簬鍙屽嚮妫�楠屾柟妗堜娇鐢�
@@ -2157,13 +2241,14 @@
                                         "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "0", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
                                     }
                                 );
-                                SampleNum.push(5);
+                                //SampleNum.push(5);
+                                SampleNum.push(data[0].鏍锋湰閲�);
                             }
 
                             //妫�楠岄」鐩�
                             for (let j = 1; j <= 5; j++) {
                                 rowdata_Value.push({
-                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                 });
                             }
                             //妫�楠岄」鐩�
@@ -2570,6 +2655,7 @@
                         , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
                         , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
                         , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+                        , { field: 'HTargetVal', title: '鐩爣鍊�' }
                         , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
                         , { field: 'HUpLimit', title: '涓婇檺鍊�' }
                         , { field: 'HDownLimit', title: '涓嬮檺鍊�'  }
@@ -2623,20 +2709,21 @@
 
                 //鍒濆琛ㄦ牸鏁版嵁
                 rowdata_Value = [{
-                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                 }];
                 option_Value = {
                     elem: '#ValueTable'
                     //, toolbar: '#toolbarDemo_Value'
                     , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-                    , height: 'full-50'
+                    , height: 'full-370'
                     , cellMinWidth: 150
                     , totalRow: true
                     , cols: [[ //琛ㄥご
                         { type: 'checkbox', totalRowText: '鍚堣琛�' }
                         , { field: 'HSEQ', title: '搴忓彿' }
                         , { field: 'HInSpectResult', title: '妫�楠岀粨鏋�', templet: '#HInSpectResult' }
-                        , { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
+                        , { field: 'HInSpectValueB', title: '妫�娴嬪�糏D锛堝畾鎬э級', edit: 'text', hide: true }
+                        , { field: 'HInSpectValueB_Text', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
                         , { field: 'HInSpectValue', title: '妫�娴嬪�硷紙瀹氶噺锛�', edit: 'text', totalRow: true }
                         , { field: 'HInSpectValueT', title: '妫�娴嬪�硷紙鍏朵粬锛�', edit: 'text' }
                         //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
@@ -2852,7 +2939,15 @@
                 editIndex = Number(nowindex) + Number(1);
                 LastIndex = nowindex;
 
-                $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
+                if (option_Check.length > 0) {
+                    $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
+                    $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+                    $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+                    //鏄剧ず褰撳墠鍙屽嚮琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+                    $("#HTargetVal").val(option_Check[nowindex].鐩爣鍊�);
+                    $("#HUpLimit").val(option_Check[nowindex].涓婇檺鍊�);
+                    $("#HDownLimit").val(option_Check[nowindex].涓嬮檺鍊�);
+                }
 
                 //閫変腑琛屾敼鍙橀鑹�
                 check_row(obj);
@@ -2864,11 +2959,12 @@
                 //鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
                 var table_value = table.cache['ValueTable'];
 
-                //if (OperationType == 3) {
-                //    set_SaveValue(Number(nowindex) + Number(1));
-                //} else {
-                //    set_SaveValue(dataindex + 1);
-                //}
+                if (OperationType == 3) {
+                    set_SaveValue(Number(nowindex) + Number(1));
+                } else {
+                    set_SaveValue(dataindex + 1);
+                }
+
                 //鍙屽嚮妫�楠岄」鐩浜嬩欢 璧嬪�间笌鍥炴樉
                 if ($("#HSampleSchemeID").val() != "0") {
                     Assignment(nowindex, dataindex);
@@ -2878,7 +2974,7 @@
                     var row_value = [];
                     for (let i = 0; i < SampleNum[nowindex]; i++) {
                         row_value.push({
-                            "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+                            "HSEQ": (i + 1), "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                         });
                     }
                     //鍒锋柊妫�楠屽�艰〃鏍�
@@ -2928,17 +3024,17 @@
                         HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
                         HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
                         HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
-                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
-                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        //HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        //HUnitID: $("#HUnitID").val(), //鍗曚綅ID
                         HUnitName: $("#HUnitName").val(), //鍗曚綅
                         HInspectValB: $("#HInspectValB").val() == null ? 0 : $("#HInspectValB").val(), //妫�楠屽�糏D
-                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        //HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
                         HTargetValB: $("#HTargetValB").val() == null ? 0 : $("#HTargetValB").val(), //鐩爣鍊糏D
-                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
-                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
-                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
-                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
-                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                        //HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        //HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        //HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        //HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        //HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
                     };
 
                     //鑾峰彇鏂囨湰妗嗗��
@@ -3153,9 +3249,9 @@
                     $("#HUnitID").val(maindata[nowindex].HUnitID);
                     $("#HUnit").val(maindata[nowindex].HUnit);
                     $("#HInspectVal").val(maindata[nowindex].HInspectVal);
-                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
-                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
-                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+                    $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].鐩爣鍊� : "") : maindata[nowindex].HTargetVal);
+                    $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓婇檺鍊� : "") : maindata[nowindex].HUpLimit);
+                    $("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓嬮檺鍊� : "") : maindata[nowindex].HDownLimit);                  
                     $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
                     $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
                     $("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
@@ -3178,7 +3274,7 @@
                     $("#HInspectValB").val(maindata[nowindex].HInspectValB);
                     $("#HInspectVal").val(maindata[nowindex].HInspectVal);
                     $("#HTargetValB").val(maindata[nowindex].HTargetValB);
-                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+                    //$("#HTargetVal").val(maindata[nowindex].HTargetVal);
                     $("#HUpLimit").val(maindata[nowindex].HUpLimit);
                     $("#HDownLimit").val(maindata[nowindex].HDownLimit);
                     $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
@@ -3970,6 +4066,9 @@
                             }];
                             table.render(option_Value);
                             //layer.msg(result.code + result.Message, { icon: 5 });
+
+                            IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+                            form.render('select');
                         }
                     }
                 })
@@ -3979,9 +4078,9 @@
             //#region 銆愰殣钘忔娴嬪�煎瓧娈点��
             function IsHide(HAnalysisMethod_Value) {
                 if (HAnalysisMethod_Value == 1) { //濡傛灉閫変腑銆愬畾鎬у垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
-                    option_Value.cols[0][3].hide = false; //瀹氭��
-                    option_Value.cols[0][4].hide = true;  //瀹氶噺
-                    option_Value.cols[0][5].hide = true;  //鍏朵粬
+                    option_Value.cols[0][4].hide = false; //瀹氭��
+                    option_Value.cols[0][5].hide = true;  //瀹氶噺
+                    option_Value.cols[0][6].hide = true;  //鍏朵粬
 
                     $("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
                     $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
@@ -3993,9 +4092,9 @@
                     $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//鐩爣鍊兼寜閽惎鐢�
 
                 } else if (HAnalysisMethod_Value == 2) { //濡傛灉閫変腑銆愬畾閲忓垎鏋愩�戯紝鍒欓殣钘忓畾鎬с�佸叾浠栧垎鏋�
-                    option_Value.cols[0][4].hide = false;  //瀹氶噺
-                    option_Value.cols[0][3].hide = true;  //瀹氭��
-                    option_Value.cols[0][5].hide = true;  //鍏朵粬
+                    option_Value.cols[0][5].hide = false;  //瀹氶噺
+                    option_Value.cols[0][4].hide = true;  //瀹氭��
+                    option_Value.cols[0][6].hide = true;  //鍏朵粬
 
                     $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
                     $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
@@ -4009,9 +4108,9 @@
 
 
                 } else if (HAnalysisMethod_Value == 3) { //濡傛灉閫変腑銆愬叾浠栧垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸畾鎬у垎鏋�
-                    option_Value.cols[0][5].hide = false;  //鍏朵粬
-                    option_Value.cols[0][3].hide = true;  //瀹氭��
-                    option_Value.cols[0][4].hide = true;  //瀹氶噺
+                    option_Value.cols[0][6].hide = false;  //鍏朵粬
+                    option_Value.cols[0][4].hide = true;  //瀹氭��
+                    option_Value.cols[0][5].hide = true;  //瀹氶噺
 
                     $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
                     $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
@@ -4100,6 +4199,7 @@
                             if (result.code == 1) {
                                 $("#HQCSchemeID").val(result.data[0].hmainid);
                                 $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
+                                 //甯﹀嚭妫�楠岄」鐩�佹娊鏍锋柟妗�
                                 get_CheckItem();
                             } else {
                                 layer.msg(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 1111bf9..80c4676 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -301,8 +301,8 @@
                     <div class="layui-tab layui-tab-card">
                         <ul class="layui-tab-title">
                             <li class="layui-this">妫�楠岄」鐩�</li>
-                            <!--<li>鎶芥牱妫�楠�</li>
-                            <li>妫�娴嬪��</li>-->
+                            <li>鎶芥牱妫�楠�</li>
+                            <li>妫�娴嬪��</li>
                         </ul>
                         <div class="layui-tab-content">
                             <div class="layui-tab-item layui-show">
@@ -833,35 +833,44 @@
                     if (HSouceBillType == 3722 || HSouceBillType == 4610) {
                         //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                         LoadingInformation2();
-                        //鑷姩甯﹀嚭妫�楠屾柟妗�
-                        GetCheckItemID();
+                        //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                        if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                            //鑷姩甯﹀嚭妫�楠屾柟妗�
+                            GetCheckItemID();
+                        }
                     }
                      //宸ュ簭鍑虹珯鍗曞垪琛� 鏈欢
                     else if (HSouceBillType == 3791) {
                         //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                         LoadingInformation_StationOutBill();
-                        //鑷姩甯﹀嚭妫�楠屾柟妗�
-                        GetCheckItemID();
+                        //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                        if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                            //鑷姩甯﹀嚭妫�楠屾柟妗�
+                            GetCheckItemID();
+                        }
                     }//鐢熶骇璁㈠崟鍒楄〃鏈
                     else if (HSouceBillType == 3710) {
                         //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                         LoadingInformation_ICMO();
-                        //鑷姩甯﹀嚭妫�楠屾柟妗�
-                        GetCheckItemID();
-                    }
-                    //鐢熶骇璁㈠崟鍒楄〃鏈
-                    else if (HSouceBillType == 3710) {
-                        //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
-                        LoadingInformation_ICMO();
-                        //鑷姩甯﹀嚭妫�楠屾柟妗�
-                        GetCheckItemID();
+                        //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                        if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                            //鑷姩甯﹀嚭妫�楠屾柟妗�
+                            GetCheckItemID();
+                        }
                     }
                     //宸ュ簭娴佽浆鍗″垪琛ㄥ伐搴忔
                     else if (HSouceBillType == 3772) {
                         //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                         LoadingInformation_ProcExchange();
-                        //鑷姩甯﹀嚭妫�楠屾柟妗�
-                        GetCheckItemID();
+                        //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                        if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                            //鑷姩甯﹀嚭妫�楠屾柟妗�
+                            GetCheckItemID();
+                        }
                     }
                     else {
                         layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
@@ -973,10 +982,10 @@
 
                 var wait = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_ICMOBill',
                     type: "GET",
                     async: false,
-                    data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
+                    data: { "HICMOInterID": linterid, "HICMOEntryID": HICMOEntryID, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         var data = result.data[0];
                         if (result.count == 1) {
@@ -986,11 +995,16 @@
                             $("#HSourceName").val(data.鐢熶骇璧勬簮);
                             $("#HSourceID").val(data.HSourceID);
                             $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterNumber").val(data.浜у搧浠ｇ爜);
                             $("#HMaterName").val(data.浜у搧鍚嶇О);
                             $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
                             $("#HMainSourceBillType").val(data.鍗曟嵁绫诲瀷);
                             $("#HMainSourceInterID").val(data.hmainid);
                             $("#HICMOEntryID").val(data.HEntryID);
+                            $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+                            $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+                            //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+                            get_CheckItem();
                         } else {
                             layer.alert(result.Message, { icon: 5 });
                         }
@@ -1049,43 +1063,7 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-            }
-
-            //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅--鐢熶骇璁㈠崟
-            function LoadingInformation_ICMO() {
-                $("#hidediv1").attr({ "style": "display:none" });
-                $("#hidediv2").attr({ "style": "display:none" });
-
-                var wait = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
-                    type: "GET",
-                    async: false,
-                    data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
-                    success: function (result) {
-                        var data = result.data[0];
-                        if (result.count == 1) {
-                            $("#HICMOBillNo").val(data.鍗曟嵁鍙�);
-                            $("#HICMOInterID").val(data.hmainid);
-                            $("#HICMOQty").val(data.鐢熶骇浠诲姟鍗曟暟閲�);
-                            $("#HSourceName").val(data.鐢熶骇璧勬簮);
-                            $("#HSourceID").val(data.HSourceID);
-                            $("#HMaterID").val(data.HMaterID);
-                            $("#HMaterName").val(data.浜у搧鍚嶇О);
-                            $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
-                            $("#HMainSourceBillType").val(data.鍗曟嵁绫诲瀷);
-                            $("#HMainSourceInterID").val(data.hmainid);
-                            $("#HICMOEntryID").val(data.HEntryID);
-                        } else {
-                            layer.alert(result.Message, { icon: 5 });
-                        }
-                        layer.close(wait);
-                    }, error: function () {
-                        layer.close(wait);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
+            }           
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
@@ -1434,7 +1412,8 @@
 
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
-                                        HInSpectValueB: checkStatus.data[0].妫�娴嬪�煎悕绉�
+                                        HInSpectValueB: checkStatus.data[0].HItemID,
+                                        HInSpectValueB_Text: checkStatus.data[0].妫�娴嬪�煎悕绉�
                                     });
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
                                     var DXValue = checkStatus.data[0].妫�娴嬪�煎悕绉�; //瀹氭�ф娴嬪��
@@ -2123,7 +2102,7 @@
                         rowdata_Value = [];
                         for (let i = 1; i <= checkStatus.data[0].鏍锋湰閲�; i++) {
                             rowdata_Value.push({
-                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                             });
                         }
                         option_Value.data = rowdata_Value;
@@ -2148,7 +2127,7 @@
             //#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
 
             function get_CheckItem() {
-                var HBatchQty = $("#HProcExchQty").val();
+                var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
@@ -2176,7 +2155,8 @@
                                         "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
                                     }
                                 );
-                                SampleNum.push(data[i].鏍锋湰閲�);
+                                //SampleNum.push(5);
+                                SampleNum.push(data[0].鏍锋湰閲�);
                             }
 
                             //妫�楠岄」鐩�
@@ -2211,9 +2191,58 @@
 
                             trindex = result.data.length - 1;
                             $("#HEntryID").val() - 1
+
+                            //鎼哄甫鍑烘娊鏍锋柟妗�
+                            ReturnSampleScheme(data);
                         }
                     }
                 })
+            }
+
+            //鏍规嵁璐ㄦ鏂规鑷姩甯﹀嚭鎶芥牱鏂规淇℃伅
+            function ReturnSampleScheme(data) {
+                $("#HSampleSchemeID").val(data[data.length - 1].hmainid);
+                $("#HSampleSchemeName").val(data[data.length - 1].鎶芥牱鏂规鍚嶇О);
+                $("#HSamplingType").val(data[data.length - 1].鎶芥牱绫诲瀷);
+                $("#HInspectionLevel").val(data[data.length - 1].妫�楠屾按骞�);
+                $("#HStrictness").val(data[data.length - 1].涓ユ牸搴�);
+                $("#HAQL").val(data[data.length - 1].AQL);
+                $("#HSampleQty").val(data[data.length - 1].鏍锋湰閲�);
+                $("#HSampleQty2").val(data[data.length - 1].鏍锋湰閲�);
+                $("#HAcceptQty").val(data[data.length - 1].鍏佽鏁�);
+
+                $("#HRejectQty").val(data[data.length - 1].鎷掔粷鏁�);
+                //鏄剧ず鏈�鍚庝竴琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+                $("#HTargetVal").val(data[data.length - 1].鐩爣鍊�);
+                $("#HUpLimit").val(data[data.length - 1].涓婇檺鍊�);
+                $("#HDownLimit").val(data[data.length - 1].涓嬮檺鍊�);
+
+
+                if ($("#HEntryID").val() - 1 >= 0) {
+                    option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].hmainid;
+                    option.data[$("#HEntryID").val() - 1].HSampleSchemeName = data[data.length - 1].鎶芥牱鏂规鍚嶇О;
+                    option.data[$("#HEntryID").val() - 1].HSamplingType = data[data.length - 1].鎶芥牱绫诲瀷;
+                    option.data[$("#HEntryID").val() - 1].HInspectionLevel = data[data.length - 1].妫�楠屾按骞�;
+                    option.data[$("#HEntryID").val() - 1].HStrictness = data[data.length - 1].涓ユ牸搴�;
+                    option.data[$("#HEntryID").val() - 1].HAQL = data[data.length - 1].AQL;
+                    option.data[$("#HEntryID").val() - 1].HSampleQty = data[data.length - 1].鏍锋湰閲�;
+                    option.data[$("#HEntryID").val() - 1].HSampleQty2 = data[data.length - 1].鏍锋湰閲�;
+                    option.data[$("#HEntryID").val() - 1].HAcceptQty = data[data.length - 1].鍏佽鏁�;
+                    option.data[$("#HEntryID").val() - 1].HRejectQty = data[data.length - 1].鎷掔粷鏁�;
+                    option.data[$("#HEntryID").val() - 1].HUpLimit = data[data.length - 1].涓婇檺鍊�;
+                    option.data[$("#HEntryID").val() - 1].HDownLimit = data[data.length - 1].涓嬮檺鍊�;
+                }
+
+                rowdata_Value = [];
+                for (let i = 1; i <= data[data.length - 1].鏍锋湰閲�; i++) {
+                    rowdata_Value.push({
+                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                    });
+                }
+                option_Value.data = rowdata_Value;
+                table.render(option_Value);
+
+                IsHide(table.cache["mainTable"][$("#HEntryID").val() - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
             }
 
             window.get_CheckItem1 = function () {
@@ -2251,7 +2280,7 @@
                             //妫�楠岄」鐩�
                             for (let j = 1; j <= data[data.length - 1].鏍锋湰閲�; j++) {
                                 rowdata_Value.push({
-                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                 });
                             }
                             //妫�楠岄」鐩�
@@ -2575,6 +2604,7 @@
                         //, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
                         , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
                         , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+                        , { field: 'HTargetVal', title: '鐩爣鍊�' }
                         , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
                         , { field: 'HUpLimit', title: '涓婇檺鍊�' }
                         , { field: 'HDownLimit', title: '涓嬮檺鍊�' }
@@ -2628,7 +2658,7 @@
 
                 //鍒濆琛ㄦ牸鏁版嵁
                 rowdata_Value = [{
-                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                 }];
                 option_Value = {
                     elem: '#ValueTable'
@@ -2641,7 +2671,8 @@
                         { type: 'checkbox', totalRowText: '鍚堣琛�' }
                         , { field: 'HSEQ', title: '搴忓彿' }
                         , { field: 'HInSpectResult', title: '妫�楠岀粨鏋�', templet: '#HInSpectResult' }
-                        , { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
+                        , { field: 'HInSpectValueB', title: '妫�娴嬪�糏D锛堝畾鎬э級', edit: 'text', hide: true }
+                        , { field: 'HInSpectValueB_Text', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
                         , { field: 'HInSpectValue', title: '妫�娴嬪�硷紙瀹氶噺锛�', edit: 'text' }
                         , { field: 'HInSpectValueT', title: '妫�娴嬪�硷紙鍏朵粬锛�', edit: 'text' }
                         //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
@@ -2868,9 +2899,15 @@
                 editIndex = Number(nowindex) + Number(1);
                 LastIndex = nowindex;
 
-                $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
-                //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
-                //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+                if (option_Check.length > 0) {
+                    $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
+                    $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+                    $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+                    //鏄剧ず褰撳墠鍙屽嚮琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+                    $("#HTargetVal").val(option_Check[nowindex].鐩爣鍊�);
+                    $("#HUpLimit").val(option_Check[nowindex].涓婇檺鍊�);
+                    $("#HDownLimit").val(option_Check[nowindex].涓嬮檺鍊�);
+                }
 
                 //閫変腑琛屾敼鍙橀鑹�
                 check_row(obj);
@@ -2896,7 +2933,7 @@
                     var row_value = [];
                     for (let i = 0; i < SampleNum[nowindex]; i++) {
                         row_value.push({
-                            "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+                            "HSEQ": (i + 1), "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                         });
                     }
                     //鍒锋柊妫�楠屽�艰〃鏍�
@@ -3332,17 +3369,17 @@
                         HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
                         HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
                         HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
-                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
-                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        //HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        //HUnitID: $("#HUnitID").val(), //鍗曚綅ID
                         HUnitName: $("#HUnitName").val(), //鍗曚綅
                         HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
-                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        //HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
                         HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
-                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
-                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
-                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
-                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
-                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                        //HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        //HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        //HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        //HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        //HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
                     };
 
                     //鑾峰彇鏂囨湰妗嗗��
@@ -3598,9 +3635,9 @@
                     $("#HUnitID").val(maindata[nowindex].HUnitID);
                     $("#HUnit").val(maindata[nowindex].HUnit);
                     $("#HInspectVal").val(maindata[nowindex].HInspectVal);
-                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
-                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
-                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+                    $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].鐩爣鍊� : "") : maindata[nowindex].HTargetVal);
+                    $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓婇檺鍊� : "") : maindata[nowindex].HUpLimit);
+                    $("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓嬮檺鍊� : "") : maindata[nowindex].HDownLimit);
                     $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
                     $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
                     $("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
@@ -3623,7 +3660,7 @@
                     $("#HInspectValB").val(maindata[nowindex].HInspectValB);
                     $("#HInspectVal").val(maindata[nowindex].HInspectVal);
                     $("#HTargetValB").val(maindata[nowindex].HTargetValB);
-                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+                    //$("#HTargetVal").val(maindata[nowindex].HTargetVal);
                     $("#HUpLimit").val(maindata[nowindex].HUpLimit);
                     $("#HDownLimit").val(maindata[nowindex].HDownLimit);
                     $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
@@ -3682,6 +3719,9 @@
                             }];
                             table.render(option_Value);
                             //layer.msg(result.code + result.Message, { icon: 5 });
+
+                            IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+                            form.render('select');
                         }
                     }
                 })
@@ -4035,9 +4075,9 @@
             //#region 銆愰殣钘忔娴嬪�煎瓧娈点��
             function IsHide(HAnalysisMethod_Value) {
                 if (HAnalysisMethod_Value == 1) { //濡傛灉閫変腑銆愬畾鎬у垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
-                    option_Value.cols[0][3].hide = false; //瀹氭��
-                    option_Value.cols[0][4].hide = true;  //瀹氶噺
-                    option_Value.cols[0][5].hide = true;  //鍏朵粬
+                    option_Value.cols[0][4].hide = false; //瀹氭��
+                    option_Value.cols[0][5].hide = true;  //瀹氶噺
+                    option_Value.cols[0][6].hide = true;  //鍏朵粬
 
                     $("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
                     $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
@@ -4049,9 +4089,9 @@
                     $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//鐩爣鍊兼寜閽惎鐢�
 
                 } else if (HAnalysisMethod_Value == 2) { //濡傛灉閫変腑銆愬畾閲忓垎鏋愩�戯紝鍒欓殣钘忓畾鎬с�佸叾浠栧垎鏋�
-                    option_Value.cols[0][4].hide = false;  //瀹氶噺
-                    option_Value.cols[0][3].hide = true;  //瀹氭��
-                    option_Value.cols[0][5].hide = true;  //鍏朵粬
+                    option_Value.cols[0][5].hide = false;  //瀹氶噺
+                    option_Value.cols[0][4].hide = true;  //瀹氭��
+                    option_Value.cols[0][6].hide = true;  //鍏朵粬
 
                     $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
                     $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
@@ -4065,9 +4105,9 @@
 
 
                 } else if (HAnalysisMethod_Value == 3) { //濡傛灉閫変腑銆愬叾浠栧垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸畾鎬у垎鏋�
-                    option_Value.cols[0][5].hide = false;  //鍏朵粬
-                    option_Value.cols[0][3].hide = true;  //瀹氭��
-                    option_Value.cols[0][4].hide = true;  //瀹氶噺
+                    option_Value.cols[0][6].hide = false;  //鍏朵粬
+                    option_Value.cols[0][4].hide = true;  //瀹氭��
+                    option_Value.cols[0][5].hide = true;  //瀹氶噺
 
                     $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
                     $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index eb3da44..51e3f9a 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -808,36 +808,59 @@
                 if (HSouceBillType == 3722 || HSouceBillType == 4610) {
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                     LoadingInformation2();
-                    //鑷姩甯﹀嚭妫�楠屾柟妗�
-                    GetCheckItemID();
+
+                    //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
+                    {
+                        //鑷姩甯﹀嚭妫�楠屾柟妗�
+                        GetCheckItemID();
+                    }
+                    
                 }
                 //宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
                 else if (HSouceBillType == 3790) {
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                     LoadingInformation_StationInBill();
-                    //鑷姩甯﹀嚭妫�楠屾柟妗�
-                    GetCheckItemID();
+                    //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        //鑷姩甯﹀嚭妫�楠屾柟妗�
+                        GetCheckItemID();
+                    }
                 }
                 //宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
                 else if (HSouceBillType == 3793) {
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                     LoadingInformation3();
-                    //鑷姩甯﹀嚭妫�楠屾柟妗�
-                    GetCheckItemID();
+                    //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        //鑷姩甯﹀嚭妫�楠屾柟妗�
+                        GetCheckItemID();
+                    }
                 }
                 //鐢熶骇璁㈠崟鍒楄〃棣栨
                 else if (HSouceBillType == 3710) {
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                     LoadingInformation_ICMO();
-                    //鑷姩甯﹀嚭妫�楠屾柟妗�
-                    GetCheckItemID();
+                    //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        //鑷姩甯﹀嚭妫�楠屾柟妗�
+                        GetCheckItemID();
+                    }
                 }
                 //宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
                 else if (HSouceBillType == 3772) {
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                     LoadingInformation_ProcExchange();
-                    //鑷姩甯﹀嚭妫�楠屾柟妗�
-                    GetCheckItemID();
+                    //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        //鑷姩甯﹀嚭妫�楠屾柟妗�
+                        GetCheckItemID();
+                    }
                 }
                 else {
                     layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
@@ -952,10 +975,10 @@
 
                 var wait = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_ICMOBill',
                     type: "GET",
                     async: false,
-                    data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
+                    data: { "HICMOInterID": linterid, "HICMOEntryID": HICMOEntryID, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         var data = result.data[0];
                         if (result.count == 1) {
@@ -975,6 +998,10 @@
                             $("#HMainSourceBillType").val(data.鍗曟嵁绫诲瀷);
                             $("#HMainSourceInterID").val(data.hmainid);
                             $("#HICMOEntryID").val(data.HEntryID);
+                            $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+                            $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+                            //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+                            get_CheckItem();
                         } else {
                             layer.alert(result.Message, { icon: 5 });
                         }
@@ -1450,7 +1477,8 @@
 
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
-                                        HInSpectValueB: checkStatus.data[0].妫�娴嬪�煎悕绉�
+                                        HInSpectValueB: checkStatus.data[0].HItemID,
+                                        HInSpectValueB_Text: checkStatus.data[0].妫�娴嬪�煎悕绉�
                                     });
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
                                     var DXValue = checkStatus.data[0].妫�娴嬪�煎悕绉�; //瀹氭�ф娴嬪��
@@ -1545,6 +1573,9 @@
                 if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
                     layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
+                }
+                if ($("#HInspectValB").val() == "") {
+                    $("#HInspectValB").val(0)
                 }
                 //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
                 //    layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -2088,7 +2119,7 @@
                         rowdata_Value = [];
                         for (let i = 1; i <= checkStatus.data[0].鏍锋湰閲�; i++) {
                             rowdata_Value.push({
-                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                             });
                         }
                         option_Value.data = rowdata_Value;
@@ -2113,7 +2144,7 @@
 
             //#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
             function get_CheckItem() {
-                var HBatchQty = $("#HProcExchQty").val();
+                var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
@@ -2142,7 +2173,7 @@
                             //妫�楠岄」鐩�
                             for (let j = 1; j <= 5; j++) {
                                 rowdata_Value.push({
-                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                 });
                             }
                             //妫�楠岄」鐩�
@@ -2172,7 +2203,7 @@
                             trindex = result.data.length - 1;
                             $("#HEntryID").val() - 1                            
 
-                            //鎼哄甫鍑鸿川妫�鏂规
+                            //鎼哄甫鍑烘娊鏍锋柟妗�
                             ReturnSampleScheme(data);
                         }
                     }
@@ -2216,7 +2247,7 @@
                 rowdata_Value = [];
                 for (let i = 1; i <= data[data.length - 1].鏍锋湰閲�; i++) {
                     rowdata_Value.push({
-                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                        "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                     });
                 }
                 option_Value.data = rowdata_Value;
@@ -2256,7 +2287,7 @@
                             //妫�楠岄」鐩�
                             for (let j = 1; j <= 5; j++) {
                                 rowdata_Value.push({
-                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                                    "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
                                 });
                             }
                             //妫�楠岄」鐩�
@@ -2674,7 +2705,7 @@
 
                 //鍒濆琛ㄦ牸鏁版嵁
                 rowdata_Value = [{
-                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                 }];
                 option_Value = {
                     elem: '#ValueTable'
@@ -2687,7 +2718,8 @@
                         { type: 'checkbox', totalRowText: '鍚堣琛�' }
                         , { field: 'HSEQ', title: '搴忓彿' }
                         , { field: 'HInSpectResult', title: '妫�楠岀粨鏋�', templet: '#HInSpectResult' }
-                        , { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
+                        , { field: 'HInSpectValueB', title: '妫�娴嬪�糏D锛堝畾鎬э級', edit: 'text', hide: true }
+                        , { field: 'HInSpectValueB_Text', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
                         , { field: 'HInSpectValue', title: '妫�娴嬪�硷紙瀹氶噺锛�', edit: 'text', totalRow: true }
                         , { field: 'HInSpectValueT', title: '妫�娴嬪�硷紙鍏朵粬锛�', edit: 'text' }
                         //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
@@ -2963,7 +2995,7 @@
                     var row_value = [];
                     for (let i = 0; i < SampleNum[nowindex]; i++) {
                         row_value.push({
-                            "HSEQ": (i+1), "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+                            "HSEQ": (i + 1), "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
                         });
                     }
                     //鍒锋柊妫�楠屽�艰〃鏍�
@@ -4108,9 +4140,9 @@
             //#region 銆愰殣钘忔娴嬪�煎瓧娈点��
             function IsHide(HAnalysisMethod_Value) {
                 if (HAnalysisMethod_Value == 1) { //濡傛灉閫変腑銆愬畾鎬у垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
-                    option_Value.cols[0][3].hide = false; //瀹氭��
-                    option_Value.cols[0][4].hide = true;  //瀹氶噺
-                    option_Value.cols[0][5].hide = true;  //鍏朵粬
+                    option_Value.cols[0][4].hide = false; //瀹氭��
+                    option_Value.cols[0][5].hide = true;  //瀹氶噺
+                    option_Value.cols[0][6].hide = true;  //鍏朵粬
 
                     $("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
                     $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
@@ -4122,9 +4154,9 @@
                     $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//鐩爣鍊兼寜閽惎鐢�
 
                 } else if (HAnalysisMethod_Value == 2) { //濡傛灉閫変腑銆愬畾閲忓垎鏋愩�戯紝鍒欓殣钘忓畾鎬с�佸叾浠栧垎鏋�
-                    option_Value.cols[0][4].hide = false;  //瀹氶噺
-                    option_Value.cols[0][3].hide = true;  //瀹氭��
-                    option_Value.cols[0][5].hide = true;  //鍏朵粬
+                    option_Value.cols[0][5].hide = false;  //瀹氶噺
+                    option_Value.cols[0][4].hide = true;  //瀹氭��
+                    option_Value.cols[0][6].hide = true;  //鍏朵粬
 
                     $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
                     $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
@@ -4138,9 +4170,9 @@
 
 
                 } else if (HAnalysisMethod_Value == 3) { //濡傛灉閫変腑銆愬叾浠栧垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸畾鎬у垎鏋�
-                    option_Value.cols[0][5].hide = false;  //鍏朵粬
-                    option_Value.cols[0][3].hide = true;  //瀹氭��
-                    option_Value.cols[0][4].hide = true;  //瀹氶噺
+                    option_Value.cols[0][6].hide = false;  //鍏朵粬
+                    option_Value.cols[0][4].hide = true;  //瀹氭��
+                    option_Value.cols[0][5].hide = true;  //瀹氶噺
 
                     $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
                     $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�

--
Gitblit v1.9.1