~yxj/MES-WEB-API.git

			@@ -29,7 +29,7 @@
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBillList", 1, true, user))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBillList", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -93,79 +93,90 @@
			public object set_DeleteBill(string HInterID,string user)
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, true, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无删除权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			string s = "";
			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID);
			if (lngBillKey == 0)
			try
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据ID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			DLL.ClsSc_MouldRepairChangeBill oBill = new DLL.ClsSc_MouldRepairChangeBill();
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			if (oBill.omodel.HBillStatus > 1)
			lngBillKey = DBUtility.ClsPub.isLong(HInterID);
			if (lngBillKey == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据当前处于不能删除状态,不能删除！";
			objJsonResult.Message = "单据ID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (oBill.omodel.HChecker != ""&& oBill.omodel.HChecker != null)
			DLL.ClsSc_MouldRepairChangeBill oBill = new DLL.ClsSc_MouldRepairChangeBill();
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已经审核,不能删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (!DBUtility.Xt_BaseBillFun.Fun_AllowDeleteBill(oBill, ref s))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s + "，不允许删除";
			objJsonResult.data = null;
			return objJsonResult;
			}
			bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
			if (IsDete)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			if (oBill.omodel.HBillStatus > 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据当前处于不能删除状态,不能删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (oBill.omodel.HChecker != "" && oBill.omodel.HChecker != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已经审核,不能删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (!DBUtility.Xt_BaseBillFun.Fun_AllowDeleteBill(oBill, ref s))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s + "，不允许删除";
			objJsonResult.data = null;
			return objJsonResult;
			}
			bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
			if (IsDete)
			{
			objJsonResult.code = "1:" + lngBillKey;
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0:" + lngBillKey;
			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.Message = "单据未找到";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.code = "0:"+ lngBillKey;
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未找到";
			objJsonResult.Message = e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}

			}

			#endregion
			@@ -187,7 +198,7 @@
			try
			{
			////审核权限
			//if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
			//if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			@@ -294,7 +305,7 @@
			try
			{
			////审核权限
			//if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
			//if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			@@ -427,7 +438,7 @@
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Edit", 1, true, msg3))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Edit", 1, false, msg3))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -571,7 +582,7 @@
			{
			//flag=1 审核； flag=2 反审核
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Check", 1, true, user))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Check", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;