MES-WEB-API.git

			@@ -31,22 +31,22 @@
			{
			try
			{
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "无数据";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception e)
			{
			@@ -1152,11 +1152,21 @@
			/// <returns></returns>
			[Route("Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json")]
			[HttpGet]
			public object MES_QC_NoPassProdCheckBill_Json(string sWhere)
			public object MES_QC_NoPassProdCheckBill_Json(string sWhere,string user)
			{
			DataSet ds;
			try
			{
			//查看权限
			if (!DBUtility.ClsPub.Security_Log("QC_NoPassProdCheckBillQuery", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			@@ -1179,6 +1189,184 @@
			}
			return GetObjectJson(ds);
			}

			/// <summary>
			/// 不合格评审删除
			/// </summary>
			/// <param name="HInterID"></param>
			/// <param name="user"></param>
			/// <returns></returns>
			[Route("Sc_ProcessMangement/ProcessMangementDeleteBill")]
			[HttpGet]
			public object ProcessMangementDeleteBill(string HInterID, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("QC_NoPassProdCheckBill_Drop", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无权限删除";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from h_v_QC_NoPassProdCheckBillList where hmainid =" + HInterID + " ", "h_v_QC_NoPassProdCheckBillList");

			if (ds.Tables[0].Rows[0]["审核人"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核,不能删除!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.BeginTran();
			oCN.RunProc("Delete from QC_NoPassProdCheckBillMain where HInterID=" + HInterID);
			oCN.RunProc("Delete from QC_NoPassProdCheckBillSub where HInterID=" + HInterID);
			oCN.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功!";
			objJsonResult.data = null;
			return objJsonResult;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败!"+e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#region 不合格评审审核/反审核
			[Route("Sc_ProcessMangement/AuditProcessMangement")]
			[HttpGet]
			public object AuditProcessMangement(int HInterID, int IsAudit, string CurUserName)
			{
			string ModRightNameCheck = "QC_NoPassProdCheckBill_Check"; //该模块的审核功能
			DBUtility.ClsPub.CurUserName = CurUserName;//存储用户名
			try
			{
			////判断是否有审核权限
			if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (HInterID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ID小于0";
			objJsonResult.data = null;
			return objJsonResult;
			}

			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID);//数据转换

			//查询审核的数据
			ds = oCN.RunProcReturn("select * from QC_NoPassProdCheckBillMain where HInterID='" + HInterID + "'", "QC_NoPassProdCheckBillMain");

			if (ds.Tables[0].Rows.Count > 0)
			{
			var hcloseman = ds.Tables[0].Rows[0]["HCloseMan"].ToString();//关闭人
			var hdeleteman = ds.Tables[0].Rows[0]["HDeleteMan"].ToString();//作废人
			var hchecker = ds.Tables[0].Rows[0]["HChecker"].ToString();//审核人

			if (hcloseman != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前单据已关闭,无法审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (hdeleteman != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前单据已作废,无法审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//IsAudit==0 审核
			if (IsAudit == 1)
			{
			if (hchecker != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前单据已审核,无法再次审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//IsAudit==1 反审核
			if (IsAudit == 2)
			{
			if (hchecker == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			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 (IsAudit == 1)
			{
			oCN.RunProc(" Update QC_NoPassProdCheckBillMain set HChecker='" + CurUserName + "',HCheckDate='" + DateTime.Now + "',HBillStatus=2 Where HBillType='7509' and HInterID=" + HInterID);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "审核成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//反审核提交
			if (IsAudit == 2)
			{
			oCN.RunProc(" Update QC_NoPassProdCheckBillMain set HChecker='',HCheckDate=null,HBillStatus=0 Where HBillType='7509' and HInterID=" + HInterID);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "反审核成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败或反审核失败" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			/// <summary>
			/// PDA工序汇报单保存
			@@ -1617,12 +1805,23 @@
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string user = sArray[2].ToString();


			string UserName="";
			ListModels oListModels = new ListModels();
			try
			{
			//判断权限
			if (!DBUtility.ClsPub.Security_Log("QC_NoPassProdCheckBill_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限";
			objJsonResult.data = null;
			return objJsonResult;
			}

			DLL.ClsQC_NoPassProdCheckBill oBill = new DLL.ClsQC_NoPassProdCheckBill();
			List<Model.ClsQC_NoPassProdCheckBillMain> lsmain = new List<Model.ClsQC_NoPassProdCheckBillMain>();
			msg2 = msg2.Replace("\\", "");