agv调整

ZR.Service/mes/mm/IService/IMmIngredientTaskService.cs

@@ -0,0 +1,24 @@
+using System;
+using ZR.Model;
+using ZR.Model.Dto;
+using ZR.Model.MES.mm;
+using ZR.Model.MES.mm.Dto;
+using System.Collections.Generic;
+
+namespace ZR.Service.mes.mm.IService
+{
+    /// <summary>
+    /// 配料任务清单service接口
+    /// </summary>
+    public interface IMmIngredientTaskService : IBaseService<MmIngredientTask>
+    {
+        PagedInfo<MmIngredientTaskDto> GetList(MmIngredientTaskQueryDto parm);
+
+        MmIngredientTask GetInfo(int Id);
+
+        MmIngredientTask AddMmIngredientTask(MmIngredientTask parm);
+
+        int UpdateMmIngredientTask(MmIngredientTask parm);
+
+    }
+}

ZR.Service/mes/mm/MmIngredientTaskService.cs

@@ -0,0 +1,92 @@
+using System;
+using SqlSugar;
+using Infrastructure.Attribute;
+using Infrastructure.Extensions;
+using ZR.Model;
+
+using ZR.Repository;
+using ZR.Model.MES.mm;
+using ZR.Service.mes.mm.IService;
+using System.Linq;
+using ZR.Model.MES.mm.Dto;
+
+namespace ZR.Service.mes.mm
+{
+    /// <summary>
+    /// 配料任务清单Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(IMmIngredientTaskService), ServiceLifetime = LifeTime.Transient)]
+    public class MmIngredientTaskService : BaseService<MmIngredientTask>, IMmIngredientTaskService
+    {
+        /// <summary>
+        /// 查询配料任务清单列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<MmIngredientTaskDto> GetList(MmIngredientTaskQueryDto parm)
+        {
+            var predicate = Expressionable.Create<MmIngredientTask>()
+                .AndIF(parm.Starttime!=null&&parm.Starttime>new DateTime(1899,1,1),it=>it.CreatedTime>=parm.Starttime)
+                .AndIF(parm.Endtime!=null&&parm.Starttime>new DateTime(1899,1,1),it=>it.CreatedTime<=parm.Endtime)
+                .AndIF(!string.IsNullOrEmpty(parm.Workorder),it=>it.Workorder.Contains(parm.Workorder)); 
+
+            var response = Queryable()
+                .OrderByDescending(it=>it.CreatedTime)
+                .Where(predicate.ToExpression())
+                .ToPage<MmIngredientTask, MmIngredientTaskDto>(parm);
+
+            return response;
+        }
+
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public MmIngredientTask GetInfo(int Id)
+        {
+            var response = Queryable()
+                .Where(x => x.Id == Id)
+                .First();
+
+            return response;
+        }
+
+        /// <summary>
+        /// 添加配料任务清单
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public MmIngredientTask AddMmIngredientTask(MmIngredientTask model)
+        {
+            return Context.Insertable(model).ExecuteReturnEntity();
+        }
+
+        /// <summary>
+        /// 修改配料任务清单
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int UpdateMmIngredientTask(MmIngredientTask model)
+        {
+            //var response = Update(w => w.Id == model.Id, it => new MmIngredientTask()
+            //{
+            //    AgvPosition = model.AgvPosition,
+            //    AgvPositionEnd = model.AgvPositionEnd,
+            //    Workorder = model.Workorder,
+            //    Blanknumber = model.Blanknumber,
+            //    Isfinal = model.Isfinal,
+            //    PreviousNumber = model.PreviousNumber,
+            //    PreviousNumbered = model.PreviousNumbered,
+            //    CreatedBy = model.CreatedBy,
+            //    CreatedTime = model.CreatedTime,
+            //    UpdatedBy = model.UpdatedBy,
+            //    UpdatedTime = model.UpdatedTime,
+            //});
+            //return response;
+            return Update(model, true);
+        }
+
+    }
+}