~yxj/MES-WEB-API.git

			@@ -16,14 +16,14 @@
			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,string user)
			public object GetList(string sWhere, string user)
			{
			try
			{
			@@ -78,7 +78,7 @@
			#region [设备档案删除功能]
			[Route("Gy_EquipFileMain/Delete_EquipFile")]
			[HttpGet]
			public object Delete_EquipFile(string HItemID,string user)
			public object Delete_EquipFile(string HItemID, string user)
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Delete", 1, false, user))
			{
			@@ -181,11 +181,11 @@

			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) //设备规格
			@@ -212,6 +212,7 @@
			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))
			{
			@@ -227,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,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID) " +
			"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+ "','" + HMaker + "','" + HMakeDate +"','"+ HEquipMaintainRuleInterID+"','"+ HEquipDotCheckRuleInterID+
			"')", 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";
			@@ -254,7 +254,7 @@
			#endregion

			#region 设备档案修改保存


			[Route("Gy_EquipFileMain/EditBill")]
			[HttpPost]
			public object EditBill([FromBody] JObject oMain)
			@@ -310,6 +310,8 @@
			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))
			{
			@@ -341,28 +343,29 @@
			",HName='" + HName + "'" +
			",HModel='" + HModel + "'" +
			",HModel2='" + HModel2 + "'" +
			",HMaterID=" + HMaterID +
			",HUnitID=" + HUnitID +
			",HMaterID=" + HMaterID +
			",HUnitID=" + HUnitID +
			",HOutComDate='" + HOutComDate + "'" +
			",HOutComNo='" + HOutComNo + "'" +
			",HDeptID=" + HDeptID +
			",HDeptID=" + HDeptID +
			",HUseEmpID=" + HUseEmpID +
			",HRepairEmpID=" + HRepairEmpID +
			",HAddress='" + HAddress + "'" +
			",HSetupDate='" + HSetupDate + "'" +
			",HStartupDate='" + HStartupDate + "'" +
			",HStatus='" + HStatus + "'" +
			",HEquipFileTypeID=" + HEquipFileTypeID +
			",HEquipFileTypeID=" + HEquipFileTypeID +
			",HProNum='" + HProNum + "'" +
			",HBarCode='" + HBarCode + "'" +
			",HWorkArea='" + HWorkArea + "'" +
			",HLogo='" + HLogo + "'" +
			",HSellSupID=" + HSellSupID +
			",HSellSupID=" + HSellSupID +
			",HMakeSupID= " + HMakeSupID +
			",HUpDater= '" + HUpDater + "'" +
			",HUpDateDate= '" + HUpDateDate + "'" +
			",HEquipDotCheckRuleInterID='"+ HEquipDotCheckRuleInterID+"'"+
			",HEquipMaintainRuleInterID='"+ HEquipMaintainRuleInterID+"'"+
			",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);
			@@ -392,13 +395,13 @@
			public object Sb_EquipFileBillResumeDate(string HInterID)
			{

			DataTable ds,ds1;
			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];
			@@ -427,8 +430,8 @@
			public object Gy_MouldFileBillResumeDate(string HInterID)
			{

			DataTable ds,ds1,ds2,ds3;

			DataTable ds, ds1, ds2, ds3;

			long HInterID1 = long.Parse(HInterID);
			List<object> list = new List<object>();
			try
			@@ -461,5 +464,37 @@
			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
			}
			}