MES-WEB-API.git

			@@ -38,23 +38,23 @@
			{
			List<object> columnNameList = new List<object>();
			//查看权限
			//if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_Query", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无查看权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBackBillQuery", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_YS_ReceiveBackBillList_Query order by 单据号 ", "h_v_YS_ReceiveBackBillList_Query");
			ds = oCN.RunProcReturn("select * from h_v_YS_ReceiveBackBillList_Query order by 单据号 desc", "h_v_YS_ReceiveBackBillList_Query");
			}
			else
			{
			string sql1 = "select * from h_v_YS_ReceiveBackBillList_Query where 1 = 1 ";
			string sql = sql1 + sWhere + " order by 单据号 ";
			string sql = sql1 + sWhere + " order by 单据号 desc";
			ds = oCN.RunProcReturn(sql, "h_v_YS_ReceiveBackBillList_Query");
			}

			@@ -312,6 +312,8 @@
			{
			try
			{
			string s = "";

			//查看权限
			if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBackBill_Drop", 1, false, user))
			{
			@@ -328,6 +330,24 @@
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterID不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据有误！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//判断是否可编辑
			if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据已经被审核，不允许删除！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			@@ -449,6 +469,17 @@
			//进行需要进行的审核/反审核操作
			if (IsAudit == 0) //审核提交
			{
			string sql = "exec h_p_YS_ReceiveBackBill_CheckCrediControl " + oBill.omodel.HInterID;
			ds = oCN.RunProcReturn(sql, "h_p_YS_ReceiveBackBill_CheckCrediControl");
			if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}

			//审核提交
			if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{