MES-WEB-API.git

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

			namespace WebAPI.Controllers
			{
			@@ -268,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; //åºå
			@@ -332,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; //æ¥æ
			@@ -510,8 +526,10 @@
			//OriginatorId = "12", //æ ¹æ®æµç¨åèµ·äººå·¥å·æ¥è¯¢ã

			//TaskId = "12", //ä»»å¡IDã
			CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01" ? "2022-01-01" : DateTime.Now.AddDays(-7).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, //åé¡µé¡µç
			@@ -2056,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;
			}

			//ä¿®æ¨¡å¼å§æ¶é´
			@@ -2073,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)
			@@ -2091,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();
			}
			}


			@@ -2114,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)
			{
			@@ -2231,6 +2327,7 @@
			}
			catch (Exception e)
			{
			LogService.Write(e.Message);
			msg = e.Message;
			return false;
			}
			@@ -2266,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}'";
			@@ -2279,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 " +
			@@ -2288,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)
			@@ -2303,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;
			}
			@@ -2326,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 " +
			@@ -2336,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)
			@@ -2353,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;
			}
			@@ -2368,6 +2497,7 @@
			}
			catch (Exception e)
			{
			LogService.Write(e.Message);
			msg = e.Message;
			oCN.RollBack();
			return false;
			@@ -2380,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;
			@@ -2432,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"))
			@@ -2456,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);
			}

			//ç»´ä¿®åå®¹
			@@ -2491,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()));
			}

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

			@@ -2500,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;
			}

			@@ -2546,6 +2730,8 @@
			}
			catch (Exception e)
			{
			LogService.Write(e.Message);
			a = "";
			continue;
			}
			}
			@@ -2581,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)
			{
			@@ -2598,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)
			{
			//ç»´ä¿®è®°å½
			@@ -2620,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)
			@@ -2636,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;
			}
			@@ -2651,6 +2848,7 @@
			}
			catch (Exception e)
			{
			LogService.Write(e.Message);
			msg = e.Message;
			oCN.RollBack();
			return false;