MES-WEB-LayUI.git

			@@ -246,6 +246,7 @@
			var dd = myDate.getDate();
			var SumMonth = 31; //å¨æä¸¤æä¹å·® new Date(yyyy, MM, 0).getDate()
			var dateHQty = 0;
			var SumHQty = 0;//æåæ°é

			for (var i = 0; i <= (SumMonth - dd); i++) {
			if (obj.field == "çäº§èµæº") {
			@@ -261,16 +262,38 @@
			}
			}

			//æ¥è¯¢æææ°æ®ç¸åçè®¢å
			for (var i = 0; i < option.data.length; i++) {
			if (obj.data["çäº§è®¢åå·"] == option.data[i]["çäº§è®¢åå·"] && obj.data["çäº§è®¢åæç»è¡å·"] == option.data[i]["çäº§è®¢åæç»è¡å·"]) {
			SumHQty += parseInt(option.data[i]["æåæ°é"]);
			}
			}

			if (obj.value == "0" && obj.field == "æåæ°é") {
			return layer.msg("æåæ°éä¸è½ä¸º0!");
			}

			if (SumHQty > (parseInt(obj.data["è®¡åæ°é"]))) {
			obj.update({
			"æåæ°é": "0"
			});
			return layer.msg("æåæ°éå¤§äºè®¢åæ°é!");
			}

			var NowDate = obj.field;
			if (dateHQty > (parseInt(obj.data["è®¡åæ°é"]))) {
			obj.update({
			"æ¥è®¡åæ°éæ»é": dateHQty
			"æ¥è®¡åæ°éæ»é": dateHQty - obj.value,
			[NowDate]: 0
			});
			return layer.msg("æäº§æ°éå¤§äºè®¢åæ°é!")
			}



			//ä¿®æ¹æ°æ®
			obj.update({
			"æ¥è®¡åæ°éæ»é": dateHQty
			"æ¥è®¡åæ°éæ»é": dateHQty,
			});
			})

			@@ -279,45 +302,8 @@
			btnrowDouble(obj.data);
			})

			var objData = "";
			//ç¹å»è¡éä¸æ°æ®
			table.on('row(mainTable)', function (obj) {

			//if (objData != "" && objData.tr.find(':checkbox:first').prop('checked') != obj.tr.find(':checkbox:first').prop('checked')) {
			// objData.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			// objData.tr.find(':checkbox:first').prop('checked', false);//åæ¶å¤éæ¡éä¸æ ·å¼
			// layui.each(table.cache.mainTable, function (i, l) {
			// if (objData.tr.index() == l.LAY_TABLE_INDEX) {
			// l.LAY_CHECKED = false;
			// }
			// });
			//}

			//var flag = !obj.tr.find(':checkbox:first').prop('checked');
			//obj.tr.find(':checkbox').prop('checked', flag);
			//if (flag) {
			// obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			//} else {
			// obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			// obj.tr.find(':checkbox:first').prop('checked', false);//åæ¶å¤éæ¡éä¸æ ·å¼
			//}
			////mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			//layui.each(table.cache.mainTable, function (i, l) {
			// if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			// l.LAY_CHECKED = flag;
			// }
			//});

			//for (var i = 0; i < table.cache["mainTable"].length; i++) {
			// if (table.cache["mainTable"][i]["çäº§è®¢åå·"] != obj.data["çäº§è®¢åå·"]) {
			// table.cache["mainTable"][i].LAY_CHECKED = false;
			// }
			//}
			//option.data = table.cache["mainTable"];
			//table.render(option);


			//objData = obj;

			//éä¸è¡æ¹åé¢è²
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			@@ -354,6 +340,40 @@
			data[0]["HSourceID"] = "";
			data[0]["hmainid"] = "";
			data[0]["åæ®å·"] = "";
			data[0]["æåæ°é"] = 0;

			var myDate = new Date();
			//è·åå¹´
			var yyyy = myDate.getFullYear();
			//è·åæä»½
			var MM = myDate.getMonth() + 1;
			//è·åå¼å§æä»½çæå¤§å¤©æ°
			var SumMonth = new Date(yyyy, MM, 0).getDate(); //å¨æä¸¤æä¹å·®
			//è·åå¼å§æ¥æçå¤©æ°
			var HBEGINDATE = myDate.getDate(); //è·åå½å¤©æ¥æå¤©æ°
			var columns=[]
			var k = 0;//æ¶éå¾ªç¯æ¬¡æ°
			for (var j = 0; j <= (30 - k); j++) {

			data[0][Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')] = "";

			//è·¨å¹´çè¯ ä¼ä»ä¸æä¸å·å¼å§
			if (MM == 12 && (HBEGINDATE + j) == 31) {
			yyyy += 1;
			MM = 1;
			SumMonth = new Date(yyyy, MM, 0).getDate();
			HBEGINDATE = 0;
			k += j;
			j = 0;
			} else if ((HBEGINDATE + j) == SumMonth) { //è·¨æ ææ°å ä¸ å¤©æ°ä»ä¸å¼å§
			HBEGINDATE = 0;
			MM += 1;
			SumMonth = new Date(yyyy, MM, 0).getDate();
			k += j;
			j = 0;
			}
			}

			var copydata = JSON.stringify(data);
			var copydata2 = copydata.substring(1, copydata.length);//å»é¤é¦è¡åç¬¦'['
			var copyrow = copydata2.substring(0, copydata2.length - 1);//å»é¤æ«å°¾åç¬¦']'
			@@ -572,19 +592,19 @@
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;' });
			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150 });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text' });
			columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width:150 });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width:150 });
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width:150 });
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width:150 });
			columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width:150 });//0
			columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150 });//0
			columns.push({field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150});//0
			columns.push({ field: 'ä»æ¥ä¹åæ¥è®¡åæ°é', title: 'ä»æ¥ä¹åæ¥è®¡åæ°é', width: 150 });//0
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>"});
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, event: "HPlanEndDate"});
			columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, event: "HPlanEndDate" });
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150});
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text' });
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é'});
			columns.push({ field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 150});

			columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID" });
			@@ -734,14 +754,16 @@
			columns.push({ field: 'çµå/åç/åºæ¿', title: 'çµå/åç/åºæ¿', width: 150 });
			columns.push({ field: 'è®¡éåä½', title: 'è®¡éåä½', width: 150 });
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150 });//0
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150 });
			columns.push({ field: 'æªå¥åºæ°é', title: 'æªå¥åºæ°é', width: 150 });//0
			columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide:true });
			columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide:true });
			columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
			columns.push({ field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ', width: 150, hide: true });
			columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
			columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
			columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
			columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
			columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
			columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
			columns.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });

			option = {
			@@ -1261,7 +1283,10 @@
			if (isNaN(data[i]["HICMOInterID"])) {
			return layer.msg("è¯·åè¿è¡ä¿å!!")
			}
			HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"]);
			if (isNaN(data[i]["HSourceID"])) {
			return layer.msg("éæ©çäº§èµæº!!")
			}
			HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
			}
			$('#HProgressBar').html(`
			<div class="layui-progress" lay-filter="demo-filter-progress">
			@@ -1273,7 +1298,7 @@
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
			type: "GET",
			data: { "HICOMNum": HICOMNum.toString() },
			data: { "SWhere": HICOMNum.toString() },
			success: function (data1) {
			if (data1.count == 1) {
			for (var i = 0; i < data1.data.length; i++) {
			@@ -1439,7 +1464,7 @@
			sICMOBillNo = option.data[i]["çäº§è®¢åå·"];
			dEndDate = Format(option.data[i]["æè¿å®å·¥æ¥æ"], 'yyyy/MM/dd');
			sProdTimes = option.data[i]["çäº§å¨æ"];
			sPlanQty = option.data[i]["è®¢åå¯ææ°é"];
			sPlanQty = option.data[i]["æåæ°é"];
			lHGroupID = option.data[i]["HGroupID"];
			sGroupName = option.data[i]["HGroupName"];
			lMaterID = option.data[i]["HMaterID"];
			@@ -1776,7 +1801,7 @@
			//oClsGridValues.Add(oSub);
			}
			else {
			grd.data[iRow][grd.cols[0][j + HPlanDay].field] = sLeftQty;
			grd.data[iRow][grd.cols[0][j + HPlanDay].field] = Math.round(sLeftQty * 10) / 10;
			sLeftQty = 0;
			//oSub = new ClsGridValues();
			//oSub.iRow = iRow;
			@@ -2075,7 +2100,7 @@
			function set_Priority() {
			var data = table.cache["mainTable"];
			for (var i = 0; i < data.length; i++) {
			data[i]["ä¼åçº§"] = (i + 1);
			data[i]["ä¼åçº§"] = ((i + 1) * 5);
			}
			option.data = data;
			table.render(option);
			@@ -2083,7 +2108,41 @@

			//åå¤æåº
			function set_ReadyAsc() {
			if (option.data.length != 0) {
			for (var i = 0; i < option.data.length - 1; i++) {
			for (var j = 0; j < option.data.length - i - 1; j++) {
			var tables = [];
			//æç§è®¡åç»ææ¥æ çäº§è®¢åå· çäº§è®¢åæç»è¡å·çé¡ºåºå»æ
			if (option.data[j]["è®¡åç»ææ¥æ"] > option.data[j + 1]["è®¡åç»ææ¥æ"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["è®¡åç»ææ¥æ"] == option.data[j + 1]["è®¡åç»ææ¥æ"]) {
			if (option.data[j]["çäº§è®¢åå·"] > option.data[j + 1]["çäº§è®¢åå·"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["çäº§è®¢åå·"] == option.data[j + 1]["çäº§è®¢åå·"]) {
			if (option.data[j]["çäº§è®¢åæç»è¡å·"] > option.data[j + 1]["çäº§è®¢åæç»è¡å·"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			}
			}
			}
			}
			}
			table.render(option);
			}
			else {
			return layer.msg("æ æ°æ®!")
			}
			}

			//ä¿å
			@@ -2093,8 +2152,11 @@
			var num = [];
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			if (parseFloat(table.cache["mainTable"][i]["è®¢åå¯ææ°é"]) < parseFloat(table.cache["mainTable"][i]["æ¥è®¡åæ°éæ»é"]) + parseFloat(table.cache["mainTable"][i]["ä»æ¥ä¹åæ¥è®¡åæ°é"])) {
			return layer.msg("ç¬¬" + (i + 1) + "è¡æäº§æ°éè¶åºè®¢åæ°é!");
			if (parseFloat(table.cache["mainTable"][i]["æåæ°é"]) == 0) {
			return layer.msg("ç¬¬" + (i + 1) + "è¡,æäº§æ°éæè¯¯,è¯·éæ°è¾å¥!");
			}
			if (parseFloat(table.cache["mainTable"][i]["æåæ°é"]) < parseFloat(table.cache["mainTable"][i]["æ¥è®¡åæ°éæ»é"]) + parseFloat(table.cache["mainTable"][i]["ä»æ¥ä¹åæ¥è®¡åæ°é"])) {
			return layer.msg("ç¬¬" + (i + 1) + "è¡,æäº§æ°éè¶åºè®¢åæ°é!");
			}
			table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
			num.push(table.cache["mainTable"][i])