From 80b1bbccf9a33424c3a3126c05ea829a35a78c2c Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Thu, 6 Jun 2024 13:21:57 +0800 Subject: [PATCH] =?UTF-8?q?agv=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/mm/MmIngredientTaskController.cs | 111 ++++++++++++++++++ .../ZrAdmin.NET-agv任务-0605181937.zip | Bin 0 -> 8383 bytes .../ZrAdmin.NET-配料任务清单-0605182515.zip | Bin 0 -> 8821 bytes ZR.Model/MES/mm/Dto/MmIngredientTaskDto.cs | 54 +++++++++ .../mm/IService/IMmIngredientTaskService.cs | 24 ++++ ZR.Service/mes/mm/MmIngredientTaskService.cs | 92 +++++++++++++++ server/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj | 1 + 7 files changed, 282 insertions(+) create mode 100644 ZR.Admin.WebApi/Controllers/mes/mm/MmIngredientTaskController.cs create mode 100644 ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-agv任务-0605181937.zip create mode 100644 ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-配料任务清单-0605182515.zip create mode 100644 ZR.Model/MES/mm/Dto/MmIngredientTaskDto.cs create mode 100644 ZR.Service/mes/mm/IService/IMmIngredientTaskService.cs create mode 100644 ZR.Service/mes/mm/MmIngredientTaskService.cs diff --git a/ZR.Admin.WebApi/Controllers/mes/mm/MmIngredientTaskController.cs b/ZR.Admin.WebApi/Controllers/mes/mm/MmIngredientTaskController.cs new file mode 100644 index 00000000..f055ce8d --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/mm/MmIngredientTaskController.cs @@ -0,0 +1,111 @@ +using Microsoft.AspNetCore.Mvc; +using ZR.Model.Dto; +using ZR.Service.mes.mm.IService; +using ZR.Service.mes.mm; +using ZR.Admin.WebApi.Extensions; +using ZR.Admin.WebApi.Filters; +using ZR.Model.MES.mm.Dto; +using ZR.Model.MES.mm; + +//创建时间：2024-06-05 +namespace ZR.Admin.WebApi.Controllers +{ + /// + /// 配料任务清单 + /// + [Verify] + [Route("mes/mm/MmIngredientTask")] + public class MmIngredientTaskController : BaseController + { + /// + /// 配料任务清单接口 + /// + private readonly IMmIngredientTaskService _MmIngredientTaskService; + + public MmIngredientTaskController(IMmIngredientTaskService MmIngredientTaskService) + { + _MmIngredientTaskService = MmIngredientTaskService; + } + + /// + /// 查询配料任务清单列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "business:mmingredienttask:list")] + public IActionResult QueryMmIngredientTask([FromQuery] MmIngredientTaskQueryDto parm) + { + var response = _MmIngredientTaskService.GetList(parm); + return SUCCESS(response); + } + + + /// + /// 查询配料任务清单详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "business:mmingredienttask:query")] + public IActionResult GetMmIngredientTask(int Id) + { + var response = _MmIngredientTaskService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加配料任务清单 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "business:mmingredienttask:add")] + [Log(Title = "配料任务清单", BusinessType = BusinessType.INSERT)] + public IActionResult AddMmIngredientTask([FromBody] MmIngredientTaskDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _MmIngredientTaskService.AddMmIngredientTask(modal); + + return SUCCESS(response); + } + + /// + /// 更新配料任务清单 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "business:mmingredienttask:edit")] + [Log(Title = "配料任务清单", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateMmIngredientTask([FromBody] MmIngredientTaskDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _MmIngredientTaskService.UpdateMmIngredientTask(modal); + + return ToResponse(response); + } + + /// + /// 删除配料任务清单 + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "business:mmingredienttask:delete")] + [Log(Title = "配料任务清单", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteMmIngredientTask(string ids) + { + int[] idsArr = Tools.SpitIntArrary(ids); + if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } + + var response = _MmIngredientTaskService.Delete(idsArr); + + return ToResponse(response); + } + + + + + } +} \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-agv任务-0605181937.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-agv任务-0605181937.zip new file mode 100644 index 0000000000000000000000000000000000000000..f09df83d3ad33807332916d3deb2ee7a1f5ca3ef GIT binary patch literal 8383 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 literal 0 HcmV?d00001 diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-配料任务清单-0605182515.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-配料任务清单-0605182515.zip new file mode 100644 index 0000000000000000000000000000000000000000..d345dc2c7537b4e9d132a4f3847ec7993b114ca0 GIT binary patch literal 8821 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 + /// 配料任务清单查询对象 + /// + public class MmIngredientTaskQueryDto : PagerInfo + { + public string Workorder { get; set; } + + public DateTime Starttime { get; set; } + public DateTime Endtime { get; set; } + + + } + + /// + /// 配料任务清单输入输出对象 + /// + public class MmIngredientTaskDto + { + [Required(ErrorMessage = "id不能为空")] + public int Id { get; set; } + + public string AgvPosition { get; set; } + + public string AgvPositionEnd { get; set; } + + [Required(ErrorMessage = "配料任务id不能为空")] + public string TaskId { get; set; } + + public string Workorder { get; set; } + + public string Blanknumber { get; set; } + + public int? Isfinal { get; set; } + + public int? PreviousNumber { get; set; } + + public int? PreviousNumbered { get; set; } + + public string CreatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? UpdatedTime { get; set; } + + + + } +} \ No newline at end of file diff --git a/ZR.Service/mes/mm/IService/IMmIngredientTaskService.cs b/ZR.Service/mes/mm/IService/IMmIngredientTaskService.cs new file mode 100644 index 00000000..b428bb87 --- /dev/null +++ b/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 +{ + /// + /// 配料任务清单service接口 + /// + public interface IMmIngredientTaskService : IBaseService + { + PagedInfo GetList(MmIngredientTaskQueryDto parm); + + MmIngredientTask GetInfo(int Id); + + MmIngredientTask AddMmIngredientTask(MmIngredientTask parm); + + int UpdateMmIngredientTask(MmIngredientTask parm); + + } +} diff --git a/ZR.Service/mes/mm/MmIngredientTaskService.cs b/ZR.Service/mes/mm/MmIngredientTaskService.cs new file mode 100644 index 00000000..7cc05015 --- /dev/null +++ b/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 +{ + /// + /// 配料任务清单Service业务层处理 + /// + [AppService(ServiceType = typeof(IMmIngredientTaskService), ServiceLifetime = LifeTime.Transient)] + public class MmIngredientTaskService : BaseService, IMmIngredientTaskService + { + /// + /// 查询配料任务清单列表 + /// + /// + /// + public PagedInfo GetList(MmIngredientTaskQueryDto parm) + { + var predicate = Expressionable.Create() + .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(parm); + + return response; + } + + + /// + /// 获取详情 + /// + /// + /// + public MmIngredientTask GetInfo(int Id) + { + var response = Queryable() + .Where(x => x.Id == Id) + .First(); + + return response; + } + + /// + /// 添加配料任务清单 + /// + /// + /// + public MmIngredientTask AddMmIngredientTask(MmIngredientTask model) + { + return Context.Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改配料任务清单 + /// + /// + /// + 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); + } + + } +} \ No newline at end of file diff --git a/server/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/server/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj index 749a6506..64f5f0cf 100644 --- a/server/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj +++ b/server/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj @@ -35,6 +35,7 @@ +