From 0cd3daae85e877bb35555d90465f381aa34f48c3 Mon Sep 17 00:00:00 2001 From: quowingwang Date: Tue, 11 Nov 2025 19:16:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=B7=A5=E4=BD=8D=E5=AD=97?= =?UTF-8?q?=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StationProcessDictController.cs | 100 ++++++++++++++++++ .../Dto/MasterData/StationProcessDictDto.cs | 56 ++++++++++ .../Mes/MasterData/StationProcessDict.cs | 89 ++++++++++++++++ .../MasterData/IStationProcessDictService.cs | 21 ++++ .../MasterData/StationProcessDictService.cs | 90 ++++++++++++++++ 5 files changed, 356 insertions(+) create mode 100644 RIZO.Admin.WebApi/Controllers/Mes/MasterData/StationProcessDictController.cs create mode 100644 RIZO.Model/Mes/Dto/MasterData/StationProcessDictDto.cs create mode 100644 RIZO.Model/Mes/MasterData/StationProcessDict.cs create mode 100644 RIZO.Service/Mes/IMesService/MasterData/IStationProcessDictService.cs create mode 100644 RIZO.Service/Mes/MasterData/StationProcessDictService.cs diff --git a/RIZO.Admin.WebApi/Controllers/Mes/MasterData/StationProcessDictController.cs b/RIZO.Admin.WebApi/Controllers/Mes/MasterData/StationProcessDictController.cs new file mode 100644 index 0000000..7cc8e16 --- /dev/null +++ b/RIZO.Admin.WebApi/Controllers/Mes/MasterData/StationProcessDictController.cs @@ -0,0 +1,100 @@ +using Microsoft.AspNetCore.Mvc; +using RIZO.Model.Mes.Dto.MasterData; +using RIZO.Model.Mes.MasterData; +using RIZO.Service.Mes.IMesService.MasterData; + +//创建时间：2025-11-11 +namespace RIZO.Admin.WebApi.Controllers.Mes.MasterData +{ + /// + /// 产线工位工序字典表 + /// + [Route("mes/StationProcessDict")] + public class StationProcessDictController : BaseController + { + /// + /// 产线工位工序字典表接口 + /// + private readonly IStationProcessDictService _StationProcessDictService; + + public StationProcessDictController(IStationProcessDictService StationProcessDictService) + { + _StationProcessDictService = StationProcessDictService; + } + + /// + /// 查询产线工位工序字典表列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "stationprocessdict:list")] + public IActionResult QueryStationProcessDict([FromQuery] StationProcessDictQueryDto parm) + { + var response = _StationProcessDictService.GetList(parm); + return SUCCESS(response); + } + + + /// + /// 查询产线工位工序字典表详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "stationprocessdict:query")] + public IActionResult GetStationProcessDict(long Id) + { + var response = _StationProcessDictService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加产线工位工序字典表 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "stationprocessdict:add")] + [Log(Title = "产线工位工序字典表", BusinessType = BusinessType.INSERT)] + public IActionResult AddStationProcessDict([FromBody] StationProcessDictDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _StationProcessDictService.AddStationProcessDict(modal); + + return SUCCESS(response); + } + + /// + /// 更新产线工位工序字典表 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "stationprocessdict:edit")] + [Log(Title = "产线工位工序字典表", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateStationProcessDict([FromBody] StationProcessDictDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _StationProcessDictService.UpdateStationProcessDict(modal); + + return ToResponse(response); + } + + /// + /// 删除产线工位工序字典表 + /// + /// + [HttpPost("delete/{ids}")] + [ActionPermissionFilter(Permission = "stationprocessdict:delete")] + [Log(Title = "产线工位工序字典表", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteStationProcessDict([FromRoute]string ids) + { + var idArr = Tools.SplitAndConvert(ids); + + return ToResponse(_StationProcessDictService.Delete(idArr)); + } + + } +} \ No newline at end of file diff --git a/RIZO.Model/Mes/Dto/MasterData/StationProcessDictDto.cs b/RIZO.Model/Mes/Dto/MasterData/StationProcessDictDto.cs new file mode 100644 index 0000000..28e3252 --- /dev/null +++ b/RIZO.Model/Mes/Dto/MasterData/StationProcessDictDto.cs @@ -0,0 +1,56 @@ + +namespace RIZO.Model.Mes.Dto.MasterData +{ + /// + /// 产线工位工序字典表查询对象 + /// + public class StationProcessDictQueryDto : PagerInfo + { + public string LineName { get; set; } + public string StationName { get; set; } + public string ProcessName { get; set; } + + } + + /// + /// 产线工位工序字典表输入输出对象 + /// + public class StationProcessDictDto + { + [Required(ErrorMessage = "主键ID不能为空")] + public long Id { get; set; } + + [Required(ErrorMessage = "产线编码（关联产线主表，业务唯一标识）不能为空")] + public string LineCode { get; set; } + + [Required(ErrorMessage = "产线名称不能为空")] + public string LineName { get; set; } + + [Required(ErrorMessage = "工位编码（业务唯一标识，如：LINE001-ST001）不能为空")] + public string StationCode { get; set; } + + [Required(ErrorMessage = "工位名称不能为空")] + public string StationName { get; set; } + + [Required(ErrorMessage = "工序编码（业务唯一标识，如：LINE001-ST001-PROC001）不能为空")] + public string ProcessCode { get; set; } + + [Required(ErrorMessage = "工序名称不能为空")] + public string ProcessName { get; set; } + + public string CreateBy { get; set; } + + public DateTime? CreateTime { get; set; } + + public string UpdateBy { get; set; } + + public DateTime? UpdateTime { get; set; } + + public string CreateName { get; set; } + + public string UpdateName { get; set; } + + + + } +} \ No newline at end of file diff --git a/RIZO.Model/Mes/MasterData/StationProcessDict.cs b/RIZO.Model/Mes/MasterData/StationProcessDict.cs new file mode 100644 index 0000000..79a6fc2 --- /dev/null +++ b/RIZO.Model/Mes/MasterData/StationProcessDict.cs @@ -0,0 +1,89 @@ + +namespace RIZO.Model.Mes.MasterData +{ + /// + /// 产线工位工序字典表 + /// + [SugarTable("station_process_dict")] + public class StationProcessDict + { + /// + /// 主键ID + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public long Id { get; set; } + + /// + /// 产线编码（关联产线主表，业务唯一标识） + /// + [SugarColumn(ColumnName = "line_code")] + public string LineCode { get; set; } + + /// + /// 产线名称 + /// + [SugarColumn(ColumnName = "line_name")] + public string LineName { get; set; } + + /// + /// 工位编码（业务唯一标识，如：LINE001-ST001） + /// + [SugarColumn(ColumnName = "station_code")] + public string StationCode { get; set; } + + /// + /// 工位名称 + /// + [SugarColumn(ColumnName = "station_name")] + public string StationName { get; set; } + + /// + /// 工序编码（业务唯一标识，如：LINE001-ST001-PROC001） + /// + [SugarColumn(ColumnName = "process_code")] + public string ProcessCode { get; set; } + + /// + /// 工序名称 + /// + [SugarColumn(ColumnName = "process_name")] + public string ProcessName { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public string CreateBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "update_by")] + public string UpdateBy { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + + /// + /// 创建人名字 + /// + [SugarColumn(ColumnName = "create_name")] + public string CreateName { get; set; } + + /// + /// 更新人名字 + /// + [SugarColumn(ColumnName = "update_name")] + public string UpdateName { get; set; } + + } +} \ No newline at end of file diff --git a/RIZO.Service/Mes/IMesService/MasterData/IStationProcessDictService.cs b/RIZO.Service/Mes/IMesService/MasterData/IStationProcessDictService.cs new file mode 100644 index 0000000..143c6bf --- /dev/null +++ b/RIZO.Service/Mes/IMesService/MasterData/IStationProcessDictService.cs @@ -0,0 +1,21 @@ +using RIZO.Model.Mes.Dto.MasterData; +using RIZO.Model.Mes.MasterData; + +namespace RIZO.Service.Mes.IMesService.MasterData +{ + /// + /// 产线工位工序字典表service接口 + /// + public interface IStationProcessDictService : IBaseService + { + PagedInfo GetList(StationProcessDictQueryDto parm); + + StationProcessDict GetInfo(long Id); + + + StationProcessDict AddStationProcessDict(StationProcessDict parm); + int UpdateStationProcessDict(StationProcessDict parm); + + + } +} diff --git a/RIZO.Service/Mes/MasterData/StationProcessDictService.cs b/RIZO.Service/Mes/MasterData/StationProcessDictService.cs new file mode 100644 index 0000000..177538e --- /dev/null +++ b/RIZO.Service/Mes/MasterData/StationProcessDictService.cs @@ -0,0 +1,90 @@ +using Infrastructure.Attribute; +using Infrastructure.Extensions; +using RIZO.Model.Mes.Dto.MasterData; +using RIZO.Model.Mes.MasterData; +using RIZO.Repository; +using RIZO.Service.Mes.IMesService.MasterData; + +namespace RIZO.Service.Mes.MasterData +{ + /// + /// 产线工位工序字典表Service业务层处理 + /// + [AppService(ServiceType = typeof(IStationProcessDictService), ServiceLifetime = LifeTime.Transient)] + public class StationProcessDictService : BaseService, IStationProcessDictService + { + /// + /// 查询产线工位工序字典表列表 + /// + /// + /// + public PagedInfo GetList(StationProcessDictQueryDto parm) + { + var predicate = QueryExp(parm); + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + + return response; + } + + + /// + /// 获取详情 + /// + /// + /// + public StationProcessDict GetInfo(long Id) + { + var response = Queryable() + .Where(x => x.Id == Id) + .First(); + + return response; + } + + /// + /// 添加产线工位工序字典表 + /// + /// + /// + public StationProcessDict AddStationProcessDict(StationProcessDict model) + { + return Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改产线工位工序字典表 + /// + /// + /// + public int UpdateStationProcessDict(StationProcessDict model) + { + return Update(model, true); + } + + /// + /// 查询导出表达式 + /// + /// + /// + private static Expressionable QueryExp(StationProcessDictQueryDto parm) + { + var predicate = Expressionable.Create(); + if (!string.IsNullOrWhiteSpace(parm.LineName)) + { + predicate.And(it => it.LineName.Contains(parm.LineName)); + } + if (!string.IsNullOrWhiteSpace(parm.StationName)) + { + predicate.And(it => it.StationName.Contains(parm.StationName)); + } + if (!string.IsNullOrWhiteSpace(parm.ProcessName)) + { + predicate.And(it => it.ProcessName.Contains(parm.ProcessName)); + } + return predicate; + } + } +} \ No newline at end of file