MES-WEB-API.git

			@@ -16,6 +16,7 @@
			using DingTalk.Api;
			using DingTalk.Api.Response;
			using System.Globalization;
			using System.Linq;

			namespace WebAPI.Controllers
			{
			@@ -100,6 +101,8 @@
			public string HOriginator; //åèµ·äºº
			public string HTitle; //åæ®æ é¢

			public string HInstanceStatus; //å®ä¾ç¶æ
			public string HApprovedResult; //å®¡æ¹ç»æ

			//åæ®åå®¹
			public string HDate; //æ¥æ
			@@ -124,6 +127,8 @@
			public string HOriginator; //åèµ·äºº
			public string HTitle; //åæ®æ é¢

			public string HInstanceStatus; //å®ä¾ç¶æ
			public string HApprovedResult; //å®¡æ¹ç»æ

			//åæ®åå®¹
			public string HDate; //æ¥æ
			@@ -154,6 +159,8 @@
			public string HOriginator; //åèµ·äºº
			public string HTitle; //åæ®æ é¢

			public string HInstanceStatus; //å®ä¾ç¶æ
			public string HApprovedResult; //å®¡æ¹ç»æ

			//åæ®åå®¹
			public string HEmployeeID; //æåID
			@@ -191,6 +198,8 @@
			public string HOriginator; //åèµ·äºº
			public string HTitle; //åæ®æ é¢

			public string HInstanceStatus; //å®ä¾ç¶æ
			public string HApprovedResult; //å®¡æ¹ç»æ

			//åæ®åå®¹
			public string HQuestionType; //é®é¢åç±»
			@@ -260,15 +269,26 @@
			public string HExplanation;// varchar(500) --ç»´ä¿®è¦æ±
			public string HInnerBillNo;// varchar(50) --åé¨åæ®å·
			public Int64 HMouldID;
			public Int64 HMouldMaintainRuleInterID;
			public Int64 HMaintainItemID;
			public Int64 HSupID;// int --ä¾åºåï¼Gy_Supplierï¼ addnew
			public string HRepairType;// varchar(10) --ç»´ä¿®ç±»åï¼åé¨ç»´ä¿®ï¼å§å¤ç»´ä¿®ï¼ addnew
			public string HNewModel;// varchar(100) --ç»´ä¿®åæ°è§æ ¼ addnew
			public Single HNewDesignLife;// money --æ°è®¾è®¡å¯¿å½
			public string HRemark;

			public string HPlanNo;
			public string HPlanInterID;
			public DateTime HRequestComDate;
			public double HRecentMainModule;
			public double HCumulativeModule;
			public double HProductionModule;
			public DateTime HRepairAccepDate;
			public string HMaintainLevID;



			//åæ®åå®¹
			public string HBillNo; //åæ®å·
			public string HDate; //æ¥æ
			public string HCheckLevel; //å®¡æ ¸ççº§
			public string HArea; //åºå
			@@ -324,6 +344,10 @@
			public Single HPlanTimes;// money --è®¡åç»´ä¿®å·¥æ¶
			public Single HTimes;// money --å®éç»´ä¿®å·¥æ¶
			public string HRemark2;//å¤æ³¨
			public string HRepairCategory;
			public string HUrgenLevel;
			public string HRepairer;
			public string HIsCapacityImpact;

			//åæ®åå®¹
			public string HDate; //æ¥æ
			@@ -502,8 +526,10 @@
			//OriginatorId = "12", //æ ¹æ®æµç¨åèµ·äººå·¥å·æ¥è¯¢ã

			//TaskId = "12", //ä»»å¡IDã
			CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01"?"2022-01-01":DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd"), //åå»ºæ¶é´èµ·å§å¼ã
			CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //åå»ºæ¶é´ç»æ¢å¼ã
			//CreateFromTimeGMT = DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"), //åå»ºæ¶é´èµ·å§å¼ã
			//CreateToTimeGMT = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd hh:mm:ss"), //åå»ºæ¶é´ç»æ¢å¼ã
			ModifiedFromTimeGMT = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"), //ä¿®æ¹æ¶é´èµ·å§å¼ã
			ModifiedToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //ä¿®æ¹æ¶é´ç»æ¢å¼ã

			PageSize = pageSize, //åé¡µå¤§å°ã
			PageNumber = pageNumber, //åé¡µé¡µç
			@@ -696,7 +722,6 @@
			}
			}
			#endregion

			#endregion

			#region æ°æ®åæ¥æ¹æ³
			@@ -749,32 +774,104 @@
			int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
			oItem.HTitle = startIndex + response.Body.Result[i].Title.Substring(startindex).Replace("\"}", "").Replace("'", "");

			if (keys.Contains("dateField_lo6w37hk"))
			//å®¡æ ¸ç¾å°è¡¨
			//if (keys.Contains("dateField_lo6w37hk"))
			//{
			// double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lo6w37hk"].ToString());
			// oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd");
			//}

			//if (keys.Contains("selectField_lockncvh_id"))
			//{
			// oItem.HArea = response.Body.Result[i].FormData["selectField_lockncvh_id"].ToString().Replace("'", "");
			//}

			//if (keys.Contains("selectField_lockncvg_id"))
			//{
			// oItem.HCheckLevel = response.Body.Result[i].FormData["selectField_lockncvg_id"].ToString().Replace("'", "");
			//}

			//if (keys.Contains("employeeField_lo6w37hf"))
			//{
			// oItem.HEmplpyee = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf"])[0].ToString().Replace("'","");
			//}

			//if (keys.Contains("employeeField_lo6w37hf_id"))
			//{
			// oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf_id"])[0].ToString().Replace("'", "");
			//}


			//ç¾å°è¡¨
			if (keys.Contains("dateField_ls9ma7h3"))
			{
			double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lo6w37hk"].ToString());
			double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_ls9ma7h3"].ToString());
			oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd");
			}

			if (keys.Contains("selectField_lockncvh_id"))
			if (keys.Contains("selectField_ls9ma7h9"))
			{
			oItem.HArea = response.Body.Result[i].FormData["selectField_lockncvh_id"].ToString().Replace("'", "");
			oItem.HArea = response.Body.Result[i].FormData["selectField_ls9ma7h9"].ToString().Replace("'", "");
			}

			if (keys.Contains("selectField_lockncvg_id"))
			if (keys.Contains("selectField_ls9ma7h7"))
			{
			oItem.HCheckLevel = response.Body.Result[i].FormData["selectField_lockncvg_id"].ToString().Replace("'", "");
			oItem.HCheckLevel = response.Body.Result[i].FormData["selectField_ls9ma7h7"].ToString().Replace("'", "");
			}

			if (keys.Contains("employeeField_lo6w37hf"))
			if (keys.Contains("employeeField_ls9ma7h5"))
			{
			oItem.HEmplpyee = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf"])[0].ToString().Replace("'","");
			oItem.HEmplpyee = ((List<object>)response.Body.Result[i].FormData["employeeField_ls9ma7h5"])[0].ToString().Replace("'", "");
			}

			if (keys.Contains("employeeField_lo6w37hf_id"))
			if (keys.Contains("employeeField_ls9ma7h5_id"))
			{
			oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf_id"])[0].ToString().Replace("'", "");
			oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_ls9ma7h5_id"])[0].ToString().Replace("'", "");
			}




			//è·åå®ä¾ç¶æ
			GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
			if (getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
			{
			return false;
			}

			oItem.HInstanceStatus = response1.Body.InstanceStatus;
			if (oItem.HInstanceStatus == "RUNNING")
			{
			oItem.HInstanceStatus = "è¿è¡ä¸";
			}
			else if (oItem.HInstanceStatus == "TERMINATED")
			{
			oItem.HInstanceStatus = "å·²ç»æ¢";
			}
			else if (oItem.HInstanceStatus == "COMPLETED")
			{
			oItem.HInstanceStatus = "å·²å®æ";
			}
			else if (oItem.HInstanceStatus == "ERROR")
			{
			oItem.HInstanceStatus = "å¼å¸¸";
			}

			oItem.HApprovedResult = response1.Body.ApprovedResult;
			if (oItem.HApprovedResult == "agree")
			{
			oItem.HApprovedResult = "åæ";
			}
			else if (oItem.HApprovedResult == "disagree")
			{
			oItem.HApprovedResult = "æç»";
			}
			else
			{
			oItem.HApprovedResult = "";
			}



			lsmain.Add(oItem);
			}catch(Exception e)
			{
			@@ -810,7 +907,8 @@
			string appType = "APP_MMBPP3IFGFBX3VQAIKYX";
			string systemToken = "TP866A81107FVI9LBFQRZ9953YWZ2GYR2W6OL1L";
			string userID = "1933673646699149";
			string formUuid = "FORM-IQ8666B17ZZE7NQSA01K3DUN78UI3J1Z2W6OLX";
			//string formUuid = "FORM-IQ8666B17ZZE7NQSA01K3DUN78UI3J1Z2W6OLX"; //åå±å®¡æ ¸ç¾å°è¡¨
			string formUuid = "FORM-A01FFB0B63A34F18B7753F695F49190DJEY7"; //ç¾å°è¡¨
			int pageNumber = 1;
			int pageSize = 100;

			@@ -830,7 +928,7 @@

			try
			{
			oCN.BeginTran();
			oCN.BeginTran();
			foreach (YD_FenCengShenHeQianDaoBiao oItem in lsmain)
			{
			string sql_searchRepeat = "select * from DD_FenCengShenHeQianDaoBiao where HInstanceID = '" + oItem.HInstanceID + "'";
			@@ -844,7 +942,8 @@
			string sql_main = "insert into DD_FenCengShenHeQianDaoBiao" +
			"(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle" +
			",HDate" +
			",HCheckLevel,HArea,HEmployeeID,HEmplpyee) " +
			",HCheckLevel,HArea,HEmployeeID,HEmplpyee" +
			",HInstanceStatus,HApprovedResult) " +
			"values(" +
			"'" + oItem.HMakerID + "'" +
			",'" + oItem.HMakeDate + "'" +
			@@ -860,6 +959,8 @@
			",'" + (oItem.HArea==null?"": oItem.HArea) + "'" +
			",'" + (oItem.HEmployeeID==null?"": oItem.HEmployeeID) + "'" +
			",'" + (oItem.HEmplpyee==null?"": oItem.HEmplpyee) + "'" +
			",'" + (oItem.HInstanceStatus == null ? "" : oItem.HInstanceStatus) + "'" +
			",'" + (oItem.HApprovedResult == null ? "" : oItem.HApprovedResult) + "'" +
			")";

			oCN.RunProc(sql_main);
			@@ -970,7 +1071,50 @@
			{
			oItem.HRiskRemak_Result = response.Body.Result[i].FormData["textareaField_lxblb9xa"].ToString().Replace("'", "");
			}



			//è·åå®ä¾ç¶æ
			GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
			if (getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
			{
			return false;
			}

			oItem.HInstanceStatus = response1.Body.InstanceStatus;
			if (oItem.HInstanceStatus == "RUNNING")
			{
			oItem.HInstanceStatus = "è¿è¡ä¸";
			}
			else if (oItem.HInstanceStatus == "TERMINATED")
			{
			oItem.HInstanceStatus = "å·²ç»æ¢";
			}
			else if (oItem.HInstanceStatus == "COMPLETED")
			{
			oItem.HInstanceStatus = "å·²å®æ";
			}
			else if (oItem.HInstanceStatus == "ERROR")
			{
			oItem.HInstanceStatus = "å¼å¸¸";
			}

			oItem.HApprovedResult = response1.Body.ApprovedResult;
			if (oItem.HApprovedResult == "agree")
			{
			oItem.HApprovedResult = "åæ";
			}
			else if (oItem.HApprovedResult == "disagree")
			{
			oItem.HApprovedResult = "æç»";
			}
			else
			{
			oItem.HApprovedResult = "";
			}




			lsmain.Add(oItem);
			}catch(Exception e)
			{
			@@ -1036,7 +1180,8 @@
			string sql_main = "insert into DD_XianChangBianHuaDianPingShenDan" +
			"(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle" +
			",HDate" +
			",HDept,HChangeType,HRiskLevel,HChangeContent,HRiskRemark_Safe,HRiskRemark_Study,HRiskRemark_Quality,HRiskRemark_Equipment,HRiskRemark_Product,HRiskRemark_Result) " +
			",HDept,HChangeType,HRiskLevel,HChangeContent,HRiskRemark_Safe,HRiskRemark_Study,HRiskRemark_Quality,HRiskRemark_Equipment,HRiskRemark_Product,HRiskRemark_Result" +
			",HInstanceStatus,HApprovedResult) " +
			"values(" +
			"'" + oItem.HMakerID + "'" +
			",'" + oItem.HMakeDate + "'" +
			@@ -1058,6 +1203,8 @@
			",'" + (oItem.HRiskRemark_Equipment==null?"": oItem.HRiskRemark_Equipment) + "'" +
			",'" + (oItem.HRiskRemark_Product==null?"": oItem.HRiskRemark_Product) + "'" +
			",'" + (oItem.HRiskRemak_Result==null?"": oItem.HRiskRemak_Result) + "'" +
			",'" + (oItem.HInstanceStatus == null ? "" : oItem.HInstanceStatus) + "'" +
			",'" + (oItem.HApprovedResult == null ? "" : oItem.HApprovedResult) + "'" +
			")";

			oCN.RunProc(sql_main);
			@@ -1199,6 +1346,43 @@
			oItem.HCloseConfirm = response.Body.Result[i].FormData["selectField_ltpe6mdd"].ToString().Replace("'", "");
			}

			//è·åå®ä¾ç¶æ
			GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
			if(getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
			{
			return false;
			}

			oItem.HInstanceStatus = response1.Body.InstanceStatus;
			if(oItem.HInstanceStatus == "RUNNING")
			{
			oItem.HInstanceStatus = "è¿è¡ä¸";
			}else if(oItem.HInstanceStatus== "TERMINATED")
			{
			oItem.HInstanceStatus = "å·²ç»æ¢";
			}
			else if (oItem.HInstanceStatus == "COMPLETED")
			{
			oItem.HInstanceStatus = "å·²å®æ";
			}
			else if (oItem.HInstanceStatus == "ERROR")
			{
			oItem.HInstanceStatus = "å¼å¸¸";
			}

			oItem.HApprovedResult = response1.Body.ApprovedResult;
			if (oItem.HApprovedResult== "agree")
			{
			oItem.HApprovedResult = "åæ";
			}else if(oItem.HApprovedResult== "disagree")
			{
			oItem.HApprovedResult = "æç»";
			}
			else
			{
			oItem.HApprovedResult = "";
			}

			lsmain.Add(oItem);
			}
			catch (Exception e)
			@@ -1268,7 +1452,7 @@
			",HCheckLevel,HCheckArea,HPhoto_NoSatisfyRequire,HDescription_NoSatisfyRequire,HQuestionType,HRequire_ModifyDate,HEmployeeID_Duty,HEmployee_Duty" +
			",HQuestionIsNoModify" +
			",HReason_NoModify,HReasonAnalysis,HMethod_Modify" +
			",HDate_Achieve,HFile_Evidence,HCloseConfirm" +
			",HDate_Achieve,HFile_Evidence,HCloseConfirm,HInstanceStatus,HApprovedResult" +
			") " +
			"values(" +
			"'" + oItem.HMakerID + "'" +
			@@ -1298,7 +1482,8 @@
			"," + (oItem.HDate_Achieve==null?"null":"'"+ oItem.HDate_Achieve+ "'") + "" +
			",'" + (oItem.HFile_Evidence==null?"": oItem.HFile_Evidence) + "'" +
			",'" + (oItem.HCloseConfirm==null?"": oItem.HCloseConfirm) + "'" +

			",'" + (oItem.HInstanceStatus==null?"":oItem.HInstanceStatus) + "'" +
			",'" + (oItem.HApprovedResult==null?"":oItem.HApprovedResult) + "'" +
			")";

			oCN.RunProc(sql_main);
			@@ -1374,7 +1559,46 @@
			oItem.HDept_Duty = response.Body.Result[i].FormData["selectField_lxcunmsu"].ToString().Replace("'", "");
			}


			//è·åå®ä¾ç¶æ
			GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
			if (getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref response1, ref msg) == false)
			{
			return false;
			}

			oItem.HInstanceStatus = response1.Body.InstanceStatus;
			if (oItem.HInstanceStatus == "RUNNING")
			{
			oItem.HInstanceStatus = "è¿è¡ä¸";
			}
			else if (oItem.HInstanceStatus == "TERMINATED")
			{
			oItem.HInstanceStatus = "å·²ç»æ¢";
			}
			else if (oItem.HInstanceStatus == "COMPLETED")
			{
			oItem.HInstanceStatus = "å·²å®æ";
			}
			else if (oItem.HInstanceStatus == "ERROR")
			{
			oItem.HInstanceStatus = "å¼å¸¸";
			}

			oItem.HApprovedResult = response1.Body.ApprovedResult;
			if (oItem.HApprovedResult == "agree")
			{
			oItem.HApprovedResult = "åæ";
			}
			else if (oItem.HApprovedResult == "disagree")
			{
			oItem.HApprovedResult = "æç»";
			}
			else
			{
			oItem.HApprovedResult = "";
			}



			List<YD_QRQCWenTiTiJiaoBiaoSub1> sub1List = new List<YD_QRQCWenTiTiJiaoBiaoSub1>();
			if (keys_main.Contains("tableField_lx4azand"))
			@@ -1517,6 +1741,12 @@
			oCN.BeginTran();
			foreach (YD_QRQCWenTiTiJiaoBiao oItem in lsmain)
			{
			////å¤æåæ® å®ä¾ç¶ææ¯å¦ä¸º"å·²å®æ"ä¸ å®¡æ¹ç»æä¸º"åæ",è¥æ¯ååæ¥æ°æ®ï¼å¦åä¸è¿è¡åæ¥æ°æ®
			//if (!(oItem.HInstanceStatus == "å·²å®æ" && oItem.HApprovedResult == "åæ"))
			//{
			// continue;
			//}

			string sql_searchRepeat = "select * from DD_QRQCWenTiTiJiaoBiao where HInstanceID = '" + oItem.HInstanceID + "'";
			DataSet ds_searchRepeat = oCN.RunProcReturn(sql_searchRepeat, "DD_QRQCWenTiTiJiaoBiao");
			if (ds_searchRepeat != null && ds_searchRepeat.Tables[0].Rows.Count > 0)
			@@ -1532,7 +1762,8 @@
			}

			string sql_main = "insert into DD_QRQCWenTiTiJiaoBiao" +
			"(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle,HQuestionType,HDept_Duty) " +
			"(HMakerID,HMakeDate,HUpdaterID,HUpdater,HUpdateDate,HInstanceID,HOriginator,HTitle,HQuestionType,HDept_Duty" +
			",HInstanceStatus,HApprovedResult) " +
			"values(" +
			"'" + oItem.HMakerID + "'" +
			",'" + oItem.HMakeDate + "'" +
			@@ -1545,6 +1776,8 @@

			",'" + (oItem.HQuestionType==null?"": oItem.HQuestionType) + "'" +
			",'" + (oItem.HDept_Duty==null?"": oItem.HDept_Duty) + "'" +
			",'" + (oItem.HInstanceStatus == null ? "" : oItem.HInstanceStatus) + "'" +
			",'" + (oItem.HApprovedResult == null ? "" : oItem.HApprovedResult) + "'" +
			")";
			oCN.RunProc(sql_main);

			@@ -1841,7 +2074,38 @@

			if (getInstanceByIdResponse.Body.InstanceStatus != "COMPLETED")
			{
			continue;
			//continue;
			}

			//å¼åæ¥æ
			if (keys.Contains("dateField_lq0v65sv"))
			{
			double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq0v65sv"].ToString());
			oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm");
			}

			//æ¨¡å·ä¿å»çº§å«
			if (keys.Contains("selectField_m1ip9j31"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["selectField_m1ip9j31"].ToString();
			if (!HDate_Temp.Contains("ä¸çº§"))
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_MaintainLev where ä¿å»çº§å«ä»£ç ='BY-SE-002'", "h_v_Gy_MaintainLev");
			if (ds.Tables[0].Rows.Count > 0)
			{
			HDate_Temp = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			}
			else if (HDate_Temp.Contains("ä¸çº§"))
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_MaintainLev where ä¿å»çº§å«ä»£ç ='BY-SE-003'", "h_v_Gy_MaintainLev");
			if (ds.Tables[0].Rows.Count > 0)
			{
			HDate_Temp = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			}

			oItem.HMaintainLevID = HDate_Temp;
			}

			//ä¿®æ¨¡å¼å§æ¶é´
			@@ -1858,17 +2122,52 @@
			oItem.HRepairEndDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm"));
			}

			//æ¨¡å·æ¹æ¬¡å·
			//æ¨¡å·åæ®å·
			if (keys.Contains("serialNumberField_lqaak4ts"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["serialNumberField_lqaak4ts"].ToString();
			oItem.HRemark = HDate_Temp;
			oItem.HBillNo = HDate_Temp;
			}

			//æ¨¡å·ç¼ç
			if (keys.Contains("dateField_lq4gf2ii"))
			//è¦æ±å®ææ¥æ
			if (keys.Contains("dateField_lq3idkvd"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["dateField_lq4gf2ii"].ToString();
			double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq3idkvd"].ToString());
			oItem.HRequestComDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm:ss"));
			}

			//ç»´ä¿®åçæ¥æ
			if (keys.Contains("dateField_lq4gf2ih"))
			{
			double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq4gf2ih"].ToString());
			oItem.HRepairAccepDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm:ss"));
			}

			//æè¿ä¿å»æ¨¡æ°
			if (keys.Contains("numberField_lq3idkvi"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3idkvi"].ToString();
			oItem.HRecentMainModule = double.Parse(HDate_Temp);
			}

			//ç´¯è®¡æ¨¡æ°
			if (keys.Contains("numberField_lq3idkvj"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3idkvj"].ToString();
			oItem.HCumulativeModule = double.Parse(HDate_Temp);
			}

			//æ¬æ¬¡çäº§æ¨¡æ°
			if (keys.Contains("textField_lq4vdvgh"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["textField_lq4vdvgh"].ToString();
			oItem.HProductionModule = double.Parse(HDate_Temp);
			}

			//æ¨¡å·ç¼ç
			if (keys.Contains("selectField_lq3idkvg"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["selectField_lq3idkvg"].ToString();
			DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HNumber='" + HDate_Temp + "'", "Gy_MouldFileMain");
			string HMouldID = "0";
			if (ds.Tables[0].Rows.Count > 0)
			@@ -1876,6 +2175,18 @@
			HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
			}
			oItem.HMouldID = long.Parse(HMouldID);
			oItem.HRemark = HDate_Temp;


			//æ¥è¯¢ä¿å»è®¡å
			ds = oCN.RunProcReturn(@"select a.HInterID,a.HBillNo from Sc_MouldMaintainPlanBillMain a
			inner join Sc_MouldMaintainPlanBillSub b on a.HInterID = b.HInterID
			where a.HMouldID =" + oItem.HMouldID + " and a.HMaintainLevID = " + oItem.HMaintainLevID, "Sc_MouldMaintainPlanBillMain");

			if (ds.Tables[0].Rows.Count > 0) {
			oItem.HPlanInterID = ds.Tables[0].Rows[0]["HInterID"].ToString();
			oItem.HPlanNo = ds.Tables[0].Rows[0]["HInterID"].ToString();
			}
			}


			@@ -1899,7 +2210,7 @@
			if (keys.Contains("employeeField_lq3idkvh"))
			{
			string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lq3idkvh"]));
			DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HNumber='" + HDate_Temp[0] + "'", "Gy_Employee");
			DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where hname='" + HDate_Temp[0] + "'", "Gy_Employee");
			string HEmpID = "0";
			if (ds.Tables[0].Rows.Count > 0)
			{
			@@ -2016,6 +2327,7 @@
			}
			catch (Exception e)
			{
			LogService.Write(e.Message);
			msg = e.Message;
			return false;
			}
			@@ -2051,11 +2363,33 @@
			try
			{
			oCN.BeginTran();

			string HMouldMaintainRuleInterID = "0";
			string HMaintainItemID = "0";
			string HRepairID = "0";
			DataSet dataSet = oCN.RunProcReturn(@"select a.HInterID,item.HMaintainItemID from Sc_MouldMaintainRuleBillMain a with(nolock)
			inner join Sc_MouldMaintainRuleBillSub_Item item with(nolock) on a.HInterID = item.HInterID
			where a.HRemark like'%ééåæ¥%'", "Sc_MouldMaintainRuleBillMain");

			if (dataSet.Tables[0].Rows.Count > 0)
			{
			HMouldMaintainRuleInterID = dataSet.Tables[0].Rows[0]["HInterID"].ToString();
			HMaintainItemID = dataSet.Tables[0].Rows[0]["HMaintainItemID"].ToString();
			}

			dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Repair a with(nolock) where a.HRemark like'%ééåæ¥%' and HName like'%æ¨¡å·ç»´ä¿®%'", "Gy_Repair");

			if (dataSet.Tables[0].Rows.Count > 0)
			{
			HRepairID = dataSet.Tables[0].Rows[0]["HItemID"].ToString();
			}

			foreach (MouldFileWeiXiuBaoYang oItem in lsmain)
			{
			//ä¿å»è®°å½
			if (oItem.DetailColMouldMaintain.Count != 0)
			{

			string BillType = "3819";
			string sql = $@"select HInnerBillNo from Sc_MouldMaintainBillMain
			where HInnerBillNo = '{oItem.HInstanceID}'";
			@@ -2064,7 +2398,7 @@
			if (ds.Tables[0].Rows.Count == 0)
			{
			long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
			string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
			//string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
			//long HInterID = 0;
			//string HBillNo = "";
			string sql_main = "Insert Into Sc_MouldMaintainBillMain " +
			@@ -2073,11 +2407,16 @@
			",HPlanNo,HPlanInterID,HMouldID,HBeginDate" +
			",HEndDate" +
			",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HMaintainLevID,HLastResult" +
			")values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate(),'" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
			",HRequestComDate,HRecentMainModule,HCumulativeModule,HProductionModule" +
			",HPlanInterID,HPlanNo,HMaintainLevID)" +
			"values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + oItem.HBillNo + "','"+ oItem.HDate + "','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
			",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','"+ oItem.HRemark + "','" + oItem.HUpdateDate + "'" +
			",'','0','" + oItem.HMouldID + "','" + oItem.HRepairBeginDate + "'" +
			",'" + oItem.HRepairEndDate + "'" +
			",'" + oItem.HInstanceID + "','',0,0,'OK')";
			",'" + oItem.HInstanceID + "','',"+ HMouldMaintainRuleInterID + ",0,'OK'" +
			",'"+ oItem.HRequestComDate + "'," + oItem.HRecentMainModule + "," + oItem.HCumulativeModule + "," + oItem.HProductionModule + "" +
			"," + oItem.HPlanInterID + "," + oItem.HPlanNo + "," + oItem.HMaintainLevID + ")";
			LogService.Write(sql_main);
			oCN.RunProc(sql_main);
			int i = 1;
			foreach (Sc_MouldMaintainBillSub oItem_Detail in oItem.DetailColMouldMaintain)
			@@ -2088,11 +2427,13 @@
			",HManagerID" +
			",HCloseMan,HCloseType,HRemark" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaintainResult" +
			") values('" + HInterID + "'," + i + ",0,'" + oItem_Detail.HClaim + "'" +
			") " +
			"values('" + HInterID + "'," + i + ","+ HMaintainItemID + ",'" + oItem_Detail.HClaim + "'" +
			",'','" + oItem_Detail.HClaim + "'" +
			",'" + oItem.HEmpID + "'" +
			",'','','" + oItem_Detail.HMaintainResult + "'" +
			",'0','0','','',0,0,'')";
			",'0','0','','',0,0,'Y')";
			LogService.Write(sql_sub);
			oCN.RunProc(sql_sub);
			i += 1;
			}
			@@ -2111,7 +2452,7 @@
			if (ds.Tables[0].Rows.Count == 0)
			{
			long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
			string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
			//string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
			//long HInterID = 0;
			//string HBillNo = "";
			string sql_main = "Insert Into Sc_MouldRepairWorkBillMain " +
			@@ -2121,13 +2462,15 @@
			",HCycleUnit,HPlanTimes,HTimes,HEmpID,HManagerID" +
			",HDeptID,HExplanation,HInnerBillNo,HMouldID" +
			",HSupID,HRepairType,HNewModel,HNewDesignLife,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
			")values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate()" +
			",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
			",'0','0','" + oItem.HRepairBeginDate + "','" + oItem.HUpdateDate + "',''" +
			",HRepairAccepDate)values" +
			"('" + BillType + "','" + BillType + "'," + HInterID + ",'" + oItem.HBillNo + "','"+ oItem .HDate+ "'" +
			",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','"+ oItem.HRemark + "','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
			",'0','"+ HRepairID + "','" + oItem.HRepairBeginDate + "','" + oItem.HRepairEndDate + "',''" +
			",'å°æ¶','" + oItem.HPlanTimes + "','" + oItem.HTimes + "','" + oItem.HEmpID + "',0" +
			",'" + oItem.HDeptID + "','','" + oItem.HInstanceID + "','" + oItem.HMouldID + "'" +
			",'0','åé¨ç»´ä¿®','','" + oItem.HNewDesignLife + "','',0,0)";

			",'0','åé¨ç»´ä¿®','','" + oItem.HNewDesignLife + "','1',0,0" +
			",'"+ oItem.HRepairAccepDate + "')";
			LogService.Write(sql_main);
			oCN.RunProc(sql_main);
			int i = 1;
			foreach (Sc_MouldRepairWorkBillSub oItem_Detail in oItem.DetailColMouldRepair)
			@@ -2138,7 +2481,8 @@
			",HRepairID,HRepairExplanation,HManagerID,HMoney) values" +
			"('" + HInterID + "'," + i + ",'','','','" + oItem_Detail.HRemark + "'" +
			",0,0,'','',0,0" +
			",0,'" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "',0)";
			","+ HRepairID + ",'" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "',0)";
			LogService.Write(sql_sub);
			oCN.RunProc(sql_sub);
			i += 1;
			}
			@@ -2153,6 +2497,7 @@
			}
			catch (Exception e)
			{
			LogService.Write(e.Message);
			msg = e.Message;
			oCN.RollBack();
			return false;
			@@ -2165,7 +2510,7 @@
			#region è·å å®æ-è®¾å¤ç»´ä¿®è®°å½å å®ä¾IDåè¡¨å¯¹åºçå®ä¾è¯¦æ
			public bool getInstanceDetailList___EquipRepairWeiXiu_YiDa(string appType, string systemToken, string userID, string formUuid, List<string> IDList, ref List<EquipRepairWeiXiu> lsmain, ref string msg, int size = 500)
			{

			string a = "";
			try
			{
			int startIndex = 0;
			@@ -2217,20 +2562,27 @@
			continue;
			}

			if (oItem.HInstanceID != "9b6e108c-b7bf-45e4-910d-5629ac30d4aa") {
			continue;
			}

			//è®¾å¤ç¼ç
			if (keys.Contains("textField_lfg9hgys"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["textField_lfg9hgys"].ToString();
			DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HNumber='" + HDate_Temp + "'", "Gy_MouldFileMain");
			DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain with(nolock) where HEquipFileNo='" + HDate_Temp + "'", "Gy_EquipFileBillMain");
			string HEquipID = "0";
			if (ds.Tables[0].Rows.Count > 0)
			{
			HEquipID = ds.Tables[0].Rows[0]["HInterID"].ToString();
			oItem.HEquipID = long.Parse(HEquipID);
			oItem.HRemark2 = HDate_Temp;
			}
			oItem.HEquipID = long.Parse(HEquipID);
			oItem.HRemark2 = HDate_Temp;
			else
			{
			continue;
			}
			}


			//ç»´ä¿®é¨é¨
			if (keys.Contains("selectField_kzgkw10a"))
			@@ -2241,31 +2593,31 @@
			if (ds.Tables[0].Rows.Count > 0)
			{
			HDeptID = ds.Tables[0].Rows[0]["HItemID"].ToString();
			oItem.HDeptID = long.Parse(HDeptID);
			}
			oItem.HDeptID = long.Parse(HDeptID);
			}
			else
			{
			continue;
			}

			}

			//ç»´ä¿®äºº
			if (keys.Contains("employeeField_lthwkdh2"))
			{
			string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lthwkdh2"]));
			DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HNumber='" + HDate_Temp[0] + "'", "Gy_Employee");
			DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HName='" + HDate_Temp[0] + "'", "Gy_Employee");
			string HEmpID = "0";
			if (ds.Tables[0].Rows.Count > 0)
			{
			HEmpID = ds.Tables[0].Rows[0]["HItemID"].ToString();
			oItem.HEmpID = long.Parse(HEmpID);
			}
			oItem.HEmpID = long.Parse(HEmpID);
			}
			else
			{
			continue;
			}

			//ç»´ä¿®æ¶é´
			if (keys.Contains("textField_l2r95oo2"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["textField_l2r95oo2"].ToString();

			oItem.HTimes = long.Parse(HDate_Temp);
			oItem.HPlanTimes = long.Parse(HDate_Temp);
			}

			//ç»´ä¿®åå®¹
			@@ -2276,6 +2628,53 @@
			oItem.HRepairContent = HDate_Temp;
			}

			//æ¥ä¿®ç±»å«
			if (keys.Contains("multiSelectField_lfg9hgyv"))
			{
			string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["multiSelectField_lfg9hgyv"]));

			oItem.HRepairCategory = HDate_Temp[0];
			}

			//ç´§æ¥ç¨åº¦
			if (keys.Contains("radioField_kzgkw10c"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["radioField_kzgkw10c"].ToString();

			oItem.HUrgenLevel = HDate_Temp;
			}

			//æ¥ä¿®äºº
			if (keys.Contains("employeeField_lkasesrk"))
			{
			string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lkasesrk"]));

			oItem.HRepairer = HDate_Temp[0];
			}

			//æ¯å¦æäº§è½å½±å
			if (keys.Contains("textField_lyjddw0r"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["textField_lyjddw0r"].ToString();

			oItem.HIsCapacityImpact = HDate_Temp;
			}

			//ç»´ä¿®æ¶é´
			if (keys.Contains("textField_l2r95oo2"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["textField_l2r95oo2"].ToString();
			bool containsNumber = HDate_Temp.Any(c => char.IsDigit(c));

			if (!containsNumber)
			{
			HDate_Temp = "0";
			}
			//LogService.Write("1:------"+HDate_Temp+ ",2:------" + int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray())));
			//a = HDate_Temp;
			oItem.HTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
			oItem.HPlanTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
			}

			//åè¡¨ ç»´ä¿®è¦æ± ç»´ä¿®å¤æ³¨(é®é¢æè¿°)

			@@ -2285,7 +2684,7 @@
			if (keys.Contains("textareaField_lthwo99r"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["textareaField_lthwo99r"].ToString();

			oItem.HExplanation = HDate_Temp;
			sub.HRepairExplanation = HDate_Temp;
			}

			@@ -2331,6 +2730,8 @@
			}
			catch (Exception e)
			{
			LogService.Write(e.Message);
			a = "";
			continue;
			}
			}
			@@ -2366,7 +2767,7 @@
			int pageNumber = 1;
			int pageSize = 100;

			//è·åæ¨¡å·ç»´ä¿®ä¿å»è¡¨çå®ä¾IDåè¡¨
			//è·åè®¾å¤ç»´ä¿®ä¿å»è¡¨çå®ä¾IDåè¡¨
			List<string> IDList = new List<string>();
			if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
			{
			@@ -2383,6 +2784,14 @@
			try
			{
			oCN.BeginTran();

			DataSet dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Repair a with(nolock) where a.HRemark like'%ééåæ¥%' and HName like'%è®¾å¤ç»´ä¿®%'", "Gy_Repair");
			string HRepairID = "0";
			if (dataSet.Tables[0].Rows.Count > 0)
			{
			HRepairID = dataSet.Tables[0].Rows[0]["HItemID"].ToString();
			}

			foreach (EquipRepairWeiXiu oItem in lsmain)
			{
			//ç»´ä¿®è®°å½
			@@ -2405,12 +2814,14 @@
			",HEquipID,HRepairID,HPlanTimes,HEmpID,HManagerID,HTimes" +
			",HDeptID,HExplanation,HInnerBillNo,HRepairBeginDate,HRepairEndDate" +
			",HRepairContent,HCycleUnit,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
			")values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate()" +
			",HRepairCategory,HUrgenLevel,HRepairer,HIsCapacityImpact)" +
			"values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate()" +
			",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','"+ oItem.HRemark2 + "','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
			",'" + oItem.HEquipID + "','0','" + oItem.HTimes + "','" + oItem.HEmpID + "','" + oItem.HEmpID + "','" + oItem.HTimes + "'" +
			",'" + oItem.HDeptID + "','" + oItem.HExplanation + "','" + oItem.HInstanceID + "','',''" +
			",'" + oItem.HRepairContent + "','å°æ¶','','0',0)";

			",'" + oItem.HEquipID + "','"+ HRepairID + "','" + oItem.HTimes + "','" + oItem.HEmpID + "','" + oItem.HEmpID + "','" + oItem.HTimes + "'" +
			",'" + oItem.HDeptID + "','"+ oItem.HExplanation + "','" + oItem.HInstanceID + "','"+ oItem.HMakeDate + "','" + oItem.HUpdateDate + "'" +
			",'" + oItem.HRepairContent + "','å°æ¶','æå·¥å½å¥','0',0" +
			",'"+ oItem.HRepairCategory + "','" + oItem.HUrgenLevel + "','" + oItem.HRepairer + "','" + oItem.HIsCapacityImpact + "')";
			LogService.Write(sql_main);
			oCN.RunProc(sql_main);
			int i = 1;
			foreach (Sc_MouldRepairWorkBillSub oItem_Detail in oItem.DetailColMouldRepair)
			@@ -2421,7 +2832,8 @@
			",HRepairID,HManagerID,HRepairExplanation,HEmpID)" +
			"values('" + HInterID + "'," + i + ",'','','','" + oItem_Detail.HRemark + "'" +
			",0,0,'','',0,0" +
			",0,'" + oItem.HEmpID + "','" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "')";
			"," + HRepairID + ",'" + oItem.HEmpID + "','" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "')";
			LogService.Write(sql_sub);
			oCN.RunProc(sql_sub);
			i += 1;
			}
			@@ -2436,6 +2848,7 @@
			}
			catch (Exception e)
			{
			LogService.Write(e.Message);
			msg = e.Message;
			oCN.RollBack();
			return false;