MES-WEB-API.git

			@@ -883,6 +883,105 @@
			}
			#endregion

			#region å·¥ä½å¨æ»ç» è·ååè¡¨æ°æ®
			[Route("PM_WorkTaskWeekBill/PM_WorkReportWeekBillList")]
			[HttpGet]
			public object PM_WorkReportWeekBillList(string sWhere, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

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

			//æ·»å åå
			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åå¯¹è±¡çåå
			}


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

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æ¥è¯¢æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼" + e.ToString();
			objJsonResult.data = null;
			}
			return objJsonResult;
			}
			#endregion

			#region å·¥ä½å¨æ»ç» è·åç¼è¾åè¡¨æ°æ®
			[Route("PM_WorkTaskWeekBill/PM_WorkReportWeekBillMainEditList")]
			[HttpGet]
			public object PM_WorkReportWeekBillMainEditList(string HInterID)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			ds = oCn.RunProcReturn("select * from h_v_PM_WorkReportWeekBillMainList where HInterID='" + HInterID + "'", "h_v_PM_WorkReportWeekBillMainList");
			//æ·»å åå
			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åå¯¹è±¡çåå
			}


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

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æ¥è¯¢æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼" + e.ToString();
			objJsonResult.data = null;
			}
			return objJsonResult;
			}
			#endregion

			#region å·¥ä½å¨æ»ç» éæ©æ»ç»äººå¸¦åºå·¥æ¶
			[Route("PM_WorkTaskWeekBill/PM_WorkReportWeekBillMainList")]
			[HttpGet]
			@@ -944,7 +1043,7 @@

			#region å·¥ä½å¨æ»ç»ä¿å/ç¼è¾
			/// <summary>
			/// ä¿åçäº§é¢æå
			/// ä¿åå·¥ä½å¨æ»ç»
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			@@ -1033,7 +1132,7 @@
			oItem.HBillType = "4757";
			oItem.HBillSubType = "4757";

			//oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);

			oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
			oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));

			@@ -1096,12 +1195,13 @@
			#region å·¥ä½å¨æ»ç» å®¡æ ¸/åå®¡æ ¸åè½
			[Route("PM_WorkTaskWeekBill/CheckPM_WorkReportWeekBillMain")]
			[HttpGet]
			public object CheckSc_ICMOReportBill(string HInterID, int IsAudit, string user)
			public object CheckPM_WorkReportWeekBillMain(int HInterID, int IsAudit, string CurUserName)
			{
			DBUtility.ClsPub.CurUserName = CurUserName;
			try
			{
			//å®¡æ ¸æé
			if (!DBUtility.ClsPub.Security_Log_second("PM_WorkReportWeekBillMain_Check", 1, false, user))
			if (!DBUtility.ClsPub.Security_Log_second("PM_WorkReportWeekBillMain_Check", 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -1110,12 +1210,43 @@
			return objJsonResult;
			}

			var ds = oCn.RunProcReturn("select * from PM_WorkReportWeekBillMain where HInterID=" + HInterID, "PM_WorkReportWeekBillMain");
			if (ds.Tables[0].Rows.Count > 0)
			//HInterIDæ°æ®å¤æ
			if (HInterID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterIDå°äº0ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}


			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID); //å¯¹HInterIDè¿è¡ç±»åçè½¬æ¢
			DAL.ClsPM_WorkReportWeekBillMain oBill = new DAL.ClsPM_WorkReportWeekBillMain(); //å®ä¾ååæ®æä½ç±»ï¼ç¨äºè¿è¡ç¸å³æä½

			//éå¯¹éè¦è¿è¡çæä½ï¼æ£éªå½ååæ®çç¶ææ¯å¦æ¯æéè¦è¿è¡çæä½
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //æ ¹æ®HInterIDè·åè¯¥åæ®çæ°æ®
			{
			if (oBill.omodel.HCloseMan.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (oBill.omodel.HDeleteMan.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (IsAudit == 0) //å®¡æ ¸å¤æ
			{
			if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			if (oBill.omodel.HChecker.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -1126,7 +1257,7 @@
			}
			if (IsAudit == 1) //åå®¡æ ¸å¤æ
			{
			if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			if (oBill.omodel.HChecker.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -1140,38 +1271,117 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ä¸åå¨!";
			objJsonResult.Message = "åæ®ä¸åå¨!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCn.BeginTran();

			if (IsAudit == 0) //å®¡æ ¸å¤æ
			//è¿è¡éè¦è¿è¡çå®¡æ ¸/åå®¡æ ¸æä½
			if (IsAudit == 0) //å®¡æ ¸æäº¤
			{
			oCn.RunProc("update PM_WorkReportWeekBillMain set HChecker='" + user + "',HCheckDate=getdate() where HInterID=" + HInterID);
			oCn.BeginTran();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸æå";
			objJsonResult.data = null;
			//è®°å½è¿åä¿¡æ¯
			string msg = "";



			//å®¡æ ¸åæ§å¶=========================================
			string sql1 = "exec h_p_PM_WorkReportWeekBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
			ds = oCn.RunProcReturn(sql1, "h_p_PM_WorkReportWeekBill_BeforeCheckCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :å®¡æ ¸åå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			oCn.RollBack();
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCn.RollBack();
			return objJsonResult;
			}
			//==================================================================================

			//å®¡æ ¸æäº¤
			if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_PM_WorkReportWeekBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			oCn.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸æåï¼" + msg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			oCn.RollBack();

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (IsAudit == 1) //åå®¡æ ¸å¤æ
			if (IsAudit == 1) //åå®¡æ ¸æäº¤
			{
			oCn.RunProc("update PM_WorkReportWeekBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸æå";
			objJsonResult.data = null;
			//åå®¡æ ¸åæ§å¶=========================================
			string sql1 = "exec h_p_PM_WorkReportWeekBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
			ds = oCn.RunProcReturn(sql1, "h_p_PM_WorkReportWeekBill_BeforeUnCheckCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :åå®¡æ ¸åå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			return objJsonResult;

			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//===========================================================

			//åå®¡æ ¸æäº¤AbandonCheck
			if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_PM_WorkReportWeekBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			oCn.Commit();

			return objJsonResult;
			}
			catch (Exception e)
			{
			oCn.RollBack();

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥æèåå®¡æ ¸å¤±è´¥ï¼" + e.ToString();
			@@ -1189,7 +1399,7 @@
			{
			try
			{
			//å¤ææ¯å¦æå é¤æé
			//å¤ææ¯å¦æå³éæé
			if (!DBUtility.ClsPub.Security_Log("PM_WorkReportWeekBillMain_Close", 1, false, user))
			{
			objJsonResult.code = "0";
			@@ -1237,22 +1447,22 @@

			oCn.BeginTran();

			if (IsAudit == 0) //å®¡æ ¸å¤æ
			if (IsAudit == 0) //å³éå¤æ
			{
			oCn.RunProc("update PM_WorkReportWeekBillMain set HChecker='" + user + "',HCheckDate=getdate() where HInterID=" + HInterID);
			oCn.RunProc("update PM_WorkReportWeekBillMain set HCloseMan='" + user + "',HCloseDate=getdate() where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸æå";
			objJsonResult.Message = "å³éæå";
			objJsonResult.data = null;
			}
			if (IsAudit == 1) //åå®¡æ ¸å¤æ
			{
			oCn.RunProc("update PM_WorkReportWeekBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);
			oCn.RunProc("update PM_WorkReportWeekBillMain set HCloseMan='',HCloseDate=null where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸æå";
			objJsonResult.Message = "åå³éæå";
			objJsonResult.data = null;
			}
			oCn.Commit();
			@@ -1270,5 +1480,59 @@
			}
			}
			#endregion

			#region å·¥ä½å¨æ»ç» å é¤
			/// <summary>
			///åæ°ï¼string HInterIDã
			///è¿åå¼ï¼objectã
			/// </summary>
			[Route("PM_WorkTaskWeekBill/PM_WorkReportWeekBillMainDelete")]
			[HttpGet]
			public object PM_WorkReportWeekBillMainDelete(string HInterID, string user)
			{
			try
			{
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("PM_WorkReportWeekBillMain_Drop", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ å é¤æéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (HInterID == null \|\| HInterID.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterIDä¸è½ä¸ºç©ºï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCn.BeginTran();

			oCn.RunProc("delete from PM_WorkReportWeekBillMain where HInterID = " + HInterID);
			//oCn.RunProc("delete from PM_WorkTaskWeekBillSub where HInterID='" + HInterID + "'");

			oCn.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤æåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}