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;
			@@ -146,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;
			@@ -199,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 +
			@@ -208,7 +210,8 @@
			"','" + HBillSubType +
			"'," + HInterID +
			",'" + HBillNo +
			"','" + HProNumber +
			"'," + HProjectID +
			",'" + HProNumber +
			"'," + HProjectStageID +
			",'" + HName +
			"','" + HDate +
			@@ -224,6 +227,10 @@
			"'," + HOrgID +
			",'" + HMaker +
			"','" + HMakerDate +
			"'," + HMainSourceInterID +
			"," + HMainSourceEntryID +
			",'" + HMainSourceBillNo +
			"','" + HMainSourceBillType +
			"')";

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

			oCN.RunProc(sql);
			@@ -267,7 +279,7 @@
			}else if (OperationType == 4 && ds.Tables[0].Rows.Count == 0) //ä¸æ¨
			{
			string sql = "insert into PM_WorkTaskBillMain" +
			"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
			"(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 +
			@@ -276,7 +288,8 @@
			"','" + HBillSubType +
			"'," + HInterID +
			",'" + HBillNo +
			"','" + HProNumber +
			"'," + HProjectID +
			",'" + HProNumber +
			"'," + HProjectStageID +
			",'" + HName +
			"','" + HDate +
			@@ -982,6 +995,7 @@
			public class PM_WorkTaskReportBill_Sub
			{
			public int RowID;
			public int HProjectID;
			public string HProNumber;
			public int HProjectStageID;
			public string HProjectStageName;
			@@ -992,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ã
			@@ -1028,7 +1047,7 @@
			return objJsonResult;
			}
			#endregion
			#region æ·»å é¡¹ç®é¶æ®µæ¸å ä¸»è¡¨
			#region æ·»å ä»»å¡æ±æ¥ ä¸»è¡¨
			public json AddBillMain_WorkTaskReportBill(string msg1)
			{
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			@@ -1151,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 + "'");
			//è®°å½æ¥å¿
			@@ -1186,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")
			{
			@@ -1213,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;
			@@ -1451,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 + "'");

			@@ -1458,7 +1452,7 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.Message = "å é¤æåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}