MES-WEB-API.git

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

			namespace WebAPI.Controllers.ä»åç®¡ç.éªæ¶å¥åº
			{
			@@ -81,6 +82,7 @@
			{
			try
			{
			List<object> columnNameList = new List<object>(); //å®ä¹å£°æåé ï¼æéè¿ new List<object>()åå»ºç å®ä¾ï¼èµå¼ç»åé
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_IF_StepFoldInBillList order by hmainid desc", "h_v_IF_StepFoldInBillList");
			@@ -91,6 +93,12 @@
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_IF_StepFoldInBillList");
			}
			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)
			//{
			@@ -98,6 +106,7 @@
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;//å°columnNameListèµå¼ç»objJsonResultçlistå±æ§
			return objJsonResult;
			//}
			//else
			@@ -127,7 +136,7 @@
			{
			try
			{

			//List<object> columnNameList = new List<object>(); //å®ä¹å£°æåé ï¼æéè¿ new List<object>()åå»ºç å®ä¾ï¼èµå¼ç»åé
			ds = oCN.RunProcReturn("select * from h_v_IF_StepFoldInBillList where hmainid =" + HInterID, "h_v_IF_StepFoldInBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			@@ -139,10 +148,17 @@
			}
			else
			{
			//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åå¯¹è±¡çåå
			//}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			//objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			@@ -242,6 +258,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_StepFoldInBillList where hmainid=" + HInterID + " and åæ®å·='" + HBillNo + "'", "h_v_IF_StepFoldInBillList");

			@@ -253,12 +280,12 @@
			,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 + "','" + 1251 + "','" +
			1251 + "'," + 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)
			{ //ä¿®æ¹
			@@ -285,7 +312,7 @@
			String sql = "update Kf_ICStockBillMain set " +
			"HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
			",HSupID=" + HSupID + ",HWHID=" + HWHID + ",HSCWHID=" + HSCWHID + ", HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HSecManagerID = " + HSecManagerID
			+ ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + " where HInterID=" + HInterID;
			+ ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + ",HProjectID=" + HProjectID + " where HInterID=" + HInterID;

			oCN.RunProc(sql);

			@@ -402,6 +429,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();

			//åå¸å¼è°å¥åæ°å¢åå¡«åå¸å¼è°åºåå³èæ°é
			@@ -465,9 +504,19 @@
			return objJsonResult;
			}

			//è¿è¡ ä¼è®¡æé´ ç»è´¦ çå¤æåæ§å¶
			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;
			}

			ClsPub.CurUserName = user;
			BillOld.MvarItemKey = "Kf_ICStockBillMain";


			ds = oCN.RunProcReturn("select * from Kf_ICStockBillMain where HInterID = " + int.Parse(HInterID), "Kf_ICStockBillMain");
			string HBillNo = "";
			@@ -485,10 +534,6 @@
			{
			HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
			}




			//Type 1 å®¡æ ¸ 2 åå®¡æ ¸
			if (Type == 1)
			{
			@@ -512,7 +557,6 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (!BillOld.CheckBill(int.Parse(HInterID), HBillNo, "h_p_Cg_POInStockBill_AfterCheckCtrl", user, ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";