~yxj/MES-WEB-API.git

			@@ -17,34 +17,44 @@
			private json objJsonResult = new json();
			public DataSet ds = new DataSet();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			public DLL.ClsGy_EquipTypeBill BillNew0 = new DLL.ClsGy_EquipTypeBill(); //模具报废入库对应单据类
			public DLL.ClsGy_EquipTypeBill BillOld0 = new DLL.ClsGy_EquipTypeBill(); //模具报废入库对应单据类
			public DLL.ClsGy_EquipTypeBill BillNew0 = new DLL.ClsGy_EquipTypeBill();
			public DLL.ClsGy_EquipTypeBill BillOld0 = new DLL.ClsGy_EquipTypeBill();

			#region 设备分类列表

			[Route("Gy_EquipType/GetList")]
			[HttpGet]
			public object GetList(string sWhere)
			public object GetList(string sWhere,string user)
			{
			try
			{
			ds = Sc_GetEquipTypeList(sWhere);
			if (ds == null)
			if (!DBUtility.ClsPub.Security_Log("Gy_EquipTypeList", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查询数据异常，请与管理员联系！";
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "返回记录成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_EquipFileType where 1=1 " + sWhere+ " order by HItemID ", "Gy_EquipFileType");

			//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 ex)
			{
			@@ -56,28 +66,22 @@
			}
			}

			public static DataSet Sc_GetEquipTypeList(string sWhere)
			{
			string sql1 = string.Format(@"select * from h_v_Gy_EquipTypeList");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by HItemID desc", "h_v_Gy_EquipTypeList");
			}
			else
			{
			string sql = sql1 + sWhere + " order by HItemID desc";
			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_EquipTypeList");
			}

			}

			#endregion

			#region [设备分类删除功能]
			[Route("Gy_EquipType/Delete_EquipType")]
			[HttpGet]
			public object Delete_EquipType(string HItemID)
			public object Delete_EquipType(string HItemID,string user)
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_EquipType_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(HItemID);
			@@ -92,23 +96,12 @@
			DLL.ClsGy_EquipTypeBill oBill = new DLL.ClsGy_EquipTypeBill();
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			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;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.RunProc("Delete From Gy_EquipFileType where HItemID=" + lngBillKey);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			@@ -122,91 +115,183 @@

			#endregion

			#region 设备分类保存/编辑
			[Route("Gy_EquipType/SaveEquipTypeList")]
			#region 模治具分类新增保存
			/// <summary>
			/// 模治具分类-保存按钮
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_EquipType/AddBill")]
			[HttpPost]
			public object SaveEquipTypeList([FromBody] JObject msg)
			public object AddBill([FromBody] JObject oMain)
			{
			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string refSav = sArray[1].ToString();

			ListModels oListModels = new ListModels();
			try
			{
			DLL.ClsGy_EquipTypeBill oBill = new DLL.ClsGy_EquipTypeBill();
			List<Models.ClsGy_EquipFileType> lsmain = new List<Models.ClsGy_EquipFileType>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Gy_EquipFileType(msg2);
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg4 = sArray[2].ToString();

			long HItemID = lsmain[0].HItemID;
			string HNumber = lsmain[0].HNumber;
			string HName = lsmain[0].HName;
			string HShortNumber = lsmain[0].HNumber;
			long HParentID = lsmain[0].HParentID;
			long HLevel = lsmain[0].HLevel;
			string HHelpCode = lsmain[0].HHelpCode;
			string HRemark = lsmain[0].HRemark;
			bool HStopflag = lsmain[0].HStopflag;
			string HUseFlag = lsmain[0].HUseFlag;
			bool HEndFlag = lsmain[0].HEndFlag;
			if (!DBUtility.ClsPub.Security_Log("Gy_EquipType_Edit", 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//反序列化
			msg2 = "[" + msg2.ToString() + "]";

			if (refSav == "Add")
			List<Models.ClsGy_EquipFileType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileType>>(msg2);

			string HNumber = list[0].HNumber;
			string HName = list[0].HName;
			string HShortNumber = list[0].HNumber;
			long HParentID = list[0].HParentID;
			long HLevel = list[0].HLevel;
			string HHelpCode = list[0].HHelpCode;
			string HRemark = list[0].HRemark;
			bool HStopflag = list[0].HStopflag;
			string HUseFlag = list[0].HUseFlag;
			bool HEndFlag = list[0].HEndFlag;


			if (!DBUtility.ClsPub.AllowNumber(HNumber))
			{
			//若MAINDI重复则重新获取
			oCN.BeginTran();
			//主表
			oCN.RunProc("Insert into Gy_EquipFileType " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
			"," + HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_EquipFileType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "新增成功！";
			//objJsonResult.data = null;
			return objJsonResult;
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (refSav == "Update")
			{
			oCN.BeginTran();
			//主表
			oCN.RunProc("Update Gy_EquipFileType set " +
			" HNumber='" + HNumber + "'" +
			",HName='" + HName + "'" +
			",HShortNumber='" +HShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HParentID=" + HParentID +
			",HStopflag='" + HStopflag + "'" +
			",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);
			//将上级为非末级
			oCN.RunProc("Update Gy_EquipFileType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			//
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "修改成功！";
			//objJsonResult.data = null;
			return objJsonResult;
			}



			//若MAINDI重复则重新获取
			oCN.BeginTran();
			//主表
			oCN.RunProc("Insert into Gy_EquipFileType " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
			"," + HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_EquipFileType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "新增成功！";
			//objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			objJsonResult.Message = "Exception！" + e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			return false;
			}
			#endregion

			#region 模治具分类修改保存
			/// <summary>
			/// 修改单据-保存按钮
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_EquipType/EditBill")]
			[HttpPost]
			public object EditBill([FromBody] JObject oMain)
			{

			try
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string msg4 = sArray[2].ToString();

			if (!DBUtility.ClsPub.Security_Log("Gy_EquipType_Edit", 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<Models.ClsGy_EquipFileType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileType>>(msg2);

			long HItemID = int.Parse(msg3);
			string HNumber = list[0].HNumber;
			string HName = list[0].HName;
			string HShortNumber = list[0].HNumber;
			long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
			string HHelpCode = list[0].HHelpCode;
			string HRemark = list[0].HRemark;
			bool HStopflag = list[0].HStopflag;
			string HUseFlag = list[0].HUseFlag;

			if (!DBUtility.ClsPub.AllowNumber(HNumber))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			DataSet DS = oCN.RunProcReturn("Select * from Gy_EquipFileType Where HStopflag=0 and HNumber='" + HItemID + "' and HItemID<>" + HNumber, "Gy_EquipFileType", ref Pub_Class.ClsPub.sExeReturnInfo);
			if (DS.Tables[0].Rows.Count != 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "代码重复！";
			objJsonResult.data = null;
			return objJsonResult;
			}


			//若MAINDI重复则重新获取
			oCN.BeginTran();
			//主表
			oCN.RunProc("Update Gy_EquipFileType set " +
			" HNumber='" + HNumber + "'" +
			",HName='" + HName + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HParentID=" + HParentID +
			",HStopflag='" + HStopflag + "'" +
			",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);
			//将上级为非末级
			oCN.RunProc("Update Gy_EquipFileType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			//
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "修改成功！";
			//objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion