MES-WEB-API.git

			@@ -1160,7 +1160,28 @@
			return objJsonResult;
			}
			//==================================================================================

			//判断单据状态
			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 (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据在审核中!不能进行删除!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//进行会计期间结账的判断和控制
			string s = "";
			int sYear = 0;
			@@ -1881,6 +1902,14 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6" )
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据在审核中!不能进行作废!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//作废单据
			if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			@@ -1913,6 +1942,14 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未作废!不需要再反作废!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["状态"].ToString() == "审核中")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据在审核中!不能进行作废!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -2399,6 +2436,66 @@

			#endregion

			#region 采购订单驳回
			[Route("Cg_POOrderBill/RejectCheckFlow_POOrderBill")]
			[HttpGet]
			public object RejectCheckFlow_POOrderBill(string HInterID,string CurUserID)
			{
			try
			{
			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID); //对HInterID进行类型的转换
			DAL.ClsCg_POOrderBill oBill = new DAL.ClsCg_POOrderBill(); //实例化单据操作类，用于进行相关操作
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //根据HInterID获取该单据的数据
			{
			if (oBill.omodel.HBillStatus != 6)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未在审核中不能驳回";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//发起驳回
			if (oBill.RejectCheckFlowProgress(lngBillKey, oBill.omodel.HBillNo,CurUserID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "驳回成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "驳回失败失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}

			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 采购订单发起审批
			[Route("Cg_POOrderBill/StartCheckFlow_POOrderBill")]
			[HttpGet]
			@@ -2455,7 +2552,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString();
			objJsonResult.Message = "发起审批失败失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -2469,9 +2566,9 @@
			/// <param name="IsAudit">审核(0),反审核(1)</param>
			/// <param name="CurUserName">审核人</param>
			/// <returns></returns>
			[Route("Cg_POOrderBill/AuditXs_POOrderBill_Flow")]
			[Route("Cg_POOrderBill/AuditCg_POOrderBill_Flow")]
			[HttpGet]
			public object AuditXs_POOrderBill_Flow(int HInterID, int IsAudit, string CurUserName, string CurUserID)
			public object AuditCg_POOrderBill_Flow(int HInterID, int IsAudit, string CurUserName, string CurUserID)
			{
			//string ModRightNameCheck = "Cg_POOrderBill_Check";
			DBUtility.ClsPub.CurUserName = CurUserName;
			@@ -2756,7 +2853,7 @@
			string HCheckFlowID = ds0.Tables[0].Rows[0]["HCheckFlowID"].ToString(); //审批流内码
			string HCheckItemNowID = "0"; //当前审批项目内码
			string HCheckItemNextID = "0"; //待审批项目内码
			if (oBill.omodel.HBillStatus <= 1)
			if (oBill.omodel.HBillStatus == 6)
			{
			for (int i = 0; i < ds0.Tables[0].Rows.Count; i++)
			{
			@@ -2801,7 +2898,7 @@
			oCN.RunProc(sql02);

			//判断反审核的单据是否已经审核完成，若审核完成，反审核需要变更单据状态。
			if (oBill.omodel.HBillStatus <= 1)
			if (oBill.omodel.HBillStatus == 6)
			{
			//更新单据主表的审批流数据
			string sql04 = "update " + oBill.MvarItemKey + " set HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + " where HInterID = " + lngBillKey;
			@@ -2815,13 +2912,13 @@
			}
			else
			{
			//更新单据主表的审批流数据
			string sql04 = "update " + oBill.MvarItemKey + " set HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + " where HInterID = " + lngBillKey;
			oCN.RunProc(sql04);

			//反审核提交AbandonCheck
			if (oBill.AbandonCheck(oCN, oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SeOrderBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			//更新单据主表的审批流数据
			string sql04 = "update " + oBill.MvarItemKey + " set HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + ",HBillStatus=6 "+" where HInterID = " + lngBillKey;
			oCN.RunProc(sql04);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "反审核成功";