MES-WEB-API.git

			@@ -8,6 +8,7 @@
			using Newtonsoft.Json.Linq;
			using Model;
			using DBUtility;
			using Newtonsoft.Json;

			namespace WebAPI.Controllers.ä»åç®¡ç.é¢æåè´§
			{
			@@ -78,6 +79,7 @@
			{
			try
			{
			List<object> columnNameList = new List<object>(); //å®ä¹å£°æåé ï¼æéè¿ new List<object>()åå»ºç å®ä¾ï¼èµå¼ç»åé
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCn.RunProcReturn("select * from h_v_IF_StepFoldOutBillList order by hmainid desc", "h_v_IF_StepFoldOutBillList");
			@@ -88,13 +90,19 @@
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCn.RunProcReturn(sql, "h_v_IF_StepFoldOutBillList");
			}

			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æ ¼å¼çåç¬¦ä¸²
			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.data = ds.Tables[0];//ä»£ç å°ç¬¬ä¸ä¸ªDataTableï¼ç´¢å¼ä¸º0ï¼èµå¼ç»objJsonResultçdataå±æ§
			objJsonResult.list = columnNameList;//å°columnNameListèµå¼ç»objJsonResultçlistå±æ§
			return objJsonResult;
			//}
			//else
			@@ -238,6 +246,17 @@
			string HCloseMan = mainList[0].HCloseMan;
			string HCloseDate = mainList[0].HCloseDate;
			long HCurID = mainList[0].HCurID;
			long HProjectID = mainList[0].HProjectID; //-é¡¹ç®

			//è¿è¡ ä¼è®¡æé´ ç»è´¦ çå¤æåæ§å¶
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.Message = s;
			return objJsonResult;
			}

			ds = oCn.RunProcReturn("select * from h_v_IF_StepFoldOutBillList where hmainid=" + HInterID + " and åæ®å·='" + HBillNo + "'", "h_v_IF_StepFoldOutBillList");

			@@ -249,17 +268,40 @@
			,HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID
			,HMaker,HMakeDate,HChecker,HUpDater
			,HDeleteMan,HCloseMan
			,HRemark,HExplanation,HInnerBillNo,HCurID)
			,HRemark,HExplanation,HInnerBillNo,HCurID,HProjectID)
			values(" + HInterID + ",'" + HBillNo + "','" + HDate + "','" + 1250 + "','" +
			HBillSubType + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
			1250 + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
			"," + HWHID + "," + HSCWHID + "," + HEmpID + "," + HManagerID + "," + HSecManagerID +
			"," + HKeeperID + "," + HDeptID + ",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HUpDater + "','" + HDeleteMan + "','" + HCloseMan + "','"
			+ HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "" + ")");
			+ HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "," + HProjectID + "" + ")");
			}
			else if (OperationType == 3 \|\| ds.Tables[0].Rows.Count != 0)
			{ //ä¿®æ¹

			DataSet dss;
			dss = oCn.RunProcReturn("select * from h_v_IF_StepFoldOutBillList where hmainid=" + HInterID + " and åæ®å·='" + HBillNo + "'", "h_v_IF_StepFoldOutBillList");
			//å¤ææ¯å¦å¯ç¼è¾
			if (dss.Tables[0].Rows[0]["å®¡æ ¸äºº"].ToString() != "" && dss.Tables[0].Rows[0]["å®¡æ ¸äºº"] != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®å·²ç»è¢«å®¡æ ¸ï¼ä¸åè®¸ä¿®æ¹ï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (dss.Tables[0].Rows[0]["ç¶æ"].ToString() != "åå»º")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®å¤äºä¸å¯ç¼è¾ç¶æï¼ä¸åè®¸ä¿®æ¹ï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			String sql="update Kf_ICStockBillMain set " +
			"HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" + " where HInterID=" + "HInterID";
			"HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
			",HSupID=" + HSupID + ",HWHID=" + HWHID + ",HSCWHID=" + HSCWHID + ", HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HSecManagerID = " + HSecManagerID
			+ ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + ",HProjectID=" + HProjectID + " where HInterID=" + HInterID;

			oCn.RunProc(sql);
			//å é¤åè¡¨
			@@ -369,6 +411,18 @@
			{
			try
			{

			//è¿è¡ ä¼è®¡æé´ ç»è´¦ çå¤æåæ§å¶
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			DateTime HDate = DateTime.Now;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.Message = s;
			return objJsonResult;
			}

			oCn.BeginTran();
			oCn.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
			oCn.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
			@@ -433,6 +487,20 @@

			ds = oCn.RunProcReturn("select * from Kf_ICStockBillMain where HInterID = " + int.Parse(HInterID), "Kf_ICStockBillMain");
			string HBillNo = "";


			//è¿è¡ ä¼è®¡æé´ ç»è´¦ çå¤æåæ§å¶
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			DateTime HDate = DateTime.Now;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.Message = s;
			return objJsonResult;
			}


			oCn.BeginTran();//å¼å§äºå¡

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			@@ -447,8 +515,6 @@
			{
			HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
			}




			//Type 1 å®¡æ ¸ 2 åå®¡æ ¸
			@@ -719,25 +785,89 @@
			//Type 1 ä½åº 2 åä½åº
			if (Type == 1)
			{
			if (!BillOld.Cancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			DataSet ds;
			string sql = "select * from Kf_ICStockBillMain where HinterID = " + HInterID;
			ds = oCn.RunProcReturn(sql, "Kf_ICStockBillMain");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ä¸åå¨ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			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 (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(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			}
			else
			{
			if (!BillOld.AbandonCancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			DataSet ds;
			string sql = "select * from Kf_ICStockBillMain where HinterID = " + HInterID;
			ds = oCn.RunProcReturn(sql, "Kf_ICStockBillMain");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ä¸åå¨ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			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 (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(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			}

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