设备管理

2025-09-23 15:11:18 +08:00
parent 657d1b7ab6
commit 308ca6df79
66 changed files with 7276 additions and 17 deletions
--- a/ZR.Service/mes/Device/DeviceTaskExecuteResultService.cs
+++ b/ZR.Service/mes/Device/DeviceTaskExecuteResultService.cs
@@ -0,0 +1,99 @@
+using System;
+using SqlSugar;
+using Infrastructure.Attribute;
+using Infrastructure.Extensions;
+using ZR.Model;
+
+using ZR.Model.MES.dev.Dto;
+using ZR.Model.MES.dev;
+using ZR.Service.MES.dev.IService;
+using ZR.Repository;
+
+using System.Linq;
+using static System.Runtime.InteropServices.JavaScript.JSType;
+
+namespace ZR.Service.MES.dev
+{
+    /// <summary>
+    /// 巡检/点检任务结果表Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(IDeviceTaskExecuteResultService), ServiceLifetime = LifeTime.Transient)]
+    public class DeviceTaskExecuteResultService : BaseService<DeviceTaskExecuteResult>, IDeviceTaskExecuteResultService
+    {
+        /// <summary>
+        /// 查询巡检/点检任务结果表列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<DeviceTaskExecuteResultDto> GetList(DeviceTaskExecuteResultQueryDto parm)
+        {
+            var predicate = Expressionable.Create<DeviceTaskExecuteResult>()
+                .AndIF(parm.PlanType>0,it=>it.PlanType==parm.PlanType)
+                .AndIF(!string.IsNullOrEmpty(parm.PlanName),it=>it.PlanName.Contains(parm.PlanName))
+                .AndIF(!string.IsNullOrEmpty(parm.DeviceName),it=>it.DeviceName.Contains(parm.DeviceName))
+                .AndIF(parm.Starttime> DateTime.MinValue, it=>it.UpdatedTime>= parm.Starttime)
+                .AndIF(parm.Endtime> DateTime.MinValue, it=>it.UpdatedTime <= parm.Endtime)
+                ;
+
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .OrderByDescending(it=>it.Id)
+                .ToPage<DeviceTaskExecuteResult, DeviceTaskExecuteResultDto>(parm);
+
+            return response;
+        }
+
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public DeviceTaskExecuteResult GetInfo(string Id)
+        {
+            var response = Queryable()
+                .Where(x => x.Id == Id)
+                .First();
+
+            return response;
+        }
+
+        /// <summary>
+        /// 添加巡检/点检任务结果表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public DeviceTaskExecuteResult AddDeviceTaskExecuteResult(DeviceTaskExecuteResult model)
+        {
+            return Context.Insertable(model).ExecuteReturnEntity();
+        }
+
+        /// <summary>
+        /// 修改巡检/点检任务结果表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int UpdateDeviceTaskExecuteResult(DeviceTaskExecuteResult model)
+        {
+            //var response = Update(w => w.Id == model.Id, it => new DeviceTaskExecuteResult1()
+            //{
+            //    PlanType = model.PlanType,
+            //    PlanName = model.PlanName,
+            //    DeviceName = model.DeviceName,
+            //    InspectName = model.InspectName,
+            //    FormType = model.FormType,
+            //    FormTitle = model.FormTitle,
+            //    FormName = model.FormName,
+            //    Person = model.Person,
+            //    Remark = model.Remark,
+            //    CreatedBy = model.CreatedBy,
+            //    CreatedTime = model.CreatedTime,
+            //    UpdatedBy = model.UpdatedBy,
+            //    UpdatedTime = model.UpdatedTime,
+            //});
+            //return response;
+            return Update(model, true);
+        }
+
+    }
+}