MES-WEB-LayUI.git

			@@ -336,6 +336,7 @@
			var HSourceEntryID = ""; //æºåååç
			var HSourceBillNo = ""; //æºååå·
			var HSourceBillType = ""; //æºåç±»å
			var refSav = ""; //æäº¤ç±»å
			//è·åé¡µé¢è·³è½¬åæ° //åæ®ç¼è¾ç¶æï¼ 1.æ æºåæ°å¢Â Â 2.ææºåæ°å¢Â Â 3.ç¼è¾Â 4.æµè§Â 5.åæ´
			var params = get_UrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			@@ -377,9 +378,17 @@

			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºå
			$("#HWorkManID").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HWorkManName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			set_AddFNew();
			}
			else if (OperationType == 2) {//ææºå
			$("#HWorkManID").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HWorkManName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			set_AddNew();
			}
			else if (OperationType == 3) {//ç¼è¾
			@@ -436,6 +445,7 @@

			//ææºåæ°å¢
			function set_AddNew() {
			refSav = "Add";
			//åå§åºæ¬ä¿¡æ¯èµå¼
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //åæ®æ¥æ
			$("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //æ¥å·¥æ¥æ
			@@ -485,8 +495,8 @@
			$("#HSourceInterID").val(LoadData[0].HSourceInterID); //æºåä¸»åç (åå¼HInterID)
			$("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //æºåååç (æºåè¡å·)
			$("#HSourceBillType").val(HSourceBillType); //æºåç±»å
			$("#HGroupID").val(LoadData[0].HDeptID); //çç»ID
			$("#HGroupName").val(LoadData[0].HDeptName); //çç»
			//$("#HGroupID").val(LoadData[0].HDeptID); //çç»ID
			//$("#HGroupName").val(LoadData[0].HDeptName); //çç»
			$("#HICMOInterID").val(LoadData[0].HICMOInterID); //çäº§è®¢åID
			$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //çäº§è®¢ååID
			$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //çäº§è®¢å
			@@ -508,6 +518,7 @@
			//ç¼è¾
			function set_EditFromGrid(linterid, HICMOInID, HICMOEnID)
			{
			refSav = "Update";
			//å æºåç±»ååºå(å¯ä»¥åä¸åçæ¹æ³)
			$('#HICMOBillNo').attr("disabled", true);
			$('#HSourceBillNo').attr("disabled", true);
			@@ -669,7 +680,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/PartInformation.html', 'yes'],
			content: ['../../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -679,8 +690,8 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HMaterName").val(checkStatus.data[0].HName);
			$("#HMaterCode").val(checkStatus.data[0].HNumber);
			$("#HMaterName").val(checkStatus.data[0].ç©æåç§°);
			$("#HMaterCode").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -708,7 +719,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/SourceInformation.html', 'yes'],
			content: ['../../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -718,7 +729,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HSourceName").val(checkStatus.data[0].HName);
			$("#HSourceName").val(checkStatus.data[0].çäº§èµæºåç§°);
			$("#HSourceID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -746,7 +757,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/UserInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?type=HEmp', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -756,7 +767,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HWorkManName").val(checkStatus.data[0].HName);
			$("#HWorkManName").val(checkStatus.data[0].èååç§°);
			$("#HWorkManID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -786,7 +797,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/GroupInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?type=HGroup', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -796,7 +807,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HGroupName").val(checkStatus.data[0].HName);
			$("#HGroupName").val(checkStatus.data[0].çç»åç§°);
			$("#HGroupID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -869,25 +880,40 @@
			data.field.HWasterQty = 0;
			}
			var sMainStr = JSON.stringify(data.field);

			var sMainSub = sMainStr + ';' + refSav;

			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESProductReportFrom", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sMainStr },
			async: false,
			data: { "msg": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			$("#HInterID").val(data.HInterID);//è·åæäº¤æåè¿åçåæ®ä¸»ID
			layer.confirm(data.Message, {
			btn: ['ç¡®è®¤']
			}, function (index) {
			layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
			if (data.Verify == "Y") //èªå¨å®¡æ ¸
			{
			layer.close(index);
			SaveVerify(); //å®¡æ ¸
			}
			else {
			layer.close(index);
			}
			});

			//layer.confirm(data.Message, {
			// btn: ['ç¡®è®¤']
			//}, function (index) {
			// if (data.Verify == "Y") //èªå¨å®¡æ ¸
			// {
			// layer.close(index);
			// SaveVerify(); //å®¡æ ¸
			// }
			// else {
			// layer.close(index);
			// }
			//});
			}
			else {
			layer.alert(data.Message, { icon: 5 })
			@@ -916,7 +942,7 @@
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/Sc_MESBeginWorkBill/MESProductAuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HSourceID": HSourceID, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			@@ -950,7 +976,7 @@
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Sc_MESBeginWorkBill/MESProductAuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HSourceID": HSourceID, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
			data: { "HSourceID": HSourceID, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
			@@ -1014,7 +1040,16 @@
			return Result;
			}


			//æä½å
			function GetHEmpValue(obj) {
			$("#HWorkManName").val(obj[0].èååç§°);
			$("#HWorkManID").val(obj[0].HItemID);
			}
			//çäº§çç»
			function GetHGroupValue(obj) {
			$("#HGroupName").val(obj[0].çç»åç§°);
			$("#HGroupID").val(obj[0].HItemID);
			}


			</script>