~yxj/MES-WEB-API.git

			@@ -2128,7 +2128,7 @@
			#region 审核
			[Route("Cj_StationOutBill/set_CheckBill")]
			[HttpGet]
			public object set_CheckBill(int HInterID, string CurUserName)
			public object set_CheckBill(string HInterID, string CurUserName)
			{
			try
			{
			@@ -2142,54 +2142,64 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (HInterID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据ID为0，不能审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			var HBillNo = HInterID.Split(',');
			DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
			//查看是否已审核,关闭,作废
			if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))

			for (int i = 0; i < HBillNo.Length; i++)
			{
			if (oBill.omodel.HChecker.Trim() != "")
			if (HBillNo[i] == "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能再次审核";
			objJsonResult.Message = "第"+(i+1)+"行:单据ID为0，不能审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//查看是否已审核,关闭,作废
			if (oBill.ShowBill(long.Parse(HBillNo[i]), ref DBUtility.ClsPub.sExeReturnInfo))
			{
			if (oBill.omodel.HChecker.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + (i + 1) + "行:单据已审核!不能再次审核";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + (i + 1) + "行:单据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else

			int j = 0;
			for (int i = 0; i < HBillNo.Length; i++)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//审核
			if (Cj_StationOutBillCheckBill(HInterID, CurUserName, oBill.omodel.HLastSubProc, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			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;
			//审核
			if (Cj_StationOutBillCheckBill(long.Parse(HBillNo[i]), CurUserName, oBill.omodel.HLastSubProc, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			j += 1;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "成功:" + j + "行,第" + (i + 1) + "行:审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "全部执行成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			@@ -2246,7 +2256,7 @@
			#region 反审核
			[Route("Cj_StationOutBill/set_AbandonCheck")]
			[HttpGet]
			public object set_AbandonCheck(int HInterID, string CurUserName)
			public object set_AbandonCheck(string HInterID, string CurUserName)
			{
			try
			{
			@@ -2261,52 +2271,82 @@
			return objJsonResult;
			}

			if (HInterID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据ID为0，不能反审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			var HBillNo = HInterID.Split(',');
			DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
			//查看是否已审核,关闭,作废
			if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))

			//获取系统参数
			string Ret = "";
			oSystemParameter.ShowBill(ref Ret);

			for (int i = 0; i < HBillNo.Length; i++)
			{
			if (oBill.omodel.HChecker.Trim() == "")
			if (long.Parse(HBillNo[i]) == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未审核!不需要反审核!";
			objJsonResult.Message = "第" + (i + 1) + "行:单据ID为0，不能反审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//查看是否已审核,关闭,作废
			if (oBill.ShowBill(long.Parse(HBillNo[i]), ref DBUtility.ClsPub.sExeReturnInfo))
			{
			if (oBill.omodel.HChecker.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + (i + 1) + "行:单据未审核!不需要反审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//审核人必须和反审核人保持一致乔一
			if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
			{
			if (oBill.omodel.HChecker.Trim() != CurUserName)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + (i + 1) + "行:审核人和反审核人不一致!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + (i + 1) + "行:单据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else

			int j = 0;
			for (int i = 0; i < HBillNo.Length; i++)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//反审核
			if (Cj_StationOutBillAbandonCheckBill(long.Parse(HBillNo[i]), CurUserName, oBill.omodel.HLastSubProc, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			j += 1;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "成功:" + j + "行,第" + (i + 1) + "行:反审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//反审核
			if (Cj_StationOutBillAbandonCheckBill(HInterID, CurUserName, oBill.omodel.HLastSubProc, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			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;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "全部执行成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{