MES-WEB-API.git

			@@ -536,25 +536,29 @@
			#region è·å éé-æºè½äººäº è·åå¨èåå·¥IDåè¡¨
			public bool getEmployeeIDList_DingDing(long offset, long size, ref List<string> IDList, ref string msg)
			{
			LogService.Write("æ¥ç5-1-1");
			OapiSmartworkHrmEmployeeQueryonjobResponse response = new OapiSmartworkHrmEmployeeQueryonjobResponse();
			do
			{
			if (getEmployeeIDList_Page_DingDing(offset, size, ref response, ref msg) == false)
			{
			LogService.Write("æ¥ç5-1-2");
			return false;
			}

			LogService.Write("æ¥ç5-1-3");
			for (int i = 0; i < response.Result.DataList.Count; i++)
			{
			IDList.Add(response.Result.DataList[i]);
			}

			LogService.Write("æ¥ç5-1-4");
			if (response.Result.NextCursor != 0)
			{
			LogService.Write("æ¥ç5-1-4-1");
			offset = response.Result.NextCursor;
			}
			else
			{
			LogService.Write("æ¥ç5-1-5");
			break;
			}
			} while (true);
			@@ -1098,6 +1102,7 @@
			lsmain.Add(oItem);
			}catch(Exception e)
			{
			LogService.Write("æ¥ç1" + e.Message);
			continue;
			}
			}
			@@ -1134,7 +1139,7 @@
			string formUuid = "FORM-A01FFB0B63A34F18B7753F695F49190DJEY7"; //ç¾å°è¡¨
			int pageNumber = 1;
			int pageSize = 100;

			LogService.Write("æ¥ç1");
			//è·ååå±å®¡æ ¸è¡¨çå®ä¾IDåè¡¨
			List<string> IDList = new List<string>();
			if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
			@@ -1341,6 +1346,7 @@
			lsmain.Add(oItem);
			}catch(Exception e)
			{
			LogService.Write("æ¥ç2"+e.Message);
			continue;
			}
			}
			@@ -1372,7 +1378,7 @@
			string formUuid = "FORM-E3DFC12364514330A836DD3056C15668UGG7";
			int pageNumber = 1;
			int pageSize = 100;

			LogService.Write("æ¥ç2");
			//è·åå®ä¾IDåè¡¨
			List<string> IDList = new List<string>();
			if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
			@@ -1610,6 +1616,7 @@
			}
			catch (Exception e)
			{
			LogService.Write("æ¥ç3"+e.Message);
			continue;
			}
			}
			@@ -1641,7 +1648,7 @@
			string formUuid = "FORM-K5766HA1CKZB4E1L64Y1KBWCJTQF2HWJ3NDJL4";
			int pageNumber = 1;
			int pageSize = 100;

			LogService.Write("æ¥ç3");
			//è·åå®ä¾IDåè¡¨
			List<string> IDList = new List<string>();
			if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
			@@ -1913,6 +1920,7 @@
			}
			catch (Exception e)
			{
			LogService.Write("æ¥ç4"+e.Message);
			continue;
			}
			}
			@@ -1944,7 +1952,7 @@
			string formUuid = "FORM-65AD77453E7F44EA847166C3AB5A1F04IPSS";
			int pageNumber = 1;
			int pageSize = 100;

			LogService.Write("æ¥ç4");
			//è·åå®ä¾IDåè¡¨
			List<string> IDList = new List<string>();
			if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
			@@ -2158,6 +2166,7 @@
			}
			catch (Exception e)
			{
			LogService.Write("æ¥ç5"+e.Message);
			continue;
			}
			}
			@@ -2189,14 +2198,16 @@
			{
			long offset = 0;
			long size = 50;

			LogService.Write("æ¥ç5");
			LogService.Write("æ¥ç5.1");
			//è·åè±ååèåIDåè¡¨
			List<string> IDList = new List<string>();
			if (getEmployeeIDList_DingDing(offset, size, ref IDList, ref msg) == false)
			{
			LogService.Write("æ¥ç5-1"+ msg);
			return false;
			}

			LogService.Write("æ¥ç5-2");
			//è·åè¯¦ç»ä¿¡æ¯å¹¶éå å°åè¡¨lsmainä¸
			List<DD_HuaMingCe> lsmain = new List<DD_HuaMingCe>();
			if (getEmployeeDetailList_HuaMingCe__DingDing(IDList, ref lsmain, ref msg) == false)
			@@ -2205,6 +2216,7 @@
			}
			try
			{
			LogService.Write("æ¥ç5-3");
			oCN.BeginTran();
			foreach (DD_HuaMingCe oItem in lsmain)
			{
			@@ -2229,12 +2241,14 @@

			oCN.RunProc(sql_main);
			}
			LogService.Write("æ¥ç5-4");
			oCN.Commit();
			return true;
			}
			catch (Exception e)
			{
			msg = e.Message;
			LogService.Write("æ¥ç5æ¥é:" + e.Message);
			oCN.RollBack();
			return false;
			}
			@@ -2294,11 +2308,88 @@
			{
			continue;
			}
			string HStaus = "";

			switch (getInstanceByIdResponse.Body.InstanceStatus)
			{
			case "COMPLETED":
			HStaus = "ç»´ä¿®ç»æ";
			break;
			case "RUNNING":
			HStaus = "ç»´ä¿®è¿è¡ä¸";
			break;
			case "TERMINATED":
			HStaus = "ç»´ä¿®ç»æ¢";
			break;
			}

			LogService.Write("ç¶æ:" + HStaus);

			if (getInstanceByIdResponse.Body.InstanceStatus != "COMPLETED")
			{
			//æ¨¡å·ç¼ç
			if (keys.Contains("selectField_lq3idkvg"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["selectField_lq3idkvg"].ToString();
			LogService.Write("æ¨¡å·:" + HDate_Temp);
			DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HMouldNo='" + HDate_Temp + "'", "Gy_MouldFileMain");
			string HMouldID = "0";
			if (ds.Tables[0].Rows.Count > 0)
			{
			LogService.Write("æµè¯1:" + ds.Tables[0].Rows[0]["HCloseDate"].ToString());
			string HUpdateDate = ds.Tables[0].Rows[0]["HCloseDate"].ToString() == "" ? "1900-01-01 00:00:00" : ds.Tables[0].Rows[0]["HCloseDate"].ToString();
			string HMouldStaus = ds.Tables[0].Rows[0]["HMouldStatus"].ToString();
			LogService.Write("æ¨¡å·:" + HDate_Temp + ",ç¶æ:" + HMouldStaus + ",æ¶é´:" + HUpdateDate);
			HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
			if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate)) {
			//ä¿®æ¹æ¨¡å·çç¶æåæ¶é´
			oCN.RunProc("update Gy_MouldFileMain set HMouldStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
			}
			}
			}

			continue;
			}

			//æ¨¡å·ç¼ç
			if (keys.Contains("selectField_lq3idkvg"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["selectField_lq3idkvg"].ToString();
			LogService.Write("æ¨¡å·:" + HDate_Temp);
			DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HMouldNo='" + HDate_Temp + "'", "Gy_MouldFileMain");
			string HMouldID = "0";
			if (ds.Tables[0].Rows.Count > 0)
			{
			LogService.Write("æµè¯2:" + ds.Tables[0].Rows[0]["HCloseDate"].ToString());
			HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
			string HUpdateDate = ds.Tables[0].Rows[0]["HCloseDate"].ToString() == "" ? "1900-01-01 00:00:00" : ds.Tables[0].Rows[0]["HCloseDate"].ToString();

			string HMouldStaus = ds.Tables[0].Rows[0]["HMouldStatus"].ToString();

			LogService.Write("æ¨¡å·:" + HDate_Temp+ ",ç¶æ:" + HMouldStaus + ",æ¶é´:" + HUpdateDate);
			if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate))
			{
			//ä¿®æ¹æ¨¡å·çç¶æåæ¶é´
			oCN.RunProc("update Gy_MouldFileMain set HMouldStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
			}
			}
			oItem.HMouldID = long.Parse(HMouldID);
			oItem.HRemark = HDate_Temp;
			//LogService.Write("æµè¯3:" + HMouldID);

			//æ¥è¯¢ä¿å»è®¡å
			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+ " order by a.HMakeDate desc", "Sc_MouldMaintainPlanBillMain");
			//LogService.Write("æµè¯4:");
			oItem.HPlanInterID = "";
			if (ds.Tables[0].Rows.Count > 0)
			{
			oItem.HPlanInterID = ds.Tables[0].Rows[0]["HInterID"].ToString();
			oItem.HPlanNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
			}
			}
			LogService.Write("æ¨¡å·ç¼ç :" + oItem.HMouldID);

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

			//æ¨¡å·ä¿å»çº§å«
			if (keys.Contains("selectField_m1ip9j31"))
			@@ -2330,6 +2422,7 @@

			oItem.HMaintainLevID = HDate_Temp;
			}
			LogService.Write("æ¨¡å·ä¿å»çº§å«:" + oItem.HMaintainLevID);

			//ä¿®æ¨¡å¼å§æ¶é´
			if (keys.Contains("dateField_lq4gf2ih"))
			@@ -2337,6 +2430,7 @@
			double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq4gf2ih"].ToString());
			oItem.HRepairBeginDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm"));
			}
			LogService.Write("ä¿®æ¨¡å¼å§æ¶é´:" + oItem.HRepairBeginDate);

			//ä¿®æ¨¡ç»ææ¶é´
			if (keys.Contains("dateField_lq4gf2ii"))
			@@ -2344,6 +2438,7 @@
			double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq4gf2ii"].ToString());
			oItem.HRepairEndDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm"));
			}
			LogService.Write("ä¿®æ¨¡ç»ææ¶é´:" + oItem.HRepairEndDate);

			//æ¨¡å·åæ®å·
			if (keys.Contains("serialNumberField_lqaak4ts"))
			@@ -2351,6 +2446,7 @@
			string HDate_Temp = response.Body.Result[i].FormData["serialNumberField_lqaak4ts"].ToString();
			oItem.HBillNo = HDate_Temp;
			}
			LogService.Write("æ¨¡å·åæ®å·:" + oItem.HBillNo);

			//è¦æ±å®ææ¥æ
			if (keys.Contains("dateField_lq3idkvd"))
			@@ -2358,6 +2454,7 @@
			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"));
			}
			LogService.Write("è¦æ±å®ææ¥æ:" + oItem.HRequestComDate);

			//ç»´ä¿®åçæ¥æ
			if (keys.Contains("dateField_lq4gf2ih"))
			@@ -2365,6 +2462,7 @@
			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"));
			}
			LogService.Write("ç»´ä¿®åçæ¥æ:" + oItem.HRepairAccepDate);

			//æè¿ä¿å»æ¨¡æ°
			if (keys.Contains("numberField_lq3idkvi"))
			@@ -2372,6 +2470,7 @@
			string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3idkvi"].ToString();
			oItem.HRecentMainModule = double.Parse(HDate_Temp);
			}
			LogService.Write("æè¿ä¿å»æ¨¡æ°:" + oItem.HRecentMainModule);

			//ç´¯è®¡æ¨¡æ°
			if (keys.Contains("numberField_lq3idkvj"))
			@@ -2379,6 +2478,7 @@
			string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3idkvj"].ToString();
			oItem.HCumulativeModule = double.Parse(HDate_Temp);
			}
			LogService.Write("ç´¯è®¡æ¨¡æ°:" + oItem.HCumulativeModule);

			//æ¬æ¬¡çäº§æ¨¡æ°
			if (keys.Contains("textField_lq4vdvgh"))
			@@ -2386,32 +2486,7 @@
			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 HMouldNo='" + HDate_Temp + "'", "Gy_MouldFileMain");
			string HMouldID = "0";
			if (ds.Tables[0].Rows.Count > 0)
			{
			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");
			oItem.HPlanInterID = "";
			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();
			}
			}

			LogService.Write("ç´¯è®¡æ¨¡æ°:" + oItem.HProductionModule);

			//ç»´ä¿®é¨é¨
			if (keys.Contains("selectField_lq3idkva"))
			@@ -2425,6 +2500,7 @@
			}
			oItem.HDeptID = long.Parse(HDeptID);
			}
			LogService.Write("ç»´ä¿®é¨é¨:" + oItem.HDeptID);

			//æ°è®¾è®¡å¯¿å½
			oItem.HNewDesignLife = 30000;
			@@ -2441,6 +2517,7 @@
			}
			oItem.HEmpID = long.Parse(HEmpID);
			}
			LogService.Write("ç»´ä¿®äºº:" + oItem.HEmpID);

			//ç»´ä¿®æ¶é´
			if (keys.Contains("numberField_lq3ixr9j"))
			@@ -2450,6 +2527,7 @@
			oItem.HTimes = long.Parse(HDate_Temp);
			oItem.HPlanTimes = long.Parse(HDate_Temp);
			}
			LogService.Write("ç»´ä¿®æ¶é´:" + oItem.HTimes);

			//åè¡¨ ç»´ä¿®è¦æ± ç»´ä¿®å¤æ³¨(é®é¢æè¿°)
			if (keys.Contains("tableField_lq3ixr9b"))
			@@ -2466,15 +2544,19 @@
			{
			oItemSub.HRepairExplanation = dic[ij]["textareaField_lq3ixr9e"].ToString();
			}
			LogService.Write("ç»´ä¿®è¦æ±:" + oItemSub.HRepairExplanation);

			//å¤æ³¨
			if (keys_Sub.Contains("textField_lq3ixr9d"))
			{
			oItemSub.HRemark = dic[ij]["textField_lq3ixr9d"].ToString();
			}
			LogService.Write("å¤æ³¨:" + oItemSub.HRemark);

			oItem.DetailColMouldRepair.Add(oItemSub);
			}
			}


			string HRemark = "";
			//åè¡¨ ä¿å»å¤æ³¨(é®é¢æè¿°)
			@@ -2496,9 +2578,10 @@
			oItemSub.HClaim = HDate_Temp[ij];
			oItemSub.HMaintainResult = HRemark;
			oItem.DetailColMouldMaintain.Add(oItemSub);
			LogService.Write("å·ä½è¦æ±:" + oItemSub.HClaim);
			}

			}


			int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
			oItem.HTitle = startIndex + response.Body.Result[i].Title.Substring(startindex).Replace("\"}", "").Replace("'", "");
			@@ -2533,6 +2616,7 @@
			}
			catch (Exception e)
			{
			LogService.Write("æ¥é:" + e.Message);
			continue;
			}
			}
			@@ -2568,7 +2652,7 @@
			string formUuid = "FORM-30C78F46E77E46A9AA8778214CEFE6B5J0AN";
			int pageNumber = 1;
			int pageSize = 100;

			LogService.Write("æ¥ç7");
			//è·åæ¨¡å·ç»´ä¿®ä¿å»è¡¨çå®ä¾IDåè¡¨
			List<string> IDList = new List<string>();
			if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
			@@ -2780,8 +2864,45 @@
			continue;
			}

			string HStaus = "";

			switch (getInstanceByIdResponse.Body.InstanceStatus)
			{
			case "COMPLETED":
			HStaus = "ç»´ä¿®ç»æ";
			break;
			case "RUNNING":
			HStaus = "ç»´ä¿®è¿è¡ä¸";
			break;
			case "TERMINATED":
			HStaus = "ç»´ä¿®ç»æ¢";
			break;
			}
			LogService.Write("ç¶æ:" + HStaus);
			if (getInstanceByIdResponse.Body.InstanceStatus != "COMPLETED")
			{
			//è®¾å¤ç¼ç
			if (keys.Contains("textField_lfg9hgys"))
			{
			string HDate_Temp = response.Body.Result[i].FormData["textField_lfg9hgys"].ToString();
			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;

			string HUpdateDate = ds.Tables[0].Rows[0]["HCloseDate"].ToString()==""?"1900-01-01 00:00:00": ds.Tables[0].Rows[0]["HCloseDate"].ToString();
			string HMouldStaus = ds.Tables[0].Rows[0]["HStatus"].ToString();
			LogService.Write("è®¾å¤:" + HDate_Temp + ",ç¶æ:" + HMouldStaus + ",æ¶é´:" + HUpdateDate);
			if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate))
			{
			//ä¿®æ¹è®¾å¤çç¶æåæ¶é´
			oCN.RunProc("update Gy_EquipFileBillMain set HStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HEquipID);
			}
			}
			}
			continue;
			}

			@@ -2794,18 +2915,28 @@
			{
			string HDate_Temp = response.Body.Result[i].FormData["textField_lfg9hgys"].ToString();
			DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain with(nolock) where HEquipFileNo='" + HDate_Temp + "'", "Gy_EquipFileBillMain");
			LogService.Write("è®¾å¤æ :" + HDate_Temp);
			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;
			string HUpdateDate = ds.Tables[0].Rows[0]["HCloseDate"].ToString() == "" ? "1900-01-01 00:00:00" : ds.Tables[0].Rows[0]["HCloseDate"].ToString();
			string HMouldStaus = ds.Tables[0].Rows[0]["HStatus"].ToString();
			LogService.Write("è®¾å¤:" + HDate_Temp + ",ç¶æ:" + HMouldStaus + ",æ¶é´:" + HUpdateDate);
			if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate))
			{
			//ä¿®æ¹è®¾å¤çç¶æåæ¶é´
			oCN.RunProc("update Gy_EquipFileBillMain set HStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HEquipID);
			}
			}
			else
			{
			continue;
			}
			}
			LogService.Write("è®¾å¤:" + oItem.HEquipID);

			//ç»´ä¿®é¨é¨
			if (keys.Contains("selectField_kzgkw10a"))
			@@ -2824,6 +2955,7 @@
			}

			}
			LogService.Write("ç»´ä¿®é¨é¨:" + oItem.HDeptID);

			//ç»´ä¿®äºº
			if (keys.Contains("employeeField_lthwkdh2"))
			@@ -2842,6 +2974,7 @@
			}

			}
			LogService.Write("ç»´ä¿®äºº:" + oItem.HEmpID);

			//ç»´ä¿®åå®¹
			if (keys.Contains("textField_l2r9bvwk"))
			@@ -2850,6 +2983,7 @@

			oItem.HRepairContent = HDate_Temp;
			}
			LogService.Write("ç»´ä¿®åå®¹:" + oItem.HRepairContent);

			//æ¥ä¿®ç±»å«
			if (keys.Contains("multiSelectField_lfg9hgyv"))
			@@ -2858,7 +2992,7 @@

			oItem.HRepairCategory = HDate_Temp[0];
			}

			LogService.Write("æ¥ä¿®ç±»å«:" + oItem.HRepairCategory);
			//ç´§æ¥ç¨åº¦
			if (keys.Contains("radioField_kzgkw10c"))
			{
			@@ -2866,6 +3000,7 @@

			oItem.HUrgenLevel = HDate_Temp;
			}
			LogService.Write("ç´§æ¥ç¨åº¦:" + oItem.HUrgenLevel);

			//æ¥ä¿®äºº
			if (keys.Contains("employeeField_lkasesrk"))
			@@ -2874,6 +3009,7 @@

			oItem.HRepairer = HDate_Temp[0];
			}
			LogService.Write("æ¥ä¿®äºº:" + oItem.HRepairer);

			//æ¯å¦æäº§è½å½±å
			if (keys.Contains("textField_lyjddw0r"))
			@@ -2882,7 +3018,8 @@

			oItem.HIsCapacityImpact = HDate_Temp;
			}

			LogService.Write("æ¯å¦æäº§è½å½±å:" + oItem.HIsCapacityImpact);

			//ç»´ä¿®æ¶é´
			if (keys.Contains("textField_l2r95oo2"))
			{
			@@ -2898,6 +3035,8 @@
			oItem.HTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
			oItem.HPlanTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
			}
			LogService.Write("ç»´ä¿®æ¶é´:" + oItem.HTimes);


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

			@@ -2910,6 +3049,7 @@
			oItem.HExplanation = HDate_Temp;
			sub.HRepairExplanation = HDate_Temp;
			}
			LogService.Write("ç»´ä¿®è¦æ±:" + oItem.HExplanation);

			//å¤æ³¨
			if (keys.Contains("textField_l2r95oo0"))
			@@ -2918,6 +3058,8 @@

			sub.HRemark = HDate_Temp;
			}
			LogService.Write("å¤æ³¨:" + oItem.HRemark);

			oItem.DetailColMouldRepair.Add(sub);

			int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
			@@ -2953,7 +3095,7 @@
			}
			catch (Exception e)
			{
			LogService.Write(e.Message);
			LogService.Write("æ¥é:" + e.Message);
			a = "";
			continue;
			}
			@@ -2989,7 +3131,7 @@
			string formUuid = "FORM-OM566O7177LW0ARJ5IMFF63NTFKA34G9RL2YKN1";
			int pageNumber = 1;
			int pageSize = 100;

			LogService.Write("æ¥ç6");
			//è·åè®¾å¤ç»´ä¿®ä¿å»è¡¨çå®ä¾IDåè¡¨
			List<string> IDList = new List<string>();
			if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
			@@ -3136,6 +3278,11 @@
			{
			continue;
			}
			string result = getProcessInstanceResponse.Body.Result.Result.ToString();
			if (result != "agree")
			{
			continue;
			}
			string[] deptNameAndGroupName = getProcessInstanceResponse.Body.Result.OriginatorDeptName.Split('-');//è·åé¨é¨æ¼æ¥åç¬¦ä¸²æ°ç»
			oItem.HDeptName = deptNameAndGroupName[1];
			oItem.HGroupName = deptNameAndGroupName[deptNameAndGroupName.Length-1];
			@@ -3160,11 +3307,11 @@
			}
			oItem.HMangerID = int.Parse(HMangerID);
			//å¤çé¨é¨åçç»åç§°id
			ds = oCN.RunProcReturn("select * from Gy_Department with(nolock) where HName='" + oItem.HDeptName + "'", "Gy_Department");
			ds = oCN.RunProcReturn("select * from h_v_GroupList with(nolock) where çç»åç§°='" + oItem.HGroupName + "'", "h_v_GroupList");
			string HDeptID = "0";
			if (ds.Tables[0].Rows.Count > 0)
			{
			HDeptID = ds.Tables[0].Rows[0]["HItemID"].ToString();
			HDeptID = ds.Tables[0].Rows[0]["HDeptID"].ToString();
			}
			oItem.HDeptID = int.Parse(HDeptID);
			ds = oCN.RunProcReturn("select * from Gy_Group with(nolock) where HName='" + oItem.HGroupName + "'", "Gy_Group");
			@@ -3188,10 +3335,18 @@
			//å¾ªç¯éåè·åèååç§°idï¼å·¥æ¶
			for (int i = 0; i < rows.Count; i++)
			{
			if (rows[i].RowValue.Count<10)
			{
			continue;
			}
			string[] nameArray = rows[i].RowValue[4].Value.ToString().Split(',');//è·åæ¯ä¸ªäººçäººå
			oItem.HPlanQty += double.Parse(rows[i].RowValue[2].Value.ToString());//è®¡åæ°é
			for (int j = 0; j < int.Parse(rows[i].RowValue[5].Value.ToString()); j++)
			{
			if (nameArray.Length < j + 1)//é²æ¢åºç°äººç¦»èäºè®¡æ¶åç³è¯·å®äºå¯¼è´ææ¯äººåä¸è®¡æ¶äººæ°ä¸ä¸è´çé®é¢
			{
			continue;
			}
			Pay_ErrWorkTimesRequestBillSub pay_ErrWorkTimesRequestBillSub = new Pay_ErrWorkTimesRequestBillSub();
			ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HName='" + nameArray[j] + "'", "Gy_Employee");
			string HEmpID = "0";
			@@ -3249,7 +3404,7 @@
			{
			oCN.BeginTran();
			//å é¤æ¶é´èå´åçå¯¼å¥åæ®
			DataSet dataSet = oCN.RunProcReturn(@"select HInterID from Pay_ErrWorkTimesRequestBillMain a with(nolock) where a.HRemark like '%ééå¯¼å¥%' and HDate >= '" + startTime + "' and HDate<='" + endTime + "'", "Pay_ErrWorkTimesRequestBillMain");
			DataSet dataSet = oCN.RunProcReturn(@"select HInterID from Pay_ErrWorkTimesRequestBillMain a with(nolock) where a.HRemark like '%ééå¯¼å¥%' and a.HIsImport = 1 and HDate >= '" + startTime + "' and HDate<='" + endTime + "'", "Pay_ErrWorkTimesRequestBillMain");
			if(dataSet != null && dataSet.Tables[0].Rows.Count > 0)
			{
			foreach (DataRow row in dataSet.Tables[0].Rows)
			@@ -3271,13 +3426,13 @@
			int HPeriod = int.Parse(oItem.HDate.Split('-')[1]);
			//ä¸»è¡¨
			string sql = "insert into Pay_ErrWorkTimesRequestBillMain" +
			"(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark,HMaker,HMakeDate) " +
			"(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark,HMaker,HMakeDate,HChecker,HCheckDate,HIsImport) " +
			"values(" +
			"" + HYear +
			"," + HPeriod +
			",'" + HBillType +
			"','" + " " +
			"'," + 1 +
			"'," + 2 +
			"," + HInterID +
			",'" + HBillNo +
			"','" + oItem.HDate +
			@@ -3296,6 +3451,9 @@
			"','" + oItem.HRemark +
			"','" + "System" +
			"'," + "GETDATE()" +
			",'" + "System" +
			"'," + "GETDATE()" +
			"," + "1" +
			")";
			//ä¸»è¡¨
			LogService.Write(sql);
			@@ -3429,14 +3587,14 @@
			string msg = "";
			try
			{
			if (getData_ErrWorkTimesRequest(startTime,endTime,ref msg) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + msg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//if (getData_ErrWorkTimesRequest(startTime,endTime,ref msg) == false)
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "Exceptionï¼" + msg;
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			objJsonResult.code = "1";
			objJsonResult.count = 1;