MES-WEB-API.git

			@@ -29,6 +29,7 @@
			{
			public int HInterID;
			public string HBillNo;
			public int HProjectID;
			public string HProNumber;
			public string HProName;
			public int HProjectStageID;
			@@ -58,6 +59,11 @@
			public string HDeleteManDate;
			public string HBackerDate;
			public string HBackRemark;

			public int HMainSourceInterID;
			public int HMainSourceEntryID;
			public string HMainSourceBillNo;
			public string HMainSourceBillType;
			}
			#endregion

			@@ -141,6 +147,7 @@
			string HBillSubType = "";
			int HInterID = mainList[0].HInterID;
			string HBillNo = mainList[0].HBillNo;
			int HProjectID = mainList[0].HProjectID;
			string HProNumber = mainList[0].HProNumber;
			string HProName = mainList[0].HProName;
			int HProjectStageID = mainList[0].HProjectStageID;
			@@ -170,6 +177,10 @@
			string HDeleteManDate = mainList[0].HDeleteManDate;
			string HBackerDate = mainList[0].HBackerDate;
			string HBackRemark = mainList[0].HBackRemark;
			int HMainSourceInterID = mainList[0].HMainSourceInterID;
			int HMainSourceEntryID = mainList[0].HMainSourceEntryID;
			string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
			string HMainSourceBillType = mainList[0].HMainSourceBillType;


			if (OperationType == 2)
			@@ -190,8 +201,8 @@
			if ((OperationType == 1 \|\| OperationType == 2) && ds.Tables[0].Rows.Count == 0)//æ°å¢
			{
			string sql = "insert into PM_WorkTaskBillMain" +
			"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
			",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate)" +
			"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProjectID,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
			",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
			"values(" +
			"" + HYear +
			"," + HPeriod +
			@@ -199,7 +210,8 @@
			"','" + HBillSubType +
			"'," + HInterID +
			",'" + HBillNo +
			"','" + HProNumber +
			"'," + HProjectID +
			",'" + HProNumber +
			"'," + HProjectStageID +
			",'" + HName +
			"','" + HDate +
			@@ -215,6 +227,10 @@
			"'," + HOrgID +
			",'" + HMaker +
			"','" + HMakerDate +
			"'," + HMainSourceInterID +
			"," + HMainSourceEntryID +
			",'" + HMainSourceBillNo +
			"','" + HMainSourceBillType +
			"')";

			//ä¸»è¡¨
			@@ -230,7 +246,8 @@
			",HBillType = '" + HBillType +
			"',HBillSubType = '" + HBillSubType +
			"',HBillNo = '" + HBillNo +
			"',HProNumber = '" + HProNumber +
			"',HProjectID = " + HProjectID +
			",HProNumber = '" + HProNumber +
			"',HProjectStageID = " + HProjectStageID +
			",HName = '" + HName +
			"',HDate = '" + HDate +
			@@ -246,6 +263,10 @@
			"',HOrgID = " + HOrgID +
			",HUpdater = '" + HUpdater +
			"',HUpdateDate = '" + HUpdaterDate +
			"',HMainSourceInterID = " + HMainSourceInterID +
			",HMainSourceEntryID = " + HMainSourceEntryID +
			",HMainSourceBillNo = '" + HMainSourceBillNo +
			"',HMainSourceBillType = '" + HMainSourceBillType +
			"' where HInterID = " + HInterID;

			oCN.RunProc(sql);
			@@ -255,7 +276,46 @@
			//è®°å½æ¥å¿
			LogService.Write("ç¨æ·:" + user + ",æ¥æ:" + DateTime.Now + ",ä¿®æ¹å·¥ä½ä»»å¡:" + HBillNo);
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "ä¿®æ¹å·¥ä½ä»»å¡ï¼" + HBillNo + "','LMES-å·¥ä½ä»»å¡æ¨¡å','" + DBUtility.ClsPub.IPAddress + "','ä¿®æ¹åæ®'", ref DBUtility.ClsPub.sExeReturnInfo);
			}else if (OperationType == 4 && ds.Tables[0].Rows.Count == 0) //ä¸æ¨
			{
			string sql = "insert into PM_WorkTaskBillMain" +
			"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProjectID,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
			",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
			"values(" +
			"" + HYear +
			"," + HPeriod +
			",'" + HBillType +
			"','" + HBillSubType +
			"'," + HInterID +
			",'" + HBillNo +
			"'," + HProjectID +
			",'" + HProNumber +
			"'," + HProjectStageID +
			",'" + HName +
			"','" + HDate +
			"','" + HTaskNote +
			"'," + HPlanTimes +
			"," + HSelfTimes +
			",'" + HLastDate +
			"','" + HSendEmp +
			"','" + HReceiveEmp +
			"','" + HType +
			"','" + HCopyEmp +
			"','" + HRemark +
			"'," + HOrgID +
			",'" + HMaker +
			"','" + HMakerDate +
			"'," + HMainSourceInterID +
			"," + HMainSourceEntryID +
			",'" + HMainSourceBillNo +
			"','" + HMainSourceBillType +
			"')";
			//ä¸»è¡¨
			oCN.RunProc(sql);
			LogService.Write("ç¨æ·:" + user + ",æ¥æ:" + DateTime.Now + ",æ°å¢å·¥ä½ä»»å¡:" + HBillNo);
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "æ°å¢å·¥ä½ä»»å¡ï¼" + HBillNo + "','LMES-å·¥ä½ä»»å¡æ¨¡å','" + DBUtility.ClsPub.IPAddress + "','æ°å¢åæ®'", ref DBUtility.ClsPub.sExeReturnInfo);
			}

			//ä¿ååè¡¨
			objJsonResult = AddBillSub(HInterID, HBillNo, OperationType);

			@@ -333,12 +393,12 @@

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_PM_WorkTaskBillList order by åæ®å· ", "h_v_PM_WorkTaskBillList");
			ds = oCN.RunProcReturn("select * from h_v_PM_WorkTaskBillList order by åæ®å· desc", "h_v_PM_WorkTaskBillList");
			}
			else
			{
			string sql1 = "select * from h_v_PM_WorkTaskBillList where 1 = 1 ";
			string sql = sql1 + sWhere + " order by åæ®å· ";
			string sql = sql1 + sWhere + " order by åæ®å· desc";
			ds = oCN.RunProcReturn(sql, "h_v_PM_WorkTaskBillList");
			}

			@@ -515,25 +575,49 @@
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ä¸åå¨ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//å®¡æ ¸åæ®
			if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//å®¡æ ¸åæ®
			if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			@@ -544,23 +628,39 @@
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½è¿è¡åå®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡åå®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²åå®¡æ ¸!ä¸éè¦ååå®¡æ ¸!";
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//åå®¡æ ¸åæ®
			if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//åå®¡æ ¸åæ®
			if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			@@ -621,25 +721,50 @@
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ä¸åå¨ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸éè¦åå³é!";
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½åæ¬¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//å³éåæ®
			if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//å³éåæ®
			if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			@@ -650,23 +775,39 @@
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HCloseMan"] == null \|\| ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²åå³é!ä¸éè¦ååå³é!";
			objJsonResult.Message = "åæ®æªå³é!ä¸éè¦ååå³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//åå³éåæ®
			if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//åå³éåæ®
			if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			@@ -727,8 +868,24 @@
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ä¸åå¨ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½è¿è¡ä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			@@ -737,15 +894,15 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//ä½åºåæ®
			if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//ä½åºåæ®
			if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			@@ -756,23 +913,31 @@
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½è¿è¡ä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] == null \|\| ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²åä½åº!ä¸éè¦ååä½åº!";
			objJsonResult.Message = "åæ®æªä½åº!ä¸éè¦ååä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//åä½åºåæ®
			if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//åä½åºåæ®
			if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			@@ -830,6 +995,7 @@
			public class PM_WorkTaskReportBill_Sub
			{
			public int RowID;
			public int HProjectID;
			public string HProNumber;
			public int HProjectStageID;
			public string HProjectStageName;
			@@ -840,9 +1006,14 @@
			public string HReportNote;
			public string HAdv;
			public string HRemarkSub;
			public int HSourceInterID;
			public int HSourceEntryID;
			public string HSourceBillNo;
			public string HSourceBillType;
			public bool HFinishFlag;
			}
			#endregion
			#region é¡¹ç®é¶æ®µæ¸å æ°å¢/ç¼è¾-ä¿å
			#region ä»»å¡æ±æ¥ æ°å¢/ç¼è¾-ä¿å
			/// <summary>
			/// æ°å¢åæ®-ä¿åæé®
			///åæ°ï¼string sqlã
			@@ -876,7 +1047,7 @@
			return objJsonResult;
			}
			#endregion
			#region æ·»å é¡¹ç®é¶æ®µæ¸å ä¸»è¡¨
			#region æ·»å ä»»å¡æ±æ¥ ä¸»è¡¨
			public json AddBillMain_WorkTaskReportBill(string msg1)
			{
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			@@ -999,6 +1170,8 @@

			oCN.RunProc(sql);

			//å é¤åè¡¨æ¶ åå¡«å·¥ä½ä»»å¡åå³èæ°éãåæ®ç¶æ
			oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Delete " + HInterID.ToString());
			//å é¤åè¡¨
			oCN.RunProc("delete from PM_WorkTaskReportBillSub where HInterID='" + HInterID + "'");
			//è®°å½æ¥å¿
			@@ -1034,7 +1207,7 @@
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "æ°å¢ä»»å¡æ±æ¥ï¼" + HBillNo + "','LMES-ä»»å¡æ±æ¥æ¨¡å','" + DBUtility.ClsPub.IPAddress + "','æ°å¢åæ®'", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			//ä¿ååè¡¨
			objJsonResult = AddBillSub_WorkTaskReportBill(msg3, HInterID, HBillNo, OperationType, HProID, HProjectStageID, HMainSourceBillType, HMainSourceBillNo);
			objJsonResult = AddBillSub_WorkTaskReportBill(msg3, HInterID, HBillNo, OperationType);

			if (objJsonResult.code == "0")
			{
			@@ -1061,89 +1234,60 @@
			}
			}
			#endregion
			#region æ·»å é¡¹ç®é¶æ®µæ¸å åè¡¨
			public json AddBillSub_WorkTaskReportBill(string msg3, long HInterID, string HBillNo, int OperationType, int HSourceInterID, int HSourceEntryID, string HSourceBillType, string HSourceBillNo)
			#region æ·»å ä»»å¡æ±æ¥ åè¡¨
			public json AddBillSub_WorkTaskReportBill(string msg3, long HInterID, string HBillNo, int OperationType)
			{
			List<PM_WorkTaskReportBill_Sub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PM_WorkTaskReportBill_Sub>>(msg3);
			int i = 0; //ä½ä¸ºåè¡¨åç
			if(OperationType == 4) {
			foreach (PM_WorkTaskReportBill_Sub oSub in DetailColl)
			{
			i++; //åä¸ä¸ªä¸»è¡¨ä¸çåè¡¨çåç èªå¢

			int HEntryID = i;
			string HProNumber = oSub.HProNumber;
			int HProjectStageID = oSub.HProjectStageID;
			string HName = oSub.HName;
			string HTaskNote = oSub.HTaskNote;
			string HType = oSub.HType;
			double HRelTimes = oSub.HRelTimes;
			string HReportNote = oSub.HReportNote;
			string HAdv = oSub.HAdv;
			string HRemark = oSub.HRemarkSub;

			string sql = "insert into PM_WorkTaskReportBillSub" +
			"(HInterID,HBillNo_bak,HEntryID,HRemark,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo) " +
			"values(" +
			"" + HInterID +
			",'" + HBillNo +
			"'," + HEntryID +
			",'" + HRemark +
			"','" + HProNumber +
			"'," + HProjectStageID +
			",'" + HName +
			"','" + HTaskNote +
			"','" + HType +
			"'," + HRelTimes +
			",'" + HReportNote +
			"','" + HAdv +
			"'," + HSourceInterID +
			"," + HSourceEntryID +
			",'" + HSourceBillType +
			"','" + HSourceBillNo +
			"')";

			oCN.RunProc(sql);
			}
			}
			else
			foreach (PM_WorkTaskReportBill_Sub oSub in DetailColl)
			{
			foreach (PM_WorkTaskReportBill_Sub oSub in DetailColl)
			{
			i++; //åä¸ä¸ªä¸»è¡¨ä¸çåè¡¨çåç èªå¢
			i++; //åä¸ä¸ªä¸»è¡¨ä¸çåè¡¨çåç èªå¢

			int HEntryID = i;
			string HProNumber = oSub.HProNumber;
			int HProjectStageID = oSub.HProjectStageID;
			string HName = oSub.HName;
			string HTaskNote = oSub.HTaskNote;
			string HType = oSub.HType;
			double HRelTimes = oSub.HRelTimes;
			string HReportNote = oSub.HReportNote;
			string HAdv = oSub.HAdv;
			string HRemark = oSub.HRemarkSub;
			int HEntryID = i;
			int HProjectID = oSub.HProjectID;
			string HProNumber = oSub.HProNumber;
			int HProjectStageID = oSub.HProjectStageID;
			string HName = oSub.HName;
			string HTaskNote = oSub.HTaskNote;
			string HType = oSub.HType;
			double HRelTimes = oSub.HRelTimes;
			string HReportNote = oSub.HReportNote;
			string HAdv = oSub.HAdv;
			string HRemark = oSub.HRemarkSub;
			int HSourceInterID = oSub.HSourceInterID;
			int HSourceEntryID = oSub.HSourceEntryID;
			string HSourceBillNo = oSub.HSourceBillNo;
			string HSourceBillType = oSub.HSourceBillType;
			bool HFinishFlag = oSub.HFinishFlag;

			string sql = "insert into PM_WorkTaskReportBillSub" +
			"(HInterID,HBillNo_bak,HEntryID,HRemark,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv) " +
			"values(" +
			"" + HInterID +
			",'" + HBillNo +
			"'," + HEntryID +
			",'" + HRemark +
			"','" + HProNumber +
			"'," + HProjectStageID +
			",'" + HName +
			"','" + HTaskNote +
			"','" + HType +
			"'," + HRelTimes +
			",'" + HReportNote +
			"','" + HAdv +
			"')";
			string sql = "insert into PM_WorkTaskReportBillSub" +
			"(HInterID,HBillNo_bak,HEntryID,HRemark,HProjectID,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo,HFinishFlag) " +
			"values(" +
			"" + HInterID +
			",'" + HBillNo +
			"'," + HEntryID +
			",'" + HRemark +
			"'," + HProjectID +
			",'" + HProNumber +
			"'," + HProjectStageID +
			",'" + HName +
			"','" + HTaskNote +
			"','" + HType +
			"'," + HRelTimes +
			",'" + HReportNote +
			"','" + HAdv +
			"'," + HSourceInterID +
			"," + HSourceEntryID +
			",'" + HSourceBillType +
			"','" + HSourceBillNo +
			"'," + DBUtility.ClsPub.BoolToString(HFinishFlag) +
			")";

			oCN.RunProc(sql);
			}
			oCN.RunProc(sql);
			}


			//åå¡«å·¥ä½ä»»å¡åå³èæ°éãåæ®ç¶æ
			oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Add " + HInterID.ToString());

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -1179,12 +1323,12 @@

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_PM_WorkTaskReportBillList order by åæ®å·", "h_v_PM_ProjectStageBillList");
			ds = oCN.RunProcReturn("select * from h_v_PM_WorkTaskReportBillList order by åæ®å· desc", "h_v_PM_ProjectStageBillList");
			}
			else
			{
			string sql1 = "select * from h_v_PM_WorkTaskReportBillList where 1 = 1 ";
			string sql = sql1 + sWhere + " order by åæ®å·";
			string sql = sql1 + sWhere + " order by åæ®å· desc";
			ds = oCN.RunProcReturn(sql, "h_v_PM_WorkTaskReportBillList");
			}

			@@ -1299,6 +1443,8 @@

			oCN.BeginTran();

			//å é¤åè¡¨æ¶ åå¡«å·¥ä½ä»»å¡åå³èæ°éãåæ®ç¶æ
			oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Delete " + HInterID.ToString());
			oCN.RunProc("delete from PM_WorkTaskReportBillMain where HInterID = " + HInterID);
			oCN.RunProc("delete from PM_WorkTaskReportBillSub where HInterID='" + HInterID + "'");

			@@ -1306,7 +1452,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.Message = "å é¤æåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1365,25 +1511,49 @@
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ä¸åå¨ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//å®¡æ ¸åæ®
			if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//å®¡æ ¸åæ®
			if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			@@ -1394,23 +1564,39 @@
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½è¿è¡åå®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡åå®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²åå®¡æ ¸!ä¸éè¦ååå®¡æ ¸!";
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//åå®¡æ ¸åæ®
			if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//åå®¡æ ¸åæ®
			if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			@@ -1471,25 +1657,50 @@
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ä¸åå¨ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸éè¦åå³é!";
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½åæ¬¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//å³éåæ®
			if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//å³éåæ®
			if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			@@ -1500,23 +1711,39 @@
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HCloseMan"] == null \|\| ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²åå³é!ä¸éè¦ååå³é!";
			objJsonResult.Message = "åæ®æªå³é!ä¸éè¦ååå³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//åå³éåæ®
			if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//åå³éåæ®
			if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			@@ -1577,8 +1804,24 @@
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ä¸åå¨ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½è¿è¡ä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			@@ -1587,15 +1830,15 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//ä½åºåæ®
			if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//ä½åºåæ®
			if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			@@ -1606,23 +1849,31 @@
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½è¿è¡ä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] == null \|\| ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²åä½åº!ä¸éè¦ååä½åº!";
			objJsonResult.Message = "åæ®æªä½åº!ä¸éè¦ååä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//åä½åºåæ®
			if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//åä½åºåæ®
			if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			@@ -1645,5 +1896,66 @@
			}
			}
			#endregion

			#region æ ¹æ®ç»å½è´¦æ·è·åå¯¹äºèå
			[Route("PM_WorkTaskReportBill/getHEmpByHUserName")]
			[HttpGet]
			public object getHEmpByHUserName(string Czybm, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//æ¥çæé
			//if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_Query", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "æ æ¥çæéï¼";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			string sql = @"select a.HEmpID,b.HName HEmpName
			from Gy_Czygl AS a
			LEFT OUTER JOIN Gy_Employee AS b on a.HEmpID = b.HItemID
			where a.Czybm = '" + Czybm + "'";

			ds = oCN.RunProcReturn(sql, "Gy_Czygl");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æªæ¾å°ç¸å³æ°æ®ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}


			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}