MES-WEB-API.git

			@@ -74,9 +74,12 @@
			}

			#region åé
			private string AppKey = "dingiokapm2dvjrhzl2g"; //å·²åå»ºçä¼ä¸åé¨åºç¨çAppKeyã
			private string AppSecret = "dPUD7tN3BGVYAC4lDzhpcBH7O4FWFDdjLJWa6cVRBQj5U7GJ4Gwr7Vohnv0oPBOr"; //å·²åå»ºçä¼ä¸åé¨åºç¨çAppSecretã
			private long AgentID = 3188176952; //åºç¨çAgentId
			//private string AppKey = "dingiokapm2dvjrhzl2g"; //å·²åå»ºçä¼ä¸åé¨åºç¨çAppKeyã
			//private string AppSecret = "dPUD7tN3BGVYAC4lDzhpcBH7O4FWFDdjLJWa6cVRBQj5U7GJ4Gwr7Vohnv0oPBOr"; //å·²åå»ºçä¼ä¸åé¨åºç¨çAppSecretã
			//private long AgentID = 3188176952; //åºç¨çAgentId
			private string AppKey = "dingj3hskhwk8jioofub"; //å·²åå»ºçä¼ä¸åé¨åºç¨çAppKeyã
			private string AppSecret = "qGPbXJGJtFI__FYGdzZPIjHZP_o1jI1KnM4_bbKx9AUuXcYqr3UN6nkQeSe8GcT7"; //å·²åå»ºçä¼ä¸åé¨åºç¨çAppSecretã
			private long AgentID = 3553515838; //åºç¨çAgentId
			public string accessToken = ""; //è°ç¨è¯¥æ¥å£çè®¿é®åè¯ã
			private string ProcessInstanceId = ""; //å®¡æ¹å®ä¾IDã
			#endregion
			@@ -593,6 +596,7 @@
			#region è·å å®ææå®åæ®çå®ä¾IDåè¡¨--æå®åé¡µçæ°æ®
			public bool getInstanceIDList_Page_YiDa(string appType, string systemToken, string userID, string formUuid, int pageNumber, int pageSize, ref YD_GetInstanceIDListResponse response, ref string msg)
			{
			LogService.Write("æ¥ç4-ä¼ éåæ°:appType=" + appType + ",systemToken=" + systemToken + ",formUuid=" + formUuid + ",userID=" + userID + ",pageSize=" + pageSize + ",pageNumber=" + pageNumber+ ",accessToken="+ this.accessToken);
			AlibabaCloud.SDK.Dingtalkyida_1_0.Client client = CreateClient4();
			AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetInstanceIdListHeaders getInstanceIdListHeaders = new AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetInstanceIdListHeaders();
			getInstanceIdListHeaders.XAcsDingtalkAccessToken = this.accessToken;
			@@ -639,7 +643,9 @@
			{
			// err ä¸å«æ code å message å±æ§ï¼å¯å¸®å©å¼åå®ä½é®é¢
			}

			msg = "éè¯¯ä»£ç " + err.Code + "ï¼" + err.Message;
			LogService.Write("æ¥ç4-æ¥éä¿¡æ¯1:"+ msg);
			return false;

			}
			@@ -654,6 +660,7 @@
			// err ä¸å«æ code å message å±æ§ï¼å¯å¸®å©å¼åå®ä½é®é¢
			}
			msg = "éè¯¯ä»£ç " + err.Code + "ï¼" + err.Message;
			LogService.Write("æ¥ç4-æ¥éä¿¡æ¯2:" + msg);
			return false;
			}
			}
			@@ -662,6 +669,7 @@
			#region è·å å®ææå®åæ®çå®ä¾IDåè¡¨
			public bool getInstanceIDList_YiDa(string appType, string systemToken, string userID, string formUuid, int pageNumber, int pageSize, ref List<string> IDList, ref string msg)
			{
			LogService.Write("æ¥ç4-1æ¥è¯¢");
			YD_GetInstanceIDListResponse response = new YD_GetInstanceIDListResponse();
			do
			{
			@@ -980,7 +988,7 @@
			return false;
			}


			LogService.Write("æ¥ç1-æ°æ®æ¥è¯¢1");
			for (int i = 0; i < response.Body.Result.Count; i++)
			{
			try
			@@ -1028,6 +1036,7 @@
			// oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf_id"])[0].ToString().Replace("'", "");
			//}

			LogService.Write("æ¥ç1-æ°æ®æ¥è¯¢-å¾ªç¯éé¢2:"+ oItem.HInstanceID);

			//ç¾å°è¡¨
			if (keys.Contains("dateField_ls9ma7h3"))
			@@ -1056,7 +1065,7 @@
			oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_ls9ma7h5_id"])[0].ToString().Replace("'", "");
			}


			LogService.Write("æ¥ç1-æ°æ®æ¥è¯¢-å¾ªç¯éé¢3:è·åå®ä¾ç¶æ:"+ oItem.HInstanceStatus);

			//è·åå®ä¾ç¶æ
			GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
			@@ -1097,7 +1106,7 @@
			oItem.HApprovedResult = "";
			}


			LogService.Write("æ¥ç1-æ°æ®æ¥è¯¢-å¾ªç¯éé¢4:æ°æ®æ°å¢:" + oItem.HApprovedResult);

			lsmain.Add(oItem);
			}catch(Exception e)
			@@ -1156,7 +1165,8 @@

			try
			{
			oCN.BeginTran();
			LogService.Write("æ¥ç1-æ°å¢æ°æ®");
			oCN.BeginTran();
			foreach (YD_FenCengShenHeQianDaoBiao oItem in lsmain)
			{
			string sql_searchRepeat = "select * from DD_FenCengShenHeQianDaoBiao where HInstanceID = '" + oItem.HInstanceID + "'";
			@@ -1194,10 +1204,12 @@
			oCN.RunProc(sql_main);
			}
			oCN.Commit();
			LogService.Write("æ¥ç1-æ°å¢æ°æ®ç»æ");
			return true;
			}catch(Exception e)
			{
			msg = e.Message;
			LogService.Write("æ¥ç1-æ¥é" + msg);
			oCN.RollBack();
			return false;
			}
			@@ -1759,7 +1771,7 @@
			return false;
			}


			LogService.Write("æ¥ç4-å¾ªç¯-æ¥è¯¢æ°æ®");
			for (int i = 0; i < response.Body.Result.Count; i++)
			{
			try
			@@ -1775,6 +1787,8 @@
			oItem.HUpdateDate = response.Body.Result[i].ModifiedTimeGMT.Replace("T", " ").Replace("Z", "").Replace("'", ""); ;
			oItem.HInstanceID = response.Body.Result[i].FormInstanceId.Replace("'", ""); ;
			oItem.HOriginator = response.Body.Result[i].Originator.Name.NameInChinese.Replace("'", ""); ;

			LogService.Write("æ¥ç4-å¾ªç¯-è·åid-æ¥è¯¢æ°æ®"+ oItem.HInstanceID);

			int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
			oItem.HTitle = startIndex + response.Body.Result[i].Title.Substring(startindex).Replace("\"}", "").Replace("'", "");
			@@ -1795,6 +1809,8 @@
			{
			return false;
			}

			LogService.Write("æ¥ç4-å¾ªç¯-è·åç¶æ-æ¥è¯¢æ°æ®" + oItem.HInstanceStatus);

			oItem.HInstanceStatus = response1.Body.InstanceStatus;
			if (oItem.HInstanceStatus == "RUNNING")
			@@ -1916,6 +1932,8 @@

			oItem.HQuestion_Duty = sub2List;

			LogService.Write("æ¥ç4-å¾ªç¯-æ°å¢ç»æ-æ¥è¯¢æ°æ®" + oItem.HQuestion_Duty.Count);

			lsmain.Add(oItem);
			}
			catch (Exception e)
			@@ -1957,9 +1975,10 @@
			List<string> IDList = new List<string>();
			if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
			{
			LogService.Write("æ¥ç4-1-è¿å");
			return false;
			}

			LogService.Write("æ¥ç4-1");
			//è·åè¯¦ç»ä¿¡æ¯å¹¶éå å°åè¡¨lsmainä¸
			List<YD_QRQCWenTiTiJiaoBiao> lsmain = new List<YD_QRQCWenTiTiJiaoBiao>();
			if (getInstanceDetailList_QRQCWenTiTiJiaoBiao__YiDa(appType, systemToken, userID, formUuid, IDList, ref lsmain, ref msg) == false)
			@@ -1969,6 +1988,7 @@

			try
			{
			LogService.Write("æ¥ç4-æ°å¢");
			oCN.BeginTran();
			foreach (YD_QRQCWenTiTiJiaoBiao oItem in lsmain)
			{
			@@ -2055,11 +2075,13 @@

			}
			oCN.Commit();
			LogService.Write("æ¥ç4-æ°å¢ç»æ");
			return true;
			}
			catch (Exception e)
			{
			msg = e.Message;
			LogService.Write("æ¥ç4-æ°å¢æ¥é:"+ msg);
			oCN.RollBack();
			return false;
			}
			@@ -2343,7 +2365,7 @@
			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);
			oCN.RunProc("update Gy_MouldFileMain set HMouldUseStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
			}
			}
			}
			@@ -2370,7 +2392,7 @@
			if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate))
			{
			//ä¿®æ¹æ¨¡å·çç¶æåæ¶é´
			oCN.RunProc("update Gy_MouldFileMain set HMouldStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
			oCN.RunProc("update Gy_MouldFileMain set HMouldUseStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
			}
			}
			oItem.HMouldID = long.Parse(HMouldID);
			@@ -3587,20 +3609,43 @@
			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;
			//}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = null;
			return objJsonResult;
			string sErrMsg = "";
			if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			{
			if ( oSystemParameter.omodel.WMS_CampanyName == "æ·»åº·ç§æ") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			{
			//æ·»åº·ä¸ç¨
			if (getData_ErrWorkTimesRequest(startTime, endTime, ref msg) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + msg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¢æ·éè¯¯";
			objJsonResult.data = null;
			return objJsonResult;
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{