MES-WEB-API.git

			@@ -9837,6 +9837,546 @@
			}
			#endregion

			#region 保养级别设置列表/保存/编辑/删除方法
			/// <summary>
			/// 保养级别保存
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("SaveGy_MaintainLevList")]
			[HttpPost]
			public object SaveGy_MaintainLevList([FromBody] JObject msg)
			{
			DataSet ds;
			var _value = msg["msg"].ToString();
			string msg3 = _value.ToString();
			string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg1 = sArray[0].ToString();
			string msg2 = sArray[1].ToString();

			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Gy_MaintainLev_Edit", 1, false, msg2))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			Int64 HItemID = 0;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取最大ID值赋值
			DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_MaintainLev ", "Gy_MaintainLev");
			if (Maxds != null \|\| Maxds.Tables[0].Rows.Count > 0)
			{
			//HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
			var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
			maxid += 1;
			HItemID = maxid;
			}
			ListModels oListModels = new ListModels();
			try
			{

			WebAPI.DLL.ClsGy_MaintainLev_Ctl oBill = new WebAPI.DLL.ClsGy_MaintainLev_Ctl();
			List<Model.ClsGy_MaintainLev_Model> lsmain = new List<Model.ClsGy_MaintainLev_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", "");
			lsmain = oListModels.getObjectByJson_Gy_MaintainLev(msg1);
			foreach (Model.ClsGy_MaintainLev_Model oItem in lsmain)
			{
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码不能为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (oItem.HName.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！名称不能为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_MaintainLev where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_MaintainLev");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//新增时判断
			if (oItem.HItemID == 0)
			{
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{

			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			if (sParent.Trim() == "")
			{
			oBill.oModel.HParentID = 0;
			}
			else
			{
			if (oBill.HavParentCode(sParent.Trim(), HItemID))
			{
			oBill.oModel.HParentID = oBill.oModel.HItemID;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			}
			else//编辑时判断
			{
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			if (sParent.Trim() == "")
			{
			oBill.oModel.HParentID = 0;
			}
			else
			{
			if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
			{
			oBill.oModel.HParentID = oBill.oModel.HItemID;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			}
			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			if (sShortNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
			oItem.HMakeEmp = msg2; //创建人

			oBill.oModel = oItem;
			}

			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddNew();
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			/// <summary>
			///保养级别获取信息
			/// </summary>
			/// <returns></returns>
			[Route("GetGy_MaintainLevDetail")]
			[HttpGet]
			public ApiResult<DataSet> GetGy_MaintainLevDetail(string HID)
			{
			var model = LuBaoSevice.GetGy_MaintainLevDetail(HID);
			return model;
			}

			/// <summary>
			///保养级别删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetGy_MaintainLev")]
			[HttpGet]
			public object DeltetGy_MaintainLev(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_MaintainLev_Drop", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (string.IsNullOrWhiteSpace(HItemID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HItemID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();//开始事务


			oCN.RunProc("delete Gy_MaintainLev where HItemID=" + HItemID);
			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

			#region 启动检查项目设置列表/保存/编辑/删除方法
			/// <summary>
			/// 启动检查项目保存
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("SaveGy_CheckNoteItemList")]
			[HttpPost]
			public object SaveGy_CheckNoteItemList([FromBody] JObject msg)
			{
			DataSet ds;
			var _value = msg["msg"].ToString();
			string msg3 = _value.ToString();
			string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg1 = sArray[0].ToString();
			string msg2 = sArray[1].ToString();

			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Gy_CheckNoteItem_Edit", 1, false, msg2))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			Int64 HItemID = 0;
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取最大ID值赋值
			DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_CheckNoteItem ", "Gy_CheckNoteItem");
			if (Maxds != null \|\| Maxds.Tables[0].Rows.Count > 0)
			{
			var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
			maxid += 1;
			HItemID = maxid;
			}
			ListModels oListModels = new ListModels();
			try
			{

			WebAPI.DLL.ClsGy_CheckNoteItem_Ctl oBill = new WebAPI.DLL.ClsGy_CheckNoteItem_Ctl();
			List<Model.ClsGy_CheckNoteItem_Model> lsmain = new List<Model.ClsGy_CheckNoteItem_Model>();
			msg1 = msg1.Replace("\\", "");
			msg1 = msg1.Replace("\n", "");
			lsmain = oListModels.getObjectByJson_Gy_CheckNoteItem(msg1);
			foreach (Model.ClsGy_CheckNoteItem_Model oItem in lsmain)
			{
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码不能为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (oItem.HName.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！名称不能为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//查询数据中是否存在重复代码

			ds = oCN.RunProcReturn("select * from Gy_CheckNoteItem where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CheckNoteItem");
			if (oItem.HNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//新增时判断
			if (oItem.HItemID == 0)
			{
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{

			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			if (sParent.Trim() == "")
			{
			oBill.oModel.HParentID = 0;
			}
			else
			{
			if (oBill.HavParentCode(sParent.Trim(), HItemID))
			{
			oBill.oModel.HParentID = oBill.oModel.HItemID;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			}
			else//编辑时判断
			{
			//检查父级是否存在
			string sParent;
			sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
			if (sParent.Trim() == "")
			{
			oBill.oModel.HParentID = 0;
			}
			else
			{
			if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
			{
			oBill.oModel.HParentID = oBill.oModel.HItemID;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			}
			//得到短代码
			string sShortNumber;
			sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
			if (sShortNumber.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！短代码为空！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oItem.HShortNumber = sShortNumber;//短代码
			oItem.HEndFlag = true;//末级标志
			oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
			oItem.HMakeEmp = msg2; //创建人

			oBill.oModel = oItem;
			}

			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.oModel.HItemID == 0)
			{
			bResult = oBill.AddNew();
			}
			else
			{
			bResult = oBill.ModifyByID(oBill.oModel.HItemID);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			/// <summary>
			///启动检查项目获取信息
			/// </summary>
			/// <returns></returns>
			[Route("GetGy_CheckNoteItemDetail")]
			[HttpGet]
			public ApiResult<DataSet> GetGy_CheckNoteItemDetail(string HID)
			{
			var model = LuBaoSevice.GetGy_CheckNoteItemDetail(HID);
			return model;
			}

			/// <summary>
			///启动检查项目删除功能
			/// </summary>
			/// <returns></returns>
			[Route("DeltetGy_CheckNoteItem")]
			[HttpGet]
			public object DeltetGy_CheckNoteItem(string HItemID, string user)
			{
			DataSet ds;
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Gy_CheckNoteItem_Drop", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (string.IsNullOrWhiteSpace(HItemID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HItemID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();//开始事务


			oCN.RunProc("delete Gy_CheckNoteItem where HItemID=" + HItemID);
			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

			/// <summary>
			/// 用关联工序获取信息
			/// </summary>
			@@ -12217,7 +12757,7 @@
			ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //查询当前用户的自定义菜单数据
			if (ds.Tables[0]==null \|\| ds.Tables[0].Rows.Count == 0) //判断当前用户是否有设置过自定义信息，若记录数为0，则没有设置过，加载所有的菜单信息
			{
			sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition ";
			sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
			ds = oCn.RunProcReturn(sql, "Gy_Menu");
			}