~yxj/MES-WEB-API.git

			@@ -16,51 +16,52 @@
			private json objJsonResult = new json();
			public DataSet ds = new DataSet();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			public DLL.ClsGy_EquipFileMain BillNew0 = new DLL.ClsGy_EquipFileMain();
			public DLL.ClsGy_EquipFileMain BillOld0 = new DLL.ClsGy_EquipFileMain();
			public DLL.ClsGy_EquipFileMain BillNew0 = new DLL.ClsGy_EquipFileMain();
			public DLL.ClsGy_EquipFileMain BillOld0 = new DLL.ClsGy_EquipFileMain();

			#region 设备档案列表

			[Route("Gy_EquipFileMain/GetList")]
			[HttpGet]
			public object GetList(string sWhere)
			public object GetList(string sWhere, string user)
			{
			try
			{
			//if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "没有查看权限";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileList", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有查看权限";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select *from h_v_Gy_EquipFileMainList " + sWhere + "order by 日期 desc", "h_v_Gy_EquipFileMainList");
			ds = oCN.RunProcReturn("select * from h_v_Gy_EquipFileMainList " + sWhere + " order by hmainid desc", "h_v_Gy_EquipFileMainList");
			}
			else
			{
			string sql1 = "select * from h_v_Gy_EquipFileMainList where 1 = 1 ";
			string sql = sql1 + sWhere + "order by 日期 desc";
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_EquipFileMainList");
			}
			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 = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			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)
			{
			@@ -77,8 +78,17 @@
			#region [设备档案删除功能]
			[Route("Gy_EquipFileMain/Delete_EquipFile")]
			[HttpGet]
			public object Delete_EquipFile(string HItemID)
			public object Delete_EquipFile(string HItemID, string user)
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_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);
			@@ -93,23 +103,12 @@
			DLL.ClsGy_EquipFileMain oBill = new DLL.ClsGy_EquipFileMain();
			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_EquipFileBillMain where HInterID=" + lngBillKey);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			@@ -168,30 +167,39 @@
			string msg3 = sArray[1].ToString();
			string msg4 = sArray[2].ToString();

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

			//反序列化
			msg2 = "[" + msg2.ToString() + "]";

			List<Models.ClsGy_EquipFileMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileMain>>(msg2);

			string hbillno= list[0].HBillNo;
			string hbillno = list[0].HBillNo;
			string HYear = DateTime.Now.Year.ToString();
			DateTime HDate = list[0].HDate;
			long HInterID = list[0].HInterID;
			string HEquipFileNumber = list[0].HEquipFileNumber;
			string HEquipFileNumber = list[0].HEquipFileNumber;
			string HEquipFileNo = list[0].HEquipFileNo; // varchar(50) //设备编码(唯一)
			string HName = list[0].HName; // √ varchar(100) //设备名称
			string HModel = list[0].HModel; // √ varchar(100) //设备规格
			string HModel2 = list[0].HModel2; // √ varchar(100) //设备型号
			int HMaterID = list[0].HMaterID; // √ int //对应物料
			int HUnitID = list[0].HUnitID; // √ int //单位
			DateTime HOutComDate = list[0].HOutComDate; // √ datetime //设备出厂日期
			string HOutComDate = list[0].HOutComDate; // √ datetime //设备出厂日期
			string HOutComNo = list[0].HOutComNo; // √ varchar(100) //设备出厂编号
			int HDeptID = list[0].HDeptID; // √ int //使用部门（gy_Department）
			int HUseEmpID = list[0].HUseEmpID; //√ int //使用负责人（gy_Employee）
			int HRepairEmpID = list[0].HRepairEmpID; //√ int //维护负责人（gy_Employee）
			string HAddress = list[0].HAddress; // √ varchar(500) //安装地点
			DateTime HSetupDate = list[0].HSetupDate; //√ datetime //安装日期
			DateTime HStartupDate = list[0].HStartupDate; //√ datetime //运行开始日期
			string HSetupDate = list[0].HSetupDate; //√ datetime //安装日期
			string HStartupDate = list[0].HStartupDate; //√ datetime //运行开始日期
			string HStatus = list[0].HStatus; // √ varchar(20) //当前状态（空闲、占用、加工、关机、异常停机）
			int HEquipFileTypeID = list[0].HEquipFileTypeID; //√ int //设备类别（Gy_EquipFileType)
			string HProNum = list[0].HProNum; // √ varchar(100) //工程编码
			@@ -202,6 +210,9 @@
			int HMakeSupID = list[0].HMakeSupID; // int //制造商 (Gy_Supplier)
			string HMaker = msg4;
			string HMakeDate = DateTime.Now.Date.ToString();
			int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
			int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
			int HSourceID = list[0].HSourceID;

			if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
			{
			@@ -217,12 +228,11 @@
			oCN.RunProc("Insert into Gy_EquipFileBillMain " +
			" (hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
			",HOutComNo,HDeptID,HUseEmpID,HRepairEmpID,HAddress,HSetupDate,HStartupDate,HStatus," +
			"HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear) " +
			"HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID,HSourceID) " +
			" Values('" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
			",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress +
			"','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum +
			"','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +"','"+ HYear+
			"')", ref DBUtility.ClsPub.sExeReturnInfo);
			"','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID + ",'3308','" + HDate + "','" + HYear + "','" + HMaker + "','" + HMakeDate + "','" + HEquipMaintainRuleInterID + "','" + HEquipDotCheckRuleInterID +"'," + HSourceID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.Commit();
			objJsonResult.code = "1";
			@@ -244,7 +254,7 @@
			#endregion

			#region 设备档案修改保存


			[Route("Gy_EquipFileMain/EditBill")]
			[HttpPost]
			public object EditBill([FromBody] JObject oMain)
			@@ -259,6 +269,15 @@
			string msg3 = sArray[1].ToString();
			string msg4 = sArray[2].ToString();

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

			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<Models.ClsGy_EquipFileMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileMain>>(msg2);
			@@ -271,14 +290,14 @@
			string HModel2 = list[0].HModel2; // √ varchar(100) //设备型号
			int HMaterID = list[0].HMaterID; // √ int //对应物料
			int HUnitID = list[0].HUnitID; // √ int //单位
			DateTime HOutComDate = list[0].HOutComDate; // √ datetime //设备出厂日期
			string HOutComDate = list[0].HOutComDate; // √ datetime //设备出厂日期
			string HOutComNo = list[0].HOutComNo; // √ varchar(100) //设备出厂编号
			int HDeptID = list[0].HDeptID; // √ int //使用部门（gy_Department）
			int HUseEmpID = list[0].HUseEmpID; //√ int //使用负责人（gy_Employee）
			int HRepairEmpID = list[0].HRepairEmpID; //√ int //维护负责人（gy_Employee）
			string HAddress = list[0].HAddress; // √ varchar(500) //安装地点
			DateTime HSetupDate = list[0].HSetupDate; //√ datetime //安装日期
			DateTime HStartupDate = list[0].HStartupDate; //√ datetime //运行开始日期
			string HSetupDate = list[0].HSetupDate; //√ datetime //安装日期
			string HStartupDate = list[0].HStartupDate; //√ datetime //运行开始日期
			string HStatus = list[0].HStatus; // √ varchar(20) //当前状态（空闲、占用、加工、关机、异常停机）
			int HEquipFileTypeID = list[0].HEquipFileTypeID; //√ int //设备类别（Gy_EquipFileType)
			string HProNum = list[0].HProNum; // √ varchar(100) //工程编码
			@@ -289,6 +308,10 @@
			int HMakeSupID = list[0].HMakeSupID; // int //制造商 (Gy_Supplier)
			string HUpDater = msg4;
			string HUpDateDate = DateTime.Now.Date.ToString();
			int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
			int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
			int HSourceID = list[0].HSourceID;


			if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
			{
			@@ -316,30 +339,33 @@
			//主表
			oCN.RunProc("Update Gy_EquipFileBillMain set " +
			" HEquipFileNumber='" + HEquipFileNumber + "'" +
			" HEquipFileNo='" + HEquipFileNo + "'" +
			" HName='" + HName + "'" +
			" HModel='" + HModel + "'" +
			" HModel2='" + HModel2 + "'" +
			" HMaterID=" + HMaterID +
			" HUnitID=" + HUnitID +
			" HOutComDate='" + HOutComDate + "'" +
			" HOutComNo='" + HOutComNo + "'" +
			" HDeptID=" + HDeptID +
			" HUseEmpID=" + HUseEmpID +
			" HRepairEmpID=" + HRepairEmpID +
			" HAddress='" + HAddress + "'" +
			" HSetupDate='" + HSetupDate + "'" +
			" HStartupDate='" + HStartupDate + "'" +
			" HStatus='" + HStatus + "'" +
			" HEquipFileTypeID=" + HEquipFileTypeID +
			",HEquipFileNo='" + HEquipFileNo + "'" +
			",HName='" + HName + "'" +
			",HModel='" + HModel + "'" +
			",HModel2='" + HModel2 + "'" +
			",HMaterID=" + HMaterID +
			",HUnitID=" + HUnitID +
			",HOutComDate='" + HOutComDate + "'" +
			",HOutComNo='" + HOutComNo + "'" +
			",HDeptID=" + HDeptID +
			",HUseEmpID=" + HUseEmpID +
			",HRepairEmpID=" + HRepairEmpID +
			",HAddress='" + HAddress + "'" +
			",HSetupDate='" + HSetupDate + "'" +
			",HStartupDate='" + HStartupDate + "'" +
			",HStatus='" + HStatus + "'" +
			",HEquipFileTypeID=" + HEquipFileTypeID +
			",HProNum='" + HProNum + "'" +
			",HBarCode='" + HBarCode + "'" +
			",HWorkArea='" + HWorkArea + "'" +
			",HLogo=" + HLogo +
			",HSellSupID=" + HSellSupID +
			",HLogo='" + HLogo + "'" +
			",HSellSupID=" + HSellSupID +
			",HMakeSupID= " + HMakeSupID +
			",HUpDater= " + HUpDater +
			",HUpDateDate= " + HUpDateDate +
			",HUpDater= '" + HUpDater + "'" +
			",HUpDateDate= '" + HUpDateDate + "'" +
			",HEquipDotCheckRuleInterID='" + HEquipDotCheckRuleInterID + "'" +
			",HEquipMaintainRuleInterID='" + HEquipMaintainRuleInterID + "'" +
			",HSourceID='" + HSourceID + "'" +
			" Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -362,5 +388,113 @@
			}
			}
			#endregion

			#region[设备履历(点击主表带出从表)]
			[Route("Gy_EquipFileMain/Sb_EquipFileBillResumeDate")]
			[HttpGet]
			public object Sb_EquipFileBillResumeDate(string HInterID)
			{

			DataTable ds, ds1;
			long HInterID1 = long.Parse(HInterID);
			List<object> list = new List<object>();
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取配件项目编辑数据
			string sql1 = string.Format($"exec h_p_Gy_EquipRecord {HInterID1}");
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_EquipRecord").Tables[0];
			ds1 = oCN.RunProcReturn(sql1, "h_p_Gy_EquipRecord").Tables[1];

			list.Add(ds);//日常记录
			list.Add(ds1);//维修记录
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.list = list;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			}
			return objJsonResult;
			}
			#endregion

			#region[器具履历(点击主表带出从表)]
			[Route("Gy_EquipFileMain/Gy_MouldFileBillResumeDate")]
			[HttpGet]
			public object Gy_MouldFileBillResumeDate(string HInterID)
			{

			DataTable ds, ds1, ds2, ds3;

			long HInterID1 = long.Parse(HInterID);
			List<object> list = new List<object>();
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取配件项目编辑数据
			string sql1 = string.Format($"exec h_p_Gy_MouldRecord {HInterID1}");
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_MouldRecord").Tables[0];
			ds1 = oCN.RunProcReturn(sql1, "h_p_Gy_MouldRecord").Tables[1];
			ds2 = oCN.RunProcReturn(sql1, "h_p_Gy_MouldRecord").Tables[2];
			ds3 = oCN.RunProcReturn(sql1, "h_p_Gy_MouldRecord").Tables[3];

			list.Add(ds);//出入库记录
			list.Add(ds1);//器具耗用记录
			list.Add(ds2);//日常记录
			list.Add(ds3);//维修记录

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.list = list;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			}
			return objJsonResult;
			}
			#endregion

			#region[根据条码返回设备信息]
			[Route("Gy_EquipFileMain/Gy_MouldFileBillBarCodeInfo")]
			[HttpGet]
			public object Gy_MouldFileBillBarCodeInfo(string HBarCode)
			{
			DataTable ds;
			List<object> list = new List<object>();
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取配件项目编辑数据
			string sql1 = string.Format($"exec h_p_Gy_EquipFileGetInfoByBarCode {HBarCode}");
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_EquipFileGetInfoByBarCode").Tables[0];

			list.Add(ds);//设备档案

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取设备信息成功！";
			objJsonResult.list = list;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！请检查条形码！" + e.ToString();
			objJsonResult.data = null;
			}
			return objJsonResult;
			}
			#endregion
			}
			}