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];
			@@ -1961,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) {
			@@ -2024,7 +2043,7 @@
			}
			//#endregion

			//#regionãè¡¨å¤´æ¾å¤§éã
			//#region ãè¡¨å¤´æ¾å¤§éã
			//è¡¨å¤´ä¿¡æ¯å·¥åºæµè½¬å¡å¼¹çª
			form.on('submit(btnSearchProcExch)', function () {
			//é¡µé¢å±-èªå®ä¹
			@@ -2168,6 +2187,7 @@
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			GetCheckItemID();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2208,6 +2228,7 @@
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			GetCheckItemID();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2286,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) {
			@@ -3924,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 //å¾å°ä¿®æ¹åçå¼
			@@ -3932,7 +3956,7 @@
			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; //ä¸éå¼
			@@ -3996,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æ¨¡å
			});

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

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