MES-WEB-API.git

			@@ -7,6 +7,7 @@
			using System.Web.Http;
			using WebAPI.Models;
			using Newtonsoft.Json;
			using DBUtility;

			namespace WebAPI.Controllers.SCGL
			{
			@@ -18,6 +19,7 @@
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			JIT_Cg_PODemandPlanBillMain omdelMian = new JIT_Cg_PODemandPlanBillMain();
			List<JIT_Cg_PODemandPlanBillSub> omodelsub = new List<JIT_Cg_PODemandPlanBillSub>();
			public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();

			#region ææè®¡åå åè¡¨
			[Route("JIT_Cg_PODemandPlanBill/JIT_Cg_PODemandPlanBillList")]
			@@ -26,6 +28,7 @@
			{
			try
			{
			List<object> a = new List<object>();
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("JIT_Cg_PODemandPlanBill_Query", 1, false, user))
			{
			@@ -37,11 +40,17 @@
			}

			ds = oCN.RunProcReturn("select * from h_v_JIT_Cg_PODemandPlanBillList where 1=1" + sWhere + "order by hmainid desc ", "h_v_JIT_Cg_PODemandPlanBillList");

			foreach (DataColumn col in ds.Tables[0].Columns)//éådsä¸ç¬¬ä¸ä¸ªè¡¨ï¼Tables[0]ï¼çææåï¼Columnsï¼æ¯æ¬¡å¾ªç¯ä¸ï¼colåéä¼ææå½ååçå¼ç¨
			{
			Type dataType = col.DataType; //è·åå½åæ°æ®ç±»åä¼ å¥ èªå®ä¹åédatadataType
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //åç¬¦ä¸²æ¼æ¥ // å°åååæ°æ®ç±»åä¿¡æ¯æ¼æ¥æä¸ä¸ªJSONæ ¼å¼çåç¬¦ä¸²
			a.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = a;
			return objJsonResult;
			}
			catch (Exception e)
			@@ -260,6 +269,117 @@
			}
			#endregion

			#region ææè®¡åå å®¡æ ¸/åå®¡æ ¸åè½
			[Route("JIT_Cg_PODemandPlanBill/CheckPODemandPlanBillList")]
			[HttpGet]
			public object CheckPODemandPlanBillList(string HInterID, int Type, string user)
			{
			try
			{
			//å¤ææ¯å¦æå é¤æé
			if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_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 = "JIT_Cg_PODemandPlanBillMain";
			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))
			{

			}
			else
			{
			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("JIT_Cg_PODemandPlanBill/ClosePODemandPlanBillList")]
			[HttpGet]
			@@ -281,11 +401,11 @@

			if (ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["åæ®ç¶æ"].ToString() == "2")
			if (ds.Tables[0].Rows[0]["åæ®ç¶æ"].ToString() == "3")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å½ååæ®æ£å¨å®¡æ ¸,ä¸è½å³éï¼";
			objJsonResult.Message = "å½ååæ®å·²å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -321,8 +441,70 @@
			}
			#endregion

			#region ææè®¡åå åå³é
			[Route("JIT_Cg_PODemandPlanBill/CancelClosePODemandPlanBillList")]
			[HttpGet]
			public object CancelClosePODemandPlanBillList(string HInterID, string User)
			{
			try
			{
			//å³éæé
			if (!DBUtility.ClsPub.Security_Log_second("JIT_Cg_PODemandPlanBill_Close", 1, false, User))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æéå³éï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from h_v_JIT_Cg_PODemandPlanBillList where 1=1 and hmainid=" + HInterID, "h_v_JIT_Cg_PODemandPlanBillList");

			if (ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["åæ®ç¶æ"].ToString() != "3")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å½ååæ®æ²¡æå¤äºå³éç¶æ!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.BeginTran();//å¼å¯äºå¡

			string HBillStatus = ds.Tables[0].Rows[0]["å®¡æ ¸äºº"].ToString() == "" ? "1" : "2";
			oCN.RunProc($"update JIT_Cg_PODemandPlanBillMain set HBillStatus='{HBillStatus}',HCloseMan='',HCloseDate=null where HInterID={HInterID}");

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

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			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 ææè®¡åå ææè®¡åæ¥è¡¨(éè´è®¢åç»´åº¦)
			public class ReportPODemandPlanBill
			public class ReportPODemandPlanBill
			{
			public int? HORGID;
			public DateTime HBEGINDATE;
			@@ -338,8 +520,9 @@
			{
			try
			{
			List<object> a = new List<object>();
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("JIT_Cg_PODemandPlanBill_Query", 1, false, user))
			if (!DBUtility.ClsPub.Security_Log("JIT_ReportPODemandPlanBillList_S", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -347,14 +530,28 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//æ¥çä¾åºåæé
			if (DBUtility.ClsPub.Security_Log("JIT_ReportPODemandPlanBillList_AllSup", 1, false, user))
			{
			user = "0";
			}

			ReportPODemandPlanBill Report = JsonConvert.DeserializeObject<ReportPODemandPlanBill>(sWhere);

			ds = oCN.RunProcReturn($"exec h_p_JIT_PODemandPlanBill_ReportList {Report.HORGID},'{Report.HBEGINDATE}','{Report.HENDDATE}',{Report.HMATERIALID},{Report.HSUPPLIERID},'{Report.HXQD}','{Report.HPURORDERNO}' ", "h_p_JIT_PODemandPlanBill_ReportList");
			ds = oCN.RunProcReturn($"exec h_p_JIT_PODemandPlanBill_ReportList {Report.HORGID},'{Report.HBEGINDATE}','{Report.HENDDATE}',{Report.HMATERIALID},{Report.HSUPPLIERID},'{Report.HXQD}','{Report.HPURORDERNO}','{user}' ", "h_p_JIT_PODemandPlanBill_ReportList");

			foreach (DataColumn col in ds.Tables[0].Columns)//éådsä¸ç¬¬ä¸ä¸ªè¡¨ï¼Tables[0]ï¼çææåï¼Columnsï¼æ¯æ¬¡å¾ªç¯ä¸ï¼colåéä¼ææå½ååçå¼ç¨
			{
			Type dataType = col.DataType; //è·åå½åæ°æ®ç±»åä¼ å¥ èªå®ä¹åédatadataType
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //åç¬¦ä¸²æ¼æ¥ // å°åååæ°æ®ç±»åä¿¡æ¯æ¼æ¥æä¸ä¸ªJSONæ ¼å¼çåç¬¦ä¸²
			a.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = a;
			return objJsonResult;
			}
			catch (Exception e)
			@@ -371,12 +568,12 @@
			#region ææè®¡åå ææè®¡åæ¥è¡¨
			[Route("JIT_Cg_PODemandPlanBill/ReportPODemandPlanBillList_S")]
			[HttpGet]
			public object ReportPODemandPlanBillList_S(string sWhere, string user)
			public object ReportPODemandPlanBillList_S(string sWhere, string user,string HBEGINDATE,string HENDDATE)
			{
			try
			{
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("JIT_Cg_PODemandPlanBill_Query", 1, false, user))
			if (!DBUtility.ClsPub.Security_Log("JIT_ReportPODemandPlanBillList_S", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -384,8 +581,13 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//æ¥çä¾åºåæé
			if (DBUtility.ClsPub.Security_Log("JIT_ReportPODemandPlanBillList_AllSup", 1, false, user))
			{
			user = "0";
			}

			ds = oCN.RunProcReturn($"exec h_p_JIT_PODemandPlanBill_S_ReportList '{sWhere.ToString()}' ", "h_p_JIT_PODemandPlanBill_S_ReportList");
			ds = oCN.RunProcReturn($"exec h_p_JIT_PODemandPlanBill_S_ReportList '{sWhere.ToString()}','{HBEGINDATE}','{HENDDATE}','{user}' ", "h_p_JIT_PODemandPlanBill_S_ReportList");

			objJsonResult.code = "1";
			objJsonResult.count = 1;