MES-WEB-API.git

			@@ -76,6 +76,7 @@
			{
			try
			{
			List<object> columnNameList = new List<object>(); //定义声明变量，把通过 new List<object>()创建的实例，赋值给变量
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user))
			{
			@@ -86,6 +87,7 @@
			return objJsonResult;
			}

			//if(sWhere=="" \|\| sWhere==null)
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList order by hmainid desc", "h_v_IF_POInStockBillList");
			@@ -96,13 +98,19 @@
			string sql = sql1 + sWhere + " order by 日期 desc,hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_IF_POInStockBillList");
			}

			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
			@@ -190,6 +198,18 @@
			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;
			}


			//先删除金蝶数据
			@@ -491,6 +511,18 @@
			string HSUPPLYADDRESS = mainList2[0].HSUPPLYADDRESS == null ? "''" : mainList2[0].HSUPPLYADDRESS;
			long HPROVIDERCONTACTID = mainList2[0].HPROVIDERCONTACTID == null ? 0 : mainList2[0].HPROVIDERCONTACTID;



			//进行会计期间结账的判断和控制
			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_POInStockBillList where hmainid=" + HInterID + " and 单据号='" + HBillNo + "'", "h_v_IF_POOrderBillList");
			if ((OperationType == 1 \|\| OperationType == 2 \|\| OperationType == 4) && ds.Tables[0].Rows.Count == 0)//新增
			{
			@@ -536,6 +568,26 @@
			}
			else if (OperationType == 3 \|\| ds.Tables[0].Rows.Count != 0)
			{ //修改
			DataSet dss;
			dss = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList where hmainid=" + HInterID + " and 单据号='" + HBillNo + "'", "h_v_IF_POOrderBillList");
			//判断是否可编辑
			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 Cg_POInStockBillMain set " +
			"HRemark='" + HRemark + "', HUpDater ='" + HMaker + "', HUpDateDate=getdate()" +
			",HSupID=" + HSupID + ",HCurID=" + HCurID
			@@ -939,6 +991,18 @@
			}
			//==================================================================================


			//进行会计期间结账的判断和控制
			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 (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POInStockBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			@@ -979,6 +1043,18 @@
			}
			//=========================================================


			//进行会计期间结账的判断和控制
			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
			if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POInStockBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{