MES-WEB-LayUI.git

			@@ -948,7 +948,7 @@
			var myDate = new Date();
			var oneday = 1000 * 60 * 60 * 24;

			columns.push({ type: 'checkbox', fixed: 'left', sort: true });
			columns.push({ type: 'checkbox', fixed: 'left', sort: true });
			columns.push({ type: 'numbers', field: 'åºå·', title: 'åºå·', sort: true, filter: true });
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true, sort: true, filter: true});
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150, sort: true, filter: true });
			@@ -959,13 +959,13 @@
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, sort: true, filter: true });
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150, sort: true, filter: true });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, sort: true, edit: 'text', filter: true });
			columns.push({ field: 'äº§çº¿æ»äº§è½', title: 'äº§çº¿æ»äº§è½', width: 150, sort: true, edit: 'text', filter: true });
			columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150, sort: true, filter: true });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, sort: true, filter: true});//0
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150, filter: true});
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text', filter: true});
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é', filter: true});
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text', sort: true, filter: true });
			columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID", filter: true });
			columns.push({ field: 'ä½¿ç¨å·¥è£', title: 'ä½¿ç¨å·¥è£', width: 150, filter: true });
			columns.push({ field: 'ææ©å¼å·¥æ¥æ', title: 'ææ©å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.ææ©å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.ææ©å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", event: "HEarlyDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });

			columns.push({
			@@ -1181,6 +1181,8 @@
			columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
			columns.push({ field: 'æåæ±æ¥æ°é', title: 'æåæ±æ¥æ°é', width: 150, edit: 'text', sort: true });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, sort: true, filter: true });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, sort: true, filter: true });//0
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text', filter: true });
			columns.push({ field: 'ä»æ¥ä¹åæ¥è®¡åæ°é', title: 'ä»æ¥ä¹åæ¥è®¡åæ°é', width: 150, sort: true, filter: true });//0
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			@@ -1188,6 +1190,7 @@
			columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID" });
			columns.push({ field: 'HMouldID', title: 'HMouldID', width: 150, hide: true });
			columns.push({ field: 'HMouldPCTime', title: 'HMouldPCTime', width: 150, hide: true });
			columns.push({ field: 'æéå·¥ä½æ°', title: 'æéå·¥ä½æ°', width: 150 });
			columns.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });
			option_columns = columns;
			option = {
			@@ -2214,7 +2217,7 @@
			i = option.data.length - 1;
			}
			}
			console.log("1.å¼å§æäº§ç¬¬" + (i + 1) + "è¡è®¢åï¼" + option.data[i].çäº§è®¢åå· + "ï¼å½åæäº§æ¥æï¼" + HPCDate + ",ææ©å¼å·¥æ¥æ:" + option.data[i].ææ©å¼å·¥æ¥æ);
			//console.log("1.å¼å§æäº§ç¬¬" + (i + 1) + "è¡è®¢åï¼" + option.data[i].çäº§è®¢åå· + "ï¼å½åæäº§æ¥æï¼" + HPCDate + ",ææ©å¼å·¥æ¥æ:" + option.data[i].ææ©å¼å·¥æ¥æ);
			//æäº§æåä¸ç¬è®¢åï¼è¥æ¬æ¬¡ä¸ºæåä¸ç¬è®¢åæäº§ï¼ä½å½åæäº§æ¥æè¿ä¸æ»¡è¶³ææ©å¼å·¥æ¥æï¼åå½åæ¥æè¿è¡ç´¯å ï¼ç´å°æ»¡è¶³ææ©å¼å·¥æ¥æä¸ºæ¢ï¼
			if (HArrIndex_PC.length == option.data.length - 1 && HArrIndex.length > 0 && Format(option.data[HArrIndex[0]].ææ©å¼å·¥æ¥æ, 'yyyy/MM/dd') > HPCDate) {
			for (var k = 0; k < 100; k++) {
			@@ -2305,21 +2308,9 @@
			sMaterNumber = option.data[i]["ç©æä»£ç "];
			sMaterName = option.data[i]["ç©æåç§°"];
			sMaterModel = option.data[i]["è§æ ¼åå·"];
			sWorkQty = option.data[i]["å°æ¶äº§è½"];
			sYX = option.data[i]["ä¼åçº§"];
			HReportQty = option.data[i]["æåæ±æ¥æ°é"];

			if (SDSum > 0) {
			sPlanQty = sPlanQty - SDSum - HReportQty;
			}
			//å©ä½éæ±å·¥æ¶
			iLeftQty = sPlanQty - HReportQty;
			if (sWorkQty <= 0) {
			sLeftProdTimes = 0;
			}
			else {
			sLeftProdTimes = iLeftQty / sWorkQty;
			}

			//è¥æ¬ä»»å¡åå·²æå®æèµæºï¼ä¸æ¬¡æç¨æèæå·¥æç¨ï¼ åä¸åå¯»æ¾èµæºï¼ç´æ¥æç¨
			if (option.data[i]["HSourceID"] != 0 && option.data[i]["çäº§èµæº"] != "") {
			//è·åè¯¥çäº§èµæºçå©ä½å·¥æ¶è¿è¡æç¨ã
			@@ -2336,6 +2327,9 @@
			success: function (data1) {
			if (data1.count == 1) {
			ds = data1.data
			if (ds.length > 0) {
			option.data[i]["äº§çº¿æ»äº§è½"] = option.data[i]["å°æ¶äº§è½"] * ds[0]["äº§çº¿äººæ°"]
			}
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			@@ -2356,6 +2350,9 @@
			success: function (data1) {
			if (data1.count == 1) {
			ds = data1.data
			if (ds.length > 0) {
			option.data[i]["äº§çº¿æ»äº§è½"] = option.data[i]["å°æ¶äº§è½"] * ds[0]["äº§çº¿äººæ°"]
			}
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			@@ -2364,6 +2361,22 @@
			}
			});
			}

			//è·åå°æ¶äº§è½
			sWorkQty = option.data[i]["äº§çº¿æ»äº§è½"];
			//è·åæ´æ°è®¡åæ°é
			if (SDSum > 0) {
			sPlanQty = sPlanQty - SDSum - HReportQty;
			}
			//å©ä½éæ±å·¥æ¶
			iLeftQty = sPlanQty - HReportQty;
			if (sWorkQty <= 0) {
			sLeftProdTimes = 0;
			}
			else {
			sLeftProdTimes = iLeftQty / sWorkQty;
			}

			if (ds == null \|\| ds.length == 0) //æ²¡æå¯ä»¥æçèµæº
			{
			get_HFData(1, i);
			@@ -2391,7 +2404,7 @@
			option.data[i]["çäº§èµæº"] = sSourceName;
			option.data[i]["çäº§èµæºä»£ç "] = sSourceNumber;

			console.log("======" + "ç¬¬" + (i + 1) + "è¡è®¢å:" + option.data[i].çäº§è®¢åå· + ", èªå¨å¹é" + ds.length + "ä¸ªçäº§èµæºï¼æç»éæ©ï¼" + sSourceName);
			//console.log("======" + "ç¬¬" + (i + 1) + "è¡è®¢å:" + option.data[i].çäº§è®¢åå· + ", èªå¨å¹é" + ds.length + "ä¸ªçäº§èµæºï¼æç»éæ©ï¼" + sSourceName);

			var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
			$.ajax({
			@@ -2430,15 +2443,7 @@
			get_HFData(1, i);
			}
			}
			}
			var new_date = new Date();
			var difftime = (new_date - old_date) / 1000; //è®¡ç®æ¶é´å·®,å¹¶ææ¯«ç§è½¬æ¢æç§

			var days = parseInt(difftime / 86400); // å¤© 246060*1000
			var hours = parseInt(difftime / 3600) - 24 * days; // å°æ¶ 60*60 æ»å°æ¶æ°-è¿å»çå°æ¶æ°=ç°å¨çå°æ¶æ°
			var minutes = parseInt(difftime % 3600 / 60); // åé -(day*24) ä»¥60ç§ä¸ºä¸æ´ä»½ åä½ å©ä¸ç§æ° ç§æ°/60 å°±æ¯åéæ°
			var seconds = parseInt(difftime % 60); // ä»¥60ç§ä¸ºä¸æ´ä»½ åä½ å©ä¸ç§æ°
			console.log("æ¶é´å·®æ¯: " + days + "å¤©, " + hours + "å°æ¶, " + minutes + "åé, " + seconds + "ç§");
			}
			}
			table.render(option);
			get_FastQuery(2);
			@@ -2474,6 +2479,9 @@
			JDTLen = (100 / option.data.length).toFixed(2);
			var HJDLen = 0;
			var HReportQty = 0;
			var HProducedTogether = [];
			var HProducedTogetherIndex = [];
			var HChildSourceData = []; //åçäº§èµæº

			//å¦æéå®è®¡åï¼åä¸éè¦åæç¨
			//æ¥è¯¢æ¬è½¦é´æ¯å¦æéå®è®¡åçæ°æ®
			@@ -2520,7 +2528,7 @@
			});

			//æ ¹æ®è½¦é´å é¤å¨å·å ç¨æ¶é´
			var sql2 = "delete from Gy_MouldOccupancyTime where HICMOEntryID not in ( select HICMOEntryID from Sc_WorkBillSortBillMain where HInterID in (select HInterID from Sc_WorkBillSortBillSub))";
			var sql2 = "delete from Gy_MouldOccupancyTime where HICMOEntryID not in ( select HICMOEntryID from Sc_WorkBillSortBillMain where HInterID in (select HInterID from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20)))";
			$.ajax({
			url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
			type: "GET",
			@@ -2568,8 +2576,7 @@
			HCount++;
			if (HCount > 50000) {
			break;
			}
			var old_date = new Date();
			}

			//element.progress('demo', (i + 1) * HProgress + '%')
			//å¤ææ°ç»é¿åº¦æ¯å¦åçååï¼æ¯åéç½®æ°ç»é¿åº¦
			@@ -2579,7 +2586,7 @@
			i = option.data.length - 1;
			}
			}
			console.log("1.å¼å§æäº§ç¬¬" + (i + 1) + "è¡è®¢åï¼" + option.data[i].çäº§è®¢åå· + "ï¼å½åæäº§æ¥æï¼" + HPCDate + ",ææ©å¼å·¥æ¥æ:" + option.data[i].ææ©å¼å·¥æ¥æ);
			//console.log("1.å¼å§æäº§ç¬¬" + (i + 1) + "è¡è®¢åï¼" + option.data[i].çäº§è®¢åå· + "ï¼å½åæäº§æ¥æï¼" + HPCDate + ",ææ©å¼å·¥æ¥æ:" + option.data[i].ææ©å¼å·¥æ¥æ);
			//æäº§æåä¸ç¬è®¢åï¼è¥æ¬æ¬¡ä¸ºæåä¸ç¬è®¢åæäº§ï¼ä½å½åæäº§æ¥æè¿ä¸æ»¡è¶³ææ©å¼å·¥æ¥æï¼åå½åæ¥æè¿è¡ç´¯å ï¼ç´å°æ»¡è¶³ææ©å¼å·¥æ¥æä¸ºæ¢ï¼
			if (HArrIndex_PC.length == option.data.length - 1 && HArrIndex.length > 0 && Format(option.data[HArrIndex[0]].ææ©å¼å·¥æ¥æ, 'yyyy/MM/dd') > HPCDate) {
			for (var k = 0; k < 100; k++) {
			@@ -2688,6 +2695,7 @@

			var HIsContinue = false; //æ¯å¦è½å¹éå°åéçäº§åå¨å·æ¸åï¼å¹éä¸å°åè·³è¿å½åè®¢å

			//#region å·²å¹éäºèµæºï¼ç´æ¥æäº§
			//è¥æ¬ä»»å¡åå·²æå®æèµæºï¼ä¸æ¬¡æç¨æèæå·¥æç¨ï¼ åä¸åå¯»æ¾èµæºï¼ç´æ¥æç¨
			if (option.data[i]["HSourceID"] != 0 && option.data[i]["çäº§èµæº"] != "") {
			//è·åè¯¥çäº§èµæºçå©ä½å·¥æ¶è¿è¡æç¨ã
			@@ -2704,13 +2712,16 @@
			success: function (data1) {
			if (data1.count == 1) {
			ds = data1.data

			//çæ¯å¦è½å¹éå°æ»¡è¶³çäº§æ¡ä»¶çäº§åå¨å·æ¸å
			var HMaterMouldData = get_MouldByMater(lMaterID, lSourceID);
			var HMaterMouldData = get_MouldByMater(lMaterID, lSourceID, Format(HPCDate, 'yyyy-MM-dd'));
			console.log("ç¬¬" + (i + 1) + "è¡ï¼çäº§è®¢åï¼" + option.data[i].çäº§è®¢åå· + " exec h_p_Gy_MaterialMouldByMater " + lMaterID + "," + lSourceID + ",'" + Format(HPCDate, 'yyyy-MM-dd') + "' ãå¹éå¨å·æ¸åæ°ä¸º:" + HMaterMouldData.length);
			if (HMaterMouldData.length < 1) {
			//æ²¡æå¹éå°å¨å·ï¼çäº§ä¸äºï¼æè®¢åæå°å¾æäº§åè¡¨ä¸ï¼åå¹éä¸ä¸ä¼åçº§çè®¢å
			if (HArrIndex.indexOf(i) == -1) {
			HArrIndex.push(i);
			}

			HIsPriority = true;
			//ä¸ºæ»¡è¶³æåä¸ç¬å¹éè®¢åä¹è½è¿è¡æäº§ï¼æ¹åæ»æäº§è®¢åæ°ç»é¿åº¦ï¼ç»§ç»å¾ªç¯å¹é
			if (HArrIndex.length > 0 && i == HDataLen - 1) {
			@@ -2718,20 +2729,29 @@
			}
			HIsContinue = true;
			} else {
			//å¤æå¹éåºçå¨å·æ¯å¦è½å¨æ¤èµæºä¸ä½¿ç¨
			var HSourceMouldData = get_MouldBySource(lSourceID, HMaterMouldData[0].HMouldID);
			if (HSourceMouldData.length < 1) {
			//æ²¡æå¹éå°èµæºå¨å·æ¸åï¼çäº§ä¸äºï¼æè®¢åæå°å¾æäº§åè¡¨ä¸ï¼åå¹éä¸ä¸ä¼åçº§çè®¢å
			if (HArrIndex.indexOf(i) == -1) {
			HArrIndex.push(i);
			}
			HIsPriority = true;
			//ä¸ºæ»¡è¶³æåä¸ç¬å¹éè®¢åä¹è½è¿è¡æäº§ï¼æ¹åæ»æäº§è®¢åæ°ç»é¿åº¦ï¼ç»§ç»å¾ªç¯å¹é
			if (HArrIndex.length > 0 && i == HDataLen - 1) {
			HDataLen = HDataLen + 1;
			}
			HIsContinue = true;
			}
			//var HSourceMouldData = [];
			////å¤æå¹éåºçå¨å·æ¯å¦è½å¨æ¤èµæºä¸ä½¿ç¨
			//for (var index = 0; index < HMaterMouldData.length; index++) {
			// HSourceMouldData = get_MouldBySource(lSourceID, HMaterMouldData[index].HMouldID);
			// if (HSourceMouldData.length > 0) {
			// break;
			// }
			//}


			//if (HSourceMouldData.length < 1) {
			// //æ²¡æå¹éå°èµæºå¨å·æ¸åï¼çäº§ä¸äºï¼æè®¢åæå°å¾æäº§åè¡¨ä¸ï¼åå¹éä¸ä¸ä¼åçº§çè®¢å
			// if (HArrIndex.indexOf(i) == -1) {
			// HArrIndex.push(i);
			// }

			// HIsPriority = true;
			// //ä¸ºæ»¡è¶³æåä¸ç¬å¹éè®¢åä¹è½è¿è¡æäº§ï¼æ¹åæ»æäº§è®¢åæ°ç»é¿åº¦ï¼ç»§ç»å¾ªç¯å¹é
			// if (HArrIndex.length > 0 && i == HDataLen - 1) {
			// HDataLen = HDataLen + 1;
			// }
			// HIsContinue = true;
			//}
			option.data[i].HMouldID = HMaterMouldData[0].HMouldID;
			option.data[i].HMouldPCTime = HMaterMouldData[0].HPCTime;
			}
			@@ -2744,6 +2764,8 @@
			});

			}
			//#endregion
			//#region æ²¡æèµæºå èªå¨æ¾å°èµæº
			else //æ²¡æèµæºå èªå¨æ¾å°èµæº
			{
			//æ¥è¯¢çäº§èµæºçå©ä½å·¥æ¶è¿è¡æç¨ã
			@@ -2758,24 +2780,12 @@
			ds = data1.data

			if (ds.length > 0) {
			//çæ¯å¦è½å¹éå°æ»¡è¶³çäº§æ¡ä»¶çäº§åå¨å·æ¸å
			var HMaterMouldData = get_MouldByMater(lMaterID, ds[0]["HitemID"]);
			if (HMaterMouldData.length < 1) {
			//æ²¡æå¹éå°å¨å·ï¼çäº§ä¸äºï¼æè®¢åæå°å¾æäº§åè¡¨ä¸ï¼åå¹éä¸ä¸ä¼åçº§çè®¢å
			if (HArrIndex.indexOf(i) == -1) {
			HArrIndex.push(i);
			}
			HIsPriority = true;
			//ä¸ºæ»¡è¶³æåä¸ç¬å¹éè®¢åä¹è½è¿è¡æäº§ï¼æ¹åæ»æäº§è®¢åæ°ç»é¿åº¦ï¼ç»§ç»å¾ªç¯å¹é
			if (HArrIndex.length > 0 && i == HDataLen - 1) {
			HDataLen = HDataLen + 1;
			}
			HIsContinue = true;
			} else {
			//å¤æå¹éåºçå¨å·æ¯å¦è½å¨æ¤èµæºä¸ä½¿ç¨
			var HSourceMouldData = get_MouldBySource(ds[0]["HitemID"], HMaterMouldData[0].HMouldID);
			if (HSourceMouldData.length < 1) {
			//æ²¡æå¹éå°èµæºå¨å·æ¸åï¼çäº§ä¸äºï¼æè®¢åæå°å¾æäº§åè¡¨ä¸ï¼åå¹éä¸ä¸ä¼åçº§çè®¢å
			//#region èµæºå·¥ä½æ°çäºéæ±å·¥ä½æ°
			if (ds[0].èµæºå·¥ä½æ° == ds[0].æéå·¥ä½æ°) {
			//çæ¯å¦è½å¹éå°æ»¡è¶³çäº§æ¡ä»¶çäº§åå¨å·æ¸å
			var HMaterMouldData = get_MouldByMater(lMaterID, ds[0]["HitemID"], Format(HPCDate, 'yyyy-MM-dd'));
			if (HMaterMouldData.length < 1) {
			//æ²¡æå¹éå°å¨å·ï¼çäº§ä¸äºï¼æè®¢åæå°å¾æäº§åè¡¨ä¸ï¼åå¹éä¸ä¸ä¼åçº§çè®¢å
			if (HArrIndex.indexOf(i) == -1) {
			HArrIndex.push(i);
			}
			@@ -2785,17 +2795,112 @@
			HDataLen = HDataLen + 1;
			}
			HIsContinue = true;
			} else {
			////å¤æå¹éåºçå¨å·æ¯å¦è½å¨æ¤èµæºä¸ä½¿ç¨
			//var HSourceMouldData = get_MouldBySource(ds[0]["HitemID"], HMaterMouldData[0].HMouldID);
			//if (HSourceMouldData.length < 1) {
			// //æ²¡æå¹éå°èµæºå¨å·æ¸åï¼çäº§ä¸äºï¼æè®¢åæå°å¾æäº§åè¡¨ä¸ï¼åå¹éä¸ä¸ä¼åçº§çè®¢å
			// if (HArrIndex.indexOf(i) == -1) {
			// HArrIndex.push(i);
			// }
			// HIsPriority = true;
			// //ä¸ºæ»¡è¶³æåä¸ç¬å¹éè®¢åä¹è½è¿è¡æäº§ï¼æ¹åæ»æäº§è®¢åæ°ç»é¿åº¦ï¼ç»§ç»å¾ªç¯å¹é
			// if (HArrIndex.length > 0 && i == HDataLen - 1) {
			// HDataLen = HDataLen + 1;
			// }
			// HIsContinue = true;
			//}
			option.data[i].HMouldID = HMaterMouldData[0].HMouldID;
			option.data[i].HMouldPCTime = HMaterMouldData[0].HPCTime;
			}
			}
			}
			//#endregion
			//#region èµæºå·¥ä½æ°å¤§äºéæ±å·¥ä½æ°
			else if (ds[0].èµæºå·¥ä½æ° > ds[0].æéå·¥ä½æ°) {
			//çæ¯å¦è½å¹éå°æ»¡è¶³çäº§æ¡ä»¶çäº§åå¨å·æ¸å
			var HMaterMouldData = get_MouldByMater(lMaterID, ds[0]["HitemID"], Format(HPCDate, 'yyyy-MM-dd'));
			if (HMaterMouldData.length < 1) {
			//æ²¡æå¹éå°å¨å·ï¼çäº§ä¸äºï¼æè®¢åæå°å¾æäº§åè¡¨ä¸ï¼åå¹éä¸ä¸ä¼åçº§çè®¢å
			if (HArrIndex.indexOf(i) == -1) {
			HArrIndex.push(i);
			}
			HIsPriority = true;
			//ä¸ºæ»¡è¶³æåä¸ç¬å¹éè®¢åä¹è½è¿è¡æäº§ï¼æ¹åæ»æäº§è®¢åæ°ç»é¿åº¦ï¼ç»§ç»å¾ªç¯å¹é
			if (HArrIndex.length > 0 && i == HDataLen - 1) {
			HDataLen = HDataLen + 1;
			}
			HIsContinue = true;
			} else {
			option.data[i].HMouldID = HMaterMouldData[0].HMouldID;
			option.data[i].HMouldPCTime = HMaterMouldData[0].HPCTime;
			}

			//å¹éæ¤çäº§èµæºä¸çåçäº§èµæº
			HChildSourceData = get_ChildSource(ds[0]["HitemID"]);
			option.data[i].çäº§èµæº = "";
			for (var k = 0; k < option.data[i].æéå·¥ä½æ°; k++) {
			if (k == 0) {
			option.data[i].HSourceID = HChildSourceData[k].åèµæºID;
			}
			option.data[i].çäº§èµæº += HChildSourceData[k].åèµæºåç§° + "&";
			}
			option.data[i].çäº§èµæº = option.data[i].çäº§èµæº.substring(0, option.data[i].çäº§èµæº.length - 1)

			//å¤æèµæºæ¯å¦æå©ä½å·¥ä½,æ¥çå¹éå¶ä»è®¢ååæ¶çäº§
			var HRestCubicleQty = ds[0].èµæºå·¥ä½æ° - ds[0].æéå·¥ä½æ°
			for (var x = i + 1; x < option.data.length; x++) {
			if (HRestCubicleQty >= option.data[x].æéå·¥ä½æ° && HArrIndex_PC.indexOf(x) == -1) {
			console.log("&&&&&ç¬¬" + (i + 1) + "è¡æè®¢åä¸èµ·åä¸å¹é," + option.data[x].HMaterID)
			//å¤ææ¤è®¢åï¼ç©æï¼æ¯å¦ä¹è½æ¾å¨æ¤çäº§èµæºä¸çäº§
			var HMaterSourceData = get_MaterSource(option.data[x].HMaterID);

			for (var y = 0; y < HMaterSourceData.length; y++) {
			if (ds[0]["HitemID"] == HMaterSourceData[y]["HitemID"]) {
			//çæ¯å¦è½å¹éå°æ»¡è¶³çäº§æ¡ä»¶çäº§åå¨å·æ¸å
			var HMaterMouldData_Level2 = get_MouldByMater(option.data[x].HMaterID, ds[0]["HitemID"], Format(HPCDate, 'yyyy-MM-dd'));
			if (HMaterMouldData_Level2.length >= 1) {
			option.data[x].HMouldID = HMaterMouldData_Level2[0].HMouldID;
			option.data[x].HMouldPCTime = HMaterMouldData_Level2[0].HPCTime;

			option.data[x].çäº§èµæº = "";
			for (var k = HChildSourceData.length - HRestCubicleQty; k < HChildSourceData.length; k++) {
			if (k == HChildSourceData.length - HRestCubicleQty) {
			option.data[x].HSourceID = HChildSourceData[k].åèµæºID;
			}

			option.data[x].çäº§èµæº += HChildSourceData[k].åèµæºåç§° + "&";
			}
			option.data[x].çäº§èµæº = option.data[x].çäº§èµæº.substring(0, option.data[x].çäº§èµæº.length - 1)

			HProducedTogether.push(HMaterSourceData[y]);
			HProducedTogetherIndex.push(x);
			console.log("çäº§è®¢åï¼" + option.data[x].çäº§è®¢åå· + ",å¯ä»¥ä¸è®¢å" + option.data[i].çäº§è®¢åå· + "ä¸èµ·è¿è¡çäº§")
			HArrIndex_PC.push(x);
			break;

			} else {
			//æ²¡æå¹éå°äº§åå¨å·æ¸åï¼ç»§ç»å¹éä¸ä¸ä¼åçº§è®¢åå±åçäº§

			continue;
			}
			}
			}
			}
			}
			}
			//#endregion
			} else {
			console.log("ç¬¬" + (i + 1) + "è¡ï¼ä¼åçº§" + option.data[i].ä¼åçº§ + "ï¼æ²¡æå¹éå°çäº§èµæºï¼" + sql);
			}
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//æ¯å¦è½å¹éå°åéçäº§åå¨å·æ¸åï¼å¹éä¸å°åè·³è¿å½åè®¢å
			if (HIsContinue) {
			@@ -2825,13 +2930,13 @@
			lSourceID = ds[j]["HitemID"];
			sSourceName = ds[j]["èµæºåç§°"];
			sSourceNumber = ds[j]["èµæºä»£ç "];
			option.data[i]["HSourceID"] = lSourceID;
			option.data[i]["çäº§èµæº"] = sSourceName;
			option.data[i]["HSourceID"] = option.data[i]["HSourceID"] == null ? lSourceID : option.data[i]["HSourceID"];
			option.data[i]["çäº§èµæº"] = option.data[i]["çäº§èµæº"] == null ? sSourceName : option.data[i]["çäº§èµæº"];
			option.data[i]["çäº§èµæºä»£ç "] = sSourceNumber;

			console.log("======" + "ç¬¬" + (i + 1) + "è¡è®¢å:" + option.data[i].çäº§è®¢åå· + ", èªå¨å¹é" + ds.length + "ä¸ªçäº§èµæºï¼æç»éæ©ï¼" + sSourceName);
			//console.log("======" + "ç¬¬" + (i + 1) + "è¡è®¢å:" + option.data[i].çäº§è®¢åå· + ", èªå¨å¹é" + ds.length + "ä¸ªçäº§èµæºï¼æç»éæ©ï¼" + sSourceName);

			var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
			var sql = "exec h_p_Sc_ICMOGetWorkSourceTime_TK_HJPC " + option.data[i]["HSourceID"] + "," + option.data[i].HMouldID;
			$.ajax({
			url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
			type: "GET",
			@@ -2858,7 +2963,14 @@
			//å°æ°æ®æå°ç½æ ¼ä¸
			SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);

			set_AddNew_HJPC(option.data[i]);
			for (var z = 0; z < option.data[i].æéå·¥ä½æ°; z++) {
			if (z == 0) {
			set_AddNew_HJPC(option.data[i]);
			} else {
			//option.data[i].HSourceID = HChildSourceData[z].åèµæºID;
			//set_AddNew_HJPC(option.data[i]);
			}
			}
			}
			bFind = true;

			@@ -2869,14 +2981,84 @@
			}
			}
			}
			var new_date = new Date();
			var difftime = (new_date - old_date) / 1000; //è®¡ç®æ¶é´å·®,å¹¶ææ¯«ç§è½¬æ¢æç§
			//å±åçäº§è®¢åæäº§
			if (HProducedTogether.length > 0) {
			//å¼å§æå
			bFind = false;
			//è¶äº¤è´§æ ä»ç¶æç¨
			for (var j = 0; j < HProducedTogether.length; j++) {
			$("tr[data-index='" + HProducedTogetherIndex[j] + "']").attr({ "style": "background:White;color:black;" });

			var days = parseInt(difftime / 86400); // å¤© 246060*1000
			var hours = parseInt(difftime / 3600) - 24 * days; // å°æ¶ 60*60 æ»å°æ¶æ°-è¿å»çå°æ¶æ°=ç°å¨çå°æ¶æ°
			var minutes = parseInt(difftime % 3600 / 60); // åé -(day*24) ä»¥60ç§ä¸ºä¸æ´ä»½ åä½ å©ä¸ç§æ° ç§æ°/60 å°±æ¯åéæ°
			var seconds = parseInt(difftime % 60); // ä»¥60ç§ä¸ºä¸æ´ä»½ åä½ å©ä¸ç§æ°
			console.log("æ¶é´å·®æ¯: " + days + "å¤©, " + hours + "å°æ¶, " + minutes + "åé, " + seconds + "ç§");
			sPlanQty = option.data[HProducedTogetherIndex[j]]["æåæ°é"];
			HReportQty = option.data[HProducedTogetherIndex[j]]["æåæ±æ¥æ°é"];
			sWorkQty = option.data[HProducedTogetherIndex[j]]["å°æ¶äº§è½"];
			if (SDSum > 0) {
			sPlanQty = sPlanQty - SDSum - HReportQty;
			}
			//å©ä½éæ±å·¥æ¶
			iLeftQty = sPlanQty - HReportQty;
			if (sWorkQty <= 0) {
			sLeftProdTimes = 0;
			}
			else {
			sLeftProdTimes = iLeftQty / sWorkQty;
			}

			//å¤æèµæºå©ä½å·¥æ¶ï¼æ¯å¦å¤§äº çäº§å¨æ
			if (parseFloat(HProducedTogether[j]["å©ä½å·¥æ¶"]) >= sLeftProdTimes) {
			if (iLeftQty > 0) // çäº§è®¢åå©ä½æ°é
			{
			//å¨æ¬èµæºä¸çäº§
			//è·åè¯¥çäº§èµæºçå©ä½å·¥æ¶è¿è¡æç¨ã
			lSourceID = HProducedTogether[j]["HitemID"];
			sSourceName = HProducedTogether[j]["èµæºåç§°"];
			sSourceNumber = HProducedTogether[j]["èµæºä»£ç "];
			option.data[HProducedTogetherIndex[j]]["HSourceID"] = option.data[HProducedTogetherIndex[j]]["HSourceID"] == null ? lSourceID : option.data[HProducedTogetherIndex[j]]["HSourceID"]
			option.data[HProducedTogetherIndex[j]]["çäº§èµæº"] = option.data[HProducedTogetherIndex[j]]["çäº§èµæº"] == null ? sSourceName : option.data[HProducedTogetherIndex[j]]["çäº§èµæº"];

			option.data[HProducedTogetherIndex[j]]["çäº§èµæºä»£ç "] = sSourceNumber;

			//console.log("======" + "ç¬¬" + (i + 1) + "è¡è®¢å:" + option.data[i].çäº§è®¢åå· + ", èªå¨å¹é" + ds.length + "ä¸ªçäº§èµæºï¼æç»éæ©ï¼" + sSourceName);

			var sql = "exec h_p_Sc_ICMOGetWorkSourceTime_TK_HJPC " + option.data[HProducedTogetherIndex[j]]["HSourceID"] + "," + option.data[HProducedTogetherIndex[j]].HMouldID;
			$.ajax({
			url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
			type: "GET",
			async: false,
			data: { "sWhere": sql },
			success: function (data1) {
			if (data1.count == 1) {
			dsSub = data1.data
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			if (dsSub == null \|\| dsSub.length == 0) {
			get_HFData(1, HProducedTogetherIndex[j]);
			continue;//å¦ææ²¡æå©ä½å æ§è¡ä¸ä¸ä¸ªçäº§è®¢å
			}
			if (dsSub != null)//ä¸å çæç¨
			{
			iRow = HProducedTogetherIndex[j] + 1;
			//å°æ°æ®æå°ç½æ ¼ä¸
			SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);

			set_AddNew_HJPC(option.data[HProducedTogetherIndex[j]]);
			}
			bFind = true;

			break;
			}
			} else {
			get_HFData(1, HProducedTogetherIndex[j]);
			}
			}
			HProducedTogether = [];
			}
			}
			table.render(option);
			get_FastQuery(2);
			@@ -3150,13 +3332,13 @@
			}

			//ç©æå¹éäº§åå¨å·æ¸å
			function get_MouldByMater(HMaterID, HSourceID) {
			function get_MouldByMater(HMaterID, HSourceID, HPCDate) {
			var HReturnData = [];
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetMouldByMater',
			type: "GET",
			async: false,
			data: { "HMaterID": HMaterID, "HSourceID": HSourceID },
			data: { "HMaterID": HMaterID, "HSourceID": HSourceID, "HPCDate": HPCDate},
			success: function (data1) {
			if (data1.count == 1) {
			HReturnData = data1.data;
			@@ -3164,7 +3346,7 @@
			console.log(new Date() + ",å¹éäº§åå¨å·æ¸ååºé1");
			}
			}, error: function () {
			console.log(new Date() + ",å¹éäº§åå¨å·æ¸ååºé1");
			console.log(new Date() + ",å¹éäº§åå¨å·æ¸ååºé2");
			}
			});
			return HReturnData;
			@@ -3182,13 +3364,55 @@
			if (data1.count == 1) {
			HReturnData = data1.data;
			} else {
			console.log(new Date() + ",å¹éäº§åå¨å·æ¸ååºé1");
			console.log(new Date() + ",å¹éäº§åå¨å·æ¸ååºé2");
			}
			}, error: function () {
			console.log(new Date() + ",å¹éäº§åå¨å·æ¸ååºé1");
			}
			});
			return HReturnData;
			}

			//å¤æå¤ä¸ªè®¢åæ¯å¦è½ä¸èµ·æ¾å°åä¸ä¸ªçäº§èµæºè¿è¡çäº§
			function get_MaterSource(HMaterID) {
			var HMaterSourceData = [];
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetSourceByMater',
			type: "GET",
			async: false,
			data: { "HMaterID": HMaterID },
			success: function (data1) {
			if (data1.count == 1) {
			HMaterSourceData = data1.data;
			} else {
			console.log(new Date() + ",å¹éç©æèµæºåºé1");
			}
			}, error: function () {
			console.log(new Date() + ",å¹éç©æèµæºåºé2");
			}
			});
			return HMaterSourceData;
			}

			//éè¿ä¸»çäº§èµæºå¹éåºåçäº§èµæº
			function get_ChildSource(HSourceID) {
			var HChildSource = [];
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetChildSource',
			type: "GET",
			async: false,
			data: { "HSourceID": HSourceID },
			success: function (data1) {
			if (data1.count == 1) {
			HChildSource = data1.data;
			} else {
			console.log(new Date() + ",è·ååçäº§èµæº2");
			}
			}, error: function () {
			console.log(new Date() + ",è·ååçäº§èµæº1");
			}
			});
			return HChildSource;
			}

			//æ¥è¯¢çäº§è®¢å
			@@ -3665,12 +3889,11 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {

			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/AddMouldOccupancyTime',
			type: "GET",
			async: false,
			data: { "HMouldID": num.HMouldID, "HSourceID": num.HSourceID, "HICMOInterID": num.HICMOInterID, "HICMOEntryID": num.HICMOEntryID, "HMouldPCTime": num.HMouldPCTime },
			data: { "HMouldID": num.HMouldID, "HSourceID": num.HSourceID, "HICMOInterID": num.HICMOInterID, "HICMOEntryID": num.HICMOEntryID, "HICMOBillNo": num.çäº§è®¢åå·, "HMouldPCTime": num.HMouldPCTime },
			success: function (data1) {
			if (data1.count == 1) {

			@@ -4191,7 +4414,17 @@
			item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[,]+/g, 'ï¼'); // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			});

			for (let i = 19; i < option.cols[0].length - 42; i++)
			{
			option.cols[0][i].title = Format(option.cols[0][i].title, 'MM-dd').toString();
			}

			table.exportFile(ins.config.id, data, "xls");

			for (let i = 19; i < option.cols[0].length - 42; i++) {
			option.cols[0][i].title = Format(option.cols[0][i].title, 'MM.dd');
			}
			}

			//æäº§åè½