MES-WEB-API.git

			@@ -541,7 +541,16 @@
			objJsonResult.data = null;
			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;
			}

			//进行需要进行的审核/反审核操作
			if (IsAudit == 0) //审核提交
			@@ -578,21 +587,12 @@
			}
			//==================================================================================

			//进行会计期间结账的判断和控制
			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("exec h_p_Kf_SellOutBill_Check " + HInterID + ",'" + oBill.BillType + "','" + CurUserName + "'");
			//审核更新及时库存表减少库存
			ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory '" + HInterID + "','" + oBill.BillType + "','1'", "h_KF_UPDateICinventory");
			//写入日志
			string WorkList = "审核单据，单据号：" + oBill.omodel.HBillNo;
			string SystemName = "LMES-销售出库单模块";
			@@ -671,17 +671,6 @@
			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;
			}

			//反审核提交AbandonCheck
			//删除关联
			@@ -1199,5 +1188,90 @@
			}
			}
			#endregion

			#region 销售出库单下查
			/// <summary>
			/// </summary>
			/// <param name="HInterID">单据ID</param>
			/// <returns></returns>
			[Route("Kf_SellOutBill/SellOutBill_LookDown")]
			[HttpGet]
			public object SellOutBill_LookDown(int HInterID)
			{
			try
			{
			List<object> columnNameListSum = new List<object>();
			List<object> columnNameList0 = new List<object>();
			//List<object> columnNameList1 = new List<object>();
			//List<object> columnNameList2 = new List<object>();
			//List<object> columnNameList3 = new List<object>();
			//List<object> columnNameList4 = new List<object>();

			string sql = "exec h_p_Kf_SellOutBill_lookdown " + HInterID;
			ds = oCN.RunProcReturn(sql, "h_p_Kf_SellOutBill_lookdown");

			//添加销售调价单列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList0.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			////添加生产订单列名
			//foreach (DataColumn col in ds.Tables[1].Columns)
			//{
			// Type dataType = col.DataType;
			// string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			// columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			//}

			////添加特批申请单列名
			//foreach (DataColumn col in ds.Tables[2].Columns)
			//{
			// Type dataType = col.DataType;
			// string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			// columnNameList2.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			//}

			////添加销售出库单列名
			//foreach (DataColumn col in ds.Tables[3].Columns)
			//{
			// Type dataType = col.DataType;
			// string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			// columnNameList3.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			//}

			////添加工序流转卡列名
			//foreach (DataColumn col in ds.Tables[4].Columns)
			//{
			// Type dataType = col.DataType;
			// string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			// columnNameList4.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			//}

			columnNameListSum.Add(columnNameList0);
			//columnNameListSum.Add(columnNameList1);
			//columnNameListSum.Add(columnNameList2);
			//columnNameListSum.Add(columnNameList3);
			//columnNameListSum.Add(columnNameList4);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables;
			objJsonResult.list = columnNameListSum;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}