MES-WEB-LayUI.git

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

			//åå§åè¡¨æ ¼
			set_InitGrid();

			//#region å¤ææ¯å¦æ°å¢
			if (OperationType == 1) {
			$("#HInterID").val("");
			@@ -800,30 +804,40 @@
			if (HSouceBillType == 3722 \|\| HSouceBillType == 4610) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation2();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			//å·¥åºè¿ç«æ¥æ¶ååè¡¨é¦æ£
			else if (HSouceBillType == 3790) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_StationInBill();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			//å·¥åºå§å¤æ¥æ¶ååè¡¨é¦æ£
			else if (HSouceBillType == 3793) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation3();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			//çäº§è®¢ååè¡¨é¦æ£
			else if (HSouceBillType == 3710) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_ICMO();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			//å·¥åºæµè½¬å¡åè¡¨é¦æ£
			else if (HSouceBillType == 3772) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_ProcExchange();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			else {
			layer.alert("æºåç±»åæ æï¼", { icon: 5 });
			}
			}
			}
			else if (OperationType == 3) {
			RoadBillMain(linterid);
			@@ -833,8 +847,7 @@

			$("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//ç¦ç¨æ£éªé¡¹ç®æ¾å¤§é

			//åå§åè¡¨æ ¼
			set_InitGrid();

			//#region æ ¹æ®æºåè·åä¿¡æ¯
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯(è¿ç«æ¥æ¶å)
			function LoadingInformation_StationInBill() {
			@@ -842,6 +855,7 @@
			$.ajax({
			url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_StationInBill',
			type: "GET",
			async: false,
			data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var data = result.data[0];
			@@ -885,6 +899,7 @@
			$.ajax({
			url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
			type: "GET",
			async: false,
			data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var data = result.data[0];
			@@ -930,6 +945,7 @@
			$.ajax({
			url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
			type: "GET",
			async: false,
			data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var data = result.data[0];
			@@ -966,6 +982,7 @@
			$.ajax({
			url: GetWEBURL() + "/QC_FirstPieceCheckBill/get_ICMOBillStatus_Tmp",
			type: "GET",
			async:false,
			data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
			success: function (result) {
			var data = result.data[0];
			@@ -1006,6 +1023,7 @@
			$.ajax({
			url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
			type: "GET",
			async: false,
			data: { "sWhere": "and HInterID = " + linterid },
			success: function (result) {
			var data = result.data[0];
			@@ -1043,7 +1061,7 @@
			, data = checkStatus.data;
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": "0", "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
			"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": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
			@@ -1222,6 +1240,27 @@
			});
			}

			var data = obj.data;
			if (obj.event == 'æ£éªä»ªå¨ä»£ç ') {
			var HNumber = data.æ£éªä»ªå¨ä»£ç ;
			var linterid= data.HInspectInstruMentID;
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'æ¥çæ£éªä»ªå¨'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Add_Edit_Gy_InspectInstruMent.html?OperationType=3&linterid=' + linterid + ''
			, resize: false,
			end: function () {
			}
			, cancel: function () {
			}
			})
			}

			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
			if (event.key == "F7") {
			@@ -1288,7 +1327,8 @@

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			æ£éªä»ªå¨: checkStatus.data[0].æ£éªä»ªå¨åç§°
			æ£éªä»ªå¨ä»£ç : checkStatus.data[0].æ£éªä»ªå¨ä»£ç
			,æ£éªä»ªå¨: checkStatus.data[0].æ£éªä»ªå¨åç§°
			, HInspectInstruMentID: checkStatus.data[0].HItemID
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			@@ -1592,7 +1632,7 @@
			for (var i = 0; i < data.length; i++) {
			rowdata.push(
			{
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i].æ£éªé¡¹ç®åç§°, "HInspectInstruMentID": data[i].HInspectInstruMentID, "æ£éªä»ªå¨": data[i].æ£éªä»ªå¨åç§°, "HQCStd": data[i].æ£éªæ å,
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i].æ£éªé¡¹ç®åç§°, "HInspectInstruMentID": data[i].HInspectInstruMentID, "æ£éªä»ªå¨ä»£ç ": data[i].æ£éªä»ªå¨ä»£ç ,"æ£éªä»ªå¨": 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,
			@@ -1939,11 +1979,12 @@
			//#endregion

			//#regionãéæ£éªæ¹æ¡è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯ã
			window.get_CheckItem = function () {
			function get_CheckItem() {
			var HBatchQty = $("#HProcExchQty").val();
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
			type: "GET",
			async: false,
			data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
			success: function (result) {
			if (result.code == 1) {
			@@ -1954,7 +1995,7 @@
			//åè¡¨ èµå¼
			rowdata.push(
			{
			"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]["é»è®¤ç»è®º"],
			"HQCCheckItemID": data[i]["HQCCheckItemID"], "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i]["æ£éªé¡¹ç®"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "æ£éªä»ªå¨ä»£ç ": data[i]["æ£éªä»ªå¨ä»£ç "], "æ£éªä»ªå¨": data[i]["æ£éªä»ªå¨"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["åä½åç§°"], "HQCNote": "", "HAnalysisMethod": data[i]["åææ¹æ³"], "HResult": data[i]["é»è®¤ç»è®º"],
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["éç¹æ£æ¥"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].ä¸éå¼ , "HDownLimit": + data[i].ä¸éå¼, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
			"HSampleSchemeName": data[i].æ½æ ·æ¹æ¡åç§°, "HSampleQty": data[i].æ ·æ¬é, "HAcceptQty": data[i].åè®¸æ°, "HInspectionLevel": data[i].æ£éªæ°´å¹³, "HRejectQty": data[i].æç»æ°,
			@@ -2002,7 +2043,7 @@
			}
			//#endregion

			//#regionãè¡¨å¤´æ¾å¤§éã
			//#region ãè¡¨å¤´æ¾å¤§éã
			//è¡¨å¤´ä¿¡æ¯å·¥åºæµè½¬å¡å¼¹çª
			form.on('submit(btnSearchProcExch)', function () {
			//é¡µé¢å±-èªå®ä¹
			@@ -2146,6 +2187,7 @@
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			GetCheckItemID();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2186,6 +2228,7 @@
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			GetCheckItemID();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2264,6 +2307,7 @@
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterName").val(checkStatus.data[0].ç©æåç§°);
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			GetCheckItemID();
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -2293,7 +2337,7 @@
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§è¡¨æ ¼æ°æ®
			rowdata = [{
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": "0", "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
			"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": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
			@@ -2313,6 +2357,8 @@
			, { field: 'æ£éªé¡¹ç®ä»£ç ', title: 'æ£éªé¡¹ç®ä»£ç '}
			, { field: 'æ£éªé¡¹ç®', title: 'æ£éªé¡¹ç®', edit: 'text', event: 'HQCCheckItemID' }
			, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
			, { field: 'æ£éªä»ªå¨ä»£ç ', title: 'æ£éªä»ªå¨ä»£ç ', totalRow: true ,templet: function (d) {
			return '<span style="color: blue;" lay-event="æ£éªä»ªå¨ä»£ç ">' + d.æ£éªä»ªå¨ä»£ç + '</span>';}, style: 'cursor: pointer;'}
			, { field: 'æ£éªä»ªå¨', title: 'æ£éªä»ªå¨', edit: 'text', event: 'HInspectInstruMentID' }
			, { field: 'HResult', title: 'ç»è®º', templet: '#HResult', event: 'HResult' }
			, { field: 'HAnalysisMethod', title: 'åææ¹æ³', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
			@@ -2413,6 +2459,7 @@
			option_Value.data = rowdata_Value;
			table.render(option_Value);
			}


			//è¡éæ©å¤çï¼ç»è®ºï¼
			form.on('select(HResult)', function (data) {
			@@ -2643,7 +2690,9 @@
			set_SaveValue(dataindex + 1);
			}
			//èµå¼ä¸åæ¾
			Assignment(nowindex, dataindex);
			if ($("#HSampleSchemeID").val() != "0") {
			Assignment(nowindex, dataindex);
			}
			if (isHavingCount == false && OperationType != 3) {
			var row_value = [];
			for (let i = 0; i < SampleNum[nowindex]; i++) {
			@@ -3897,6 +3946,8 @@

			//#region ãåºå¼ä»£ç (æ¯è«å°å·²å¯ç¨)ã
			table.on('edit(mainTable)', function (obj) {
			var cell = $(this);
			var rowIndex = cell.closest('tr').data('index'); // è·åå½åè¡æ°æ®ç´¢å¼
			// ååæ ¼ç¼è¾ä¹åçå¼
			var oldText = $(this).prev().text();
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			@@ -3905,13 +3956,13 @@
			var HInspectVal = $("#HInspectVal").val(); //æ£éªå¼
			var HTargetVal = $("#HTargetVal").val(); //ç®æ å¼
			var HComparator = $("#HComparator").val(); //æ¯è¾ç¬¦
			var HEntryID = $("#HEntryID").val()-1;
			var HEntryID = rowIndex;
			var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //åææ¹æ³
			var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //ä¸éå¼
			var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //ä¸éå¼
			switch (field) {
			case "HInspectVal": //æ£éªå¼
			value = isNaN(value) ? 0 : value;
			value = isNaN(value) ? 0 : parseFloat(value);
			if (HAnalysisMethod == "2") {
			if (value <= HUpLimit && value >= HDownLimit) {
			obj.update({
			@@ -3928,6 +3979,7 @@
			$('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
			}
			form.render('select');
			LastResult();
			}
			break;
			case "HTargetVal": //ç®æ å¼
			@@ -3968,6 +4020,30 @@
			}
			//#endregion

			//èªå¨å¸¦åºæ£éªé¡¹ç®
			function GetCheckItemID() {
			var HName = $("#HMaterName").val();
			var HProName = $("#HProcName").val();
			if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemID",
			type: "GET",
			async: false,
			data: { "HName": HName, "HProName": HProName },
			success: function (result) {
			if (result.code == 1) {
			$("#HQCSchemeID").val(result.data[0].hmainid);
			$("#HQCSchemeName").val(result.data[0].æ£éªæ¹æ¡åç§°);
			get_CheckItem();
			} else {
			layer.msg(result.code + result.Message, { icon: 5 });
			}
			}
			})
			}
			}


			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});

			@@ -3993,6 +4069,7 @@
			$("#HMaterNumber").val(obj[0].ç©æä»£ç );
			$("#HMaterName").val(obj[0].ç©æåç§°);
			$("#HMaterID").val(obj[0].HItemID);
			GetCheckItemID();
			}

			function GetHEmpValue(obj) { //è´¨æ£å