MES-WEB-API.git

			@@ -1,4 +1,5 @@
			using DBUtility;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using System;
			using System.Collections.Generic;
			@@ -18,6 +19,7 @@
			private json objJsonResult = new json();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			DataSet ds;
			public DAL.ClsGy_QCCheckItem_Ctl BillOld = new DAL.ClsGy_QCCheckItem_Ctl();

			#region 检验项目列表数据
			/// <summary>
			@@ -31,6 +33,7 @@
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem_Query", 1, false, user))
			{
			@@ -52,12 +55,21 @@
			ds = oCN.RunProcReturn(sql, "h_v_IF_QCCheckItemList");
			}

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			//}
			//else
			@@ -241,6 +253,19 @@
			bool HStopflag = list[0].HStopflag;
			bool HUseFlag = list[0].HUseFlag;
			long HQCCheckClassID = list[0].HQCCheckClassID;
			string HDefaultResult = list[0].HDefaultResult;

			long HUnitID = list[0].HUnitID;
			string HAnalysisMethod = list[0].HAnalysisMethod;
			string HDefectLevel = list[0].HDefectLevel;
			long HDestructInspect = list[0].HDestructInspect;
			long HKeyInspect = list[0].HKeyInspect;
			long HQualityStdID = list[0].HQualityStdID;
			long HInspectMethodID = list[0].HInspectMethodID;
			long HInspectInstruMentID = list[0].HInspectInstruMentID;
			long HInspectBasisID = list[0].HInspectBasisID;
			long HSampleSchemeID = list[0].HSampleSchemeID;
			long HISsystemSet = list[0].HISsystemSet;

			if (!DBUtility.ClsPub.AllowNumber(HNumber))
			{
			@@ -258,9 +283,13 @@
			//主表
			oCN.RunProc("Insert Into Gy_QCCheckItem " +
			"(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HQCCheckClassID) " +
			",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HQCCheckClassID,HDefaultResult" +
			",HAnalysisMethod,HDefectLevel,HUnitID,HDestructInspect,HKeyInspect,HQualityStdID" +
			",HInspectMethodID,HInspectInstruMentID,HInspectBasisID,HSampleSchemeID,HISsystemSet) " +
			" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HItemID + "'" +
			",'"+ HLevel + "','0','" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','未使用','"+ HQCCheckClassID + "')");
			",'"+ HLevel + "','0','" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','未使用','"+ HQCCheckClassID + "','" + HDefaultResult +
			"','" + HAnalysisMethod + "','" + HDefectLevel + "'," + HUnitID + "," + HDestructInspect + "," + HKeyInspect + "," + HQualityStdID +
			"," + HInspectMethodID + "," + HInspectInstruMentID + "," + HInspectBasisID + "," + HSampleSchemeID + "," + HISsystemSet + ")");
			//修改上级为非末级代码
			if (list[0].HItemID.ToString() != "")
			{
			@@ -334,6 +363,19 @@
			bool HStopflag = list[0].HStopflag;
			bool HUseFlag = list[0].HUseFlag;

			string HDefaultResult = list[0].HDefaultResult;
			long HUnitID = list[0].HUnitID;
			string HAnalysisMethod = list[0].HAnalysisMethod;
			string HDefectLevel = list[0].HDefectLevel;
			long HDestructInspect = list[0].HDestructInspect;
			long HKeyInspect = list[0].HKeyInspect;
			long HQualityStdID = list[0].HQualityStdID;
			long HInspectMethodID = list[0].HInspectMethodID;
			long HInspectInstruMentID = list[0].HInspectInstruMentID;
			long HInspectBasisID = list[0].HInspectBasisID;
			long HSampleSchemeID = list[0].HSampleSchemeID;
			long HISsystemSet = list[0].HISsystemSet;

			if (!DBUtility.ClsPub.AllowNumber(HNumber))
			{
			objJsonResult.code = "0";
			@@ -364,6 +406,20 @@
			",HParentID=" + HParentID +
			",HStopflag='" + HStopflag + "'" +
			",HQCCheckClassID='" + HQCCheckClassID + "'" +
			",HDefaultResult='" + HDefaultResult + "'" +

			",HAnalysisMethod='" + HAnalysisMethod + "'" +
			",HDefectLevel='" + HDefectLevel + "'" +
			",HUnitID='" + HUnitID + "'" +
			",HDestructInspect='" + HDestructInspect + "'" +
			",HKeyInspect='" + HKeyInspect + "'" +
			",HQualityStdID='" + HQualityStdID + "'" +
			",HInspectMethodID='" + HInspectMethodID + "'" +
			",HInspectInstruMentID='" + HInspectInstruMentID + "'" +
			",HInspectBasisID='" + HInspectBasisID + "'" +
			",HSampleSchemeID='" + HSampleSchemeID + "'" +
			",HISsystemSet='" + HISsystemSet + "'" +

			",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -420,6 +476,37 @@
			}
			#endregion

			#region 检验项目修改获取绑定数据视图
			/// <summary>
			/// 维修列表修改按钮方法
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_CheckItem/xg_View")]
			[HttpGet]
			public object xg_View(long HInterID)
			{
			try
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_QCCheckItemList_Edit where HItemID=" + HInterID, "h_v_Gy_QCCheckItemList_Edit");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 检验项目获取树型列表数据
			[Route("Gy_CheckItem/LoadTree")]
			[HttpGet]
			@@ -447,5 +534,109 @@
			}
			}
			#endregion

			#region 检验项目审核/反审核
			[Route("Gy_CheckItem/AuditGy_CheckItem")]
			[HttpGet]
			public object AuditGy_CheckItem(string HInterID, int Type, string user)
			{
			try
			{
			//判断是否有审核权限
			if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem_Check", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无权限审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (string.IsNullOrWhiteSpace(HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ClsPub.CurUserName = user;
			oCN.BeginTran();//开始事务

			//Type 1 审核 2 反审核
			if (Type == 1)
			{
			//判断单据是否已经审核
			DataSet ds;
			string sql = "select * from Gy_QCCheckItem where HItemID = " + HInterID;
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0].Rows[0]["HCheckEmp"] != null && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能再次审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//审核单据
			if (!BillOld.AuditByID2(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			else
			{
			//判断单据是否已经反审核
			DataSet ds;
			string sql = "select * from Gy_QCCheckItem where HItemID = " + HInterID;
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCheckEmp"] == null \|\| ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未审核!不需要反审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//反审核单据
			if (!BillOld.DeAuditByID2(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "反审核失败!原因:" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			oCN.Commit();//提交事务

			objJsonResult.code = "0";
			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;
			}
			}
			#endregion

			}
			}