~yxj/MES-WEB-API.git

			@@ -1,4 +1,5 @@
			ï»¿using Newtonsoft.Json.Linq;
			ï»¿using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Pub_Class;
			using System;
			using System.Collections;
			@@ -21,27 +22,48 @@
			#region è¿åå·¥åºå·¥ä»·åè¡¨
			[Route("Gy_ProcPrice/list")]
			[HttpGet]
			public object list(string sWhere)
			public object list(string sWhere,string user)
			{
			try
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_ProcPriceList where 1 = 1 " + sWhere, "h_v_Gy_ProcPriceList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			List<object> columnNameList = new List<object>();
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("Gy_ProcPriceList", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "falseï¼";
			objJsonResult.Message = "æ æ¥çæéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else

			ds = oCN.RunProcReturn("select * from h_v_Gy_ProcPriceList where 1 = 1 " + sWhere, "h_v_Gy_ProcPriceList");

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

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "æ æ°æ®";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception e)
			{
			@@ -71,9 +93,19 @@
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string OperationType = sArray[2].ToString().Trim();
			string msg4 = sArray[3].ToString();
			bool bResult;
			try
			{
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("Gy_ProcPriceList_Edit", 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ ä¿åæéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			msg2 = "[" + msg2.ToString() + "]";
			List<ClsGy_ProcPrice> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_ProcPrice>>(msg2);
			List<ClsGy_ProcPrice> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_ProcPrice>>(msg3);
			@@ -156,36 +188,24 @@
			{
			try
			{
			ds = oCN.RunProcReturn("select " +
			"a.HItemID,a.HDeptID,b.HName HDeptName" +
			",a.HMaterID HMaterIDCol,c.HNumber HMaterNumberCol,c.HName HMaterNameCol,c.HModel HMaterModelCol" +
			",a.HProcID HProcIDCol,d.HNumber HProcNumberCol,d.HName HProcNameCol" +
			",a.HSourceID HSourceIDCol,e.HNumber HSourceNumberCol,e.HName HSourceNameCol" +
			",a.HPrice HPriceCol,a.HBeginDate HBeginDateCol,a.HEndDate HEndDateCol" +
			",case when a.HCostFlag<>0 then 'true'else 'false'end HCostFlagCol" +
			",case when a.HFlowFlag<>0 then 'true'else 'false'end HFlowFlagCol" +
			",case when a.HPayFlag<>0 then 'true'else 'false'end HPayFlagCol,a.HRemark HRemarkCol " +
			" from Gy_ProcPrice a " +
			" left join Gy_Department b on a.HDeptID = b.HItemID " +
			" left join Gy_Material c on a.HMaterID = c.HItemID " +
			" left join Gy_Process d on a.HProcID = d.HItemID " +
			" left join Gy_Source e on a.HSourceID = e.HItemID where HItemID = " + HItemID, "Gy_ProcPrice");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			List<object> columnNameList = new List<object>();

			ds = oCN.RunProcReturn("select * from h_v_Gy_ProcPriceList where HItemID = " + HItemID, "h_v_Gy_ProcPriceList");

			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "falseï¼";
			objJsonResult.data = null;
			return objJsonResult;
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			@@ -197,5 +217,203 @@
			}
			}
			#endregion

			#region å·¥åºå·¥ä»· å é¤
			[Route("Gy_ProcPrice/DelProcPrice")]
			[HttpGet]
			public object DelProcPrice(int HInterID, string User)
			{
			try
			{
			//å é¤æé
			if (!DBUtility.ClsPub.Security_Log_second("Gy_ProcPriceList_Delete", 1, false, User))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æéå é¤ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			DAL.ClsGy_ProcPrice_Ctl BillNew = new DAL.ClsGy_ProcPrice_Ctl();
			var sReturn = "";
			if (BillNew.ShowBill(HInterID, ref sReturn))
			{
			foreach (Model.ClsGy_ProcPrice_Model oSub in BillNew.DetailColl)
			{
			if (oSub.HChecker.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å½ååæ®ä¸è½å é¤ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}


			bool flag = false;
			oCN.BeginTran();//å¼å¯äºå¡

			flag= BillNew.DeleteByID(HInterID);

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

			if (flag)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤æåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			}

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å½ååæ®ä¸åå¨,æ æ³å é¤ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();//åæ»äºå¡
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region [å·¥åºå·¥ä»·å®¡æ ¸ãåå®¡æ ¸]
			/// <summary>
			///
			/// </summary>
			/// <param name="HInterID">åæ®ID</param>
			/// <param name="IsAudit">å®¡æ ¸(0),åå®¡æ ¸(1)</param>
			/// <param name="CurUserName">å®¡æ ¸äºº</param>
			/// <returns></returns>
			[Route("Gy_ProcPrice/AuditGy_ProcPrice")]
			[HttpGet]
			public object AuditGy_ProcPrice(int HInterID, int IsAudit, string CurUserName)
			{
			try
			{
			//å®¡æ ¸æé
			if (!DBUtility.ClsPub.Security_Log_second("Gy_ProcPriceList_Check", 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥ï¼æ æéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			DBUtility.ClsPub.CurUserName = CurUserName;
			DAL.ClsGy_ProcPrice_Ctl BillNew = new DAL.ClsGy_ProcPrice_Ctl();
			var sReturn = "";
			if (BillNew.ShowBill(HInterID, ref sReturn))
			{
			foreach (Model.ClsGy_ProcPrice_Model oSub in BillNew.DetailColl)
			{
			if (IsAudit == 0) //å®¡æ ¸å¤æ
			{
			if (oSub.HChecker.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (IsAudit == 1) //åå®¡æ ¸å¤æ
			{
			if (oSub.HChecker.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ä¸åå¨!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}

			foreach (Model.ClsGy_ProcPrice_Model oSub in BillNew.DetailColl)
			{
			if (IsAudit == 0) //å®¡æ ¸å¤æ
			{
			//å®¡æ ¸æäº¤
			if (BillNew.CheckBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (IsAudit == 1) //åå®¡æ ¸å¤æ
			{
			//åå®¡æ ¸æäº¤AbandonCheck
			if (BillNew.AbandonCheck(HInterID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥æèåå®¡æ ¸å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			}
			}