MES-WEB-API.git

			@@ -19,6 +19,7 @@
			private json objJsonResult = new json();
			public DataSet ds = new DataSet();
			public SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();
			string user_LongShan = "";
			string HName_LongShan = "";

			@@ -81,7 +82,7 @@
			public string HStageNote;
			public int HPMGoodsID;
			public string HPMGoodsName;
			public int HIsKey;
			public bool HIsKey;
			public double HRate;
			public int HEmpID;
			public string HEmpName;
			@@ -98,7 +99,7 @@
			public int RowID;
			public int HEmployeeID;
			public string HEmployeeName;
			public int HIsPM;
			public bool HIsPM;
			public double HRate;
			public double HPlanAvgMoney;
			public double HPlanCountMoney;
			@@ -211,6 +212,8 @@
			int HPayCusID = mainList[0].HPayCusID;
			int HOrgID = mainList[0].HOrgID;
			int HMaterID = mainList[0].HMaterID;
			string HUpdater = mainList[0].HUpdater;
			string HUpdaterDate = mainList[0].HUpdaterDate;

			if (OperationType == 2)
			{
			@@ -227,7 +230,6 @@

			ds = oCN.RunProcReturn("select * from PM_ProjectBillMain where HInterID = " + HInterID + " and HBillNo = '" + HBillNo + "'", "PM_ProjectBillMain");

			oCN.BeginTran();
			if ((OperationType == 1 \|\| OperationType == 2) && ds.Tables[0].Rows.Count == 0)//æ°å¢
			{
			string sql = "insert into PM_ProjectBillMain" +
			@@ -282,8 +284,8 @@
			"',HBillNo = '" + HBillNo +
			"',HBillStatus = " + HBillStatus +
			",HRemark = '" + HRemark +
			"',HMaker = '" + HMaker +
			"',HMakeDate = '" + HMakerDate +
			"',HUpdater = '" + HUpdater +
			"',HUpdateDate = '" + HUpdaterDate +
			"',HProNumber = '" + HProNumber +
			"',HProName = '" + HProName +
			"',HCusID = " + HCusID +
			@@ -318,7 +320,6 @@
			objJsonResult = AddBillSub1(msg3, HInterID, HBillNo, OperationType);
			objJsonResult = AddBillSub2(msg4, HInterID, HBillNo, OperationType);

			oCN.Commit();

			if (objJsonResult.code == "0")
			{
			@@ -361,7 +362,7 @@
			string HStageNote = oSub.HStageNote;
			int HPMGoodsID = oSub.HPMGoodsID;
			string HRelationGoods = oSub.HPMGoodsName;
			int HIsKey = oSub.HIsKey;
			int HIsKey = oSub.HIsKey?1:0;
			double HRate = oSub.HRate;
			int HEmpID = oSub.HEmpID;
			int HCheckEmpID = oSub.HCheckEmpID;
			@@ -410,7 +411,7 @@
			int HEntryID = i;
			string HRemark = oSub.HRemarkSub;
			int HEmpID = oSub.HEmployeeID;
			int HIsPM = oSub.HIsPM;
			int HIsPM = oSub.HIsPM?1:0;
			double HRate = oSub.HRate;
			double HPlanAvgMoney = oSub.HPlanAvgMoney;
			double HPlanCountMoney = oSub.HPlanCountMoney;
			@@ -469,13 +470,13 @@

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

			//æ·»å åå
			@@ -536,7 +537,7 @@
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("exec h_p_PM_ProjectReportBill_EditInit " + HInterID, "h_p_PM_ProjectReportBill_EditInit");
			ds = oCN.RunProcReturn("exec h_p_PM_ProjectBill_EditInit " + HInterID, "h_p_PM_ProjectBill_EditInit");
			tableList.Add(ds.Tables[0]);
			tableList.Add(ds.Tables[1]);
			tableList.Add(ds.Tables[2]);
			@@ -612,5 +613,438 @@
			}
			}
			#endregion

			#region å·¥ç¨é¡¹ç® å®¡æ ¸/åå®¡æ ¸
			/// <summary>
			///
			/// </summary>
			/// <param name="HInterID">åæ®ID</param>
			/// <param name="IsAudit">å®¡æ ¸(0),åå®¡æ ¸(1)</param>
			/// <param name="CurUserName">å®¡æ ¸äºº</param>
			/// <returns></returns>
			[Route("PM_ProjectBill/AuditPM_ProjectBill")]
			[HttpGet]
			public object AuditPM_ProjectBill(string HInterID, int Type, string user)
			{
			try
			{
			//å¤ææ¯å¦æå®¡æ ¸æé
			if (!DBUtility.ClsPub.Security_Log("Pm_ProjectBill_Check", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æéå®¡æ ¸!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (string.IsNullOrWhiteSpace(HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterIDä¸ºç©ºï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ClsPub.CurUserName = user;
			BillOld.MvarItemKey = "PM_ProjectBillMain";
			oCN.BeginTran();//å¼å§äºå¡

			//Type 1 å®¡æ ¸ 2 åå®¡æ ¸
			if (Type == 1)
			{
			//å¤æåæ®æ¯å¦å·²ç»å®¡æ ¸
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			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 (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			//å¤æåæ®æ¯å¦å·²ç»åå®¡æ ¸
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			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 (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			oCN.Commit();//æäº¤äºå¡

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æ§è¡æåï¼";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ§è¡å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region å·¥ç¨é¡¹ç® å³é/åå³éåè½
			[Route("PM_ProjectBill/ClosePM_ProjectBill")]
			[HttpGet]
			public object ClosePM_ProjectBill(string HInterID, int Type, string user)
			{
			try
			{
			//å¤ææ¯å¦æå é¤æé
			if (!DBUtility.ClsPub.Security_Log("Pm_ProjectBill_Close", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æéå³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (string.IsNullOrWhiteSpace(HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterIDä¸ºç©ºï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ClsPub.CurUserName = user;
			BillOld.MvarItemKey = "PM_ProjectBillMain";
			oCN.BeginTran();//å¼å§äºå¡

			//Type 1 å³é 2 åå³é
			if (Type == 1)
			{
			//å¤æåæ®æ¯å¦å·²ç»å³é
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			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 (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			//å¤æåæ®æ¯å¦å·²ç»åå³é
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			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 (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			oCN.Commit();//æäº¤äºå¡

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æ§è¡æåï¼";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ§è¡å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region å·¥ç¨é¡¹ç® ä½åº/åä½åºåè½
			[Route("PM_ProjectBill/DropPM_ProjectBill")]
			[HttpGet]
			public object DropPM_ProjectBill(string HInterID, int Type, string user)
			{
			try
			{
			//å¤ææ¯å¦æä½åºæé
			if (!DBUtility.ClsPub.Security_Log("Pm_ProjectBill_Drop", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æéä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (string.IsNullOrWhiteSpace(HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterIDä¸ºç©ºï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ClsPub.CurUserName = user;
			BillOld.MvarItemKey = "PM_ProjectBillMain";
			oCN.BeginTran();//å¼å§äºå¡

			//Type 1 ä½åº 2 åä½åº
			if (Type == 1)
			{
			//å¤æåæ®æ¯å¦å·²ç»ä½åº
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			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 (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			//å¤æåæ®æ¯å¦å·²ç»åä½åº
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			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 (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			oCN.Commit();//æäº¤äºå¡

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æ§è¡æåï¼";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ§è¡å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region å·¥ç¨é¡¹ç® ä¸æ¨(é¶æ®µæ±æ¥)-é¡µé¢æ¾ç¤º
			[Route("PM_ProjectBill/set_ProjectReport")]
			[HttpGet]
			public object ProjectBill_ProjectReport(string HInterID, string HProjectStageID, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			List<DataTable> tables = new List<DataTable>();
			//æ¥çæé
			//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 = "exec h_p_PM_ProjectBill_setProjectReport " + HInterID + "," + HProjectStageID;
			ds = oCN.RunProcReturn(sql, "h_p_PM_ProjectBill_setProjectReport");
			tables.Add(ds.Tables[0]);
			tables.Add(ds.Tables[1]);
			if (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[1].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 = tables;
			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

			#region å·¥ç¨é¡¹ç® ä¸æ¨(ä»»å¡æ±æ¥)-é¡µé¢æ¾ç¤º
			[Route("PM_ProjectBill/set_WorkTaskReport")]
			[HttpGet]
			public object ProjectBill_WorkTaskReport(string HInterID, string HProjectStageID, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			List<DataTable> tables = new List<DataTable>();
			//æ¥çæé
			//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 = "exec h_p_PM_ProjectBill_setWorkTaskReport " + HInterID + "," + HProjectStageID;
			ds = oCN.RunProcReturn(sql, "h_p_PM_ProjectBill_setWorkTaskReport");
			tables.Add(ds.Tables[0]);
			tables.Add(ds.Tables[1]);

			//æ·»å åå
			foreach (DataColumn col in ds.Tables[1].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 = tables;
			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
			}
			}