From ae514ccf658b4759de0d9a4fdc4a6eeed85df3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Thu, 11 Jul 2024 08:48:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOAN.Model/MES/base/BaseWorkRoute.cs | 65 ++++++++++++++ DOAN.Model/MES/base/Dto/BaseWorkRouteDto.cs | 43 ++++++++++ DOAN.Service/MES/base/BaseWorkRouteService.cs | 84 +++++++++++++++++++ .../base/IService/IBaseWorkRouteService.cs | 22 +++++ 4 files changed, 214 insertions(+) create mode 100644 DOAN.Model/MES/base/BaseWorkRoute.cs create mode 100644 DOAN.Model/MES/base/Dto/BaseWorkRouteDto.cs create mode 100644 DOAN.Service/MES/base/BaseWorkRouteService.cs create mode 100644 DOAN.Service/MES/base/IService/IBaseWorkRouteService.cs diff --git a/DOAN.Model/MES/base/BaseWorkRoute.cs b/DOAN.Model/MES/base/BaseWorkRoute.cs new file mode 100644 index 0000000..6bde984 --- /dev/null +++ b/DOAN.Model/MES/base/BaseWorkRoute.cs @@ -0,0 +1,65 @@ +namespace DOAN.Model.MES.base_ +{ + /// + /// 工艺路线 + /// + [SugarTable("base_work_route")] + public class BaseWorkRoute + { + /// + /// 主键 + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// 编号 + /// + public string Code { get; set; } + + /// + /// 工艺流程图原始json数据，用来进行复现 + /// + [SugarColumn(ColumnName = "logic_flow_data")] + public string LogicFlowData { get; set; } + + /// + /// 状态 + /// + public int? Status { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/DOAN.Model/MES/base/Dto/BaseWorkRouteDto.cs b/DOAN.Model/MES/base/Dto/BaseWorkRouteDto.cs new file mode 100644 index 0000000..42631c0 --- /dev/null +++ b/DOAN.Model/MES/base/Dto/BaseWorkRouteDto.cs @@ -0,0 +1,43 @@ +using System.ComponentModel.DataAnnotations; + +namespace DOAN.Model.MES.base_.Dto +{ + /// + /// 工艺路线查询对象 + /// + public class BaseWorkRouteQueryDto : PagerInfo + { + public string Name { get; set; } + + public string Code { get; set; } + + public int? Status { get; set; } + } + + /// + /// 工艺路线输入输出对象 + /// + public class BaseWorkRouteDto + { + [Required(ErrorMessage = "主键不能为空")] + public int Id { get; set; } + + public string Name { get; set; } + + public string Code { get; set; } + + public string LogicFlowData { get; set; } + + public int? Status { get; set; } + + public string Remark { get; set; } + + public string CreatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/DOAN.Service/MES/base/BaseWorkRouteService.cs b/DOAN.Service/MES/base/BaseWorkRouteService.cs new file mode 100644 index 0000000..e53aa16 --- /dev/null +++ b/DOAN.Service/MES/base/BaseWorkRouteService.cs @@ -0,0 +1,84 @@ +using System; +using System.Linq; +using DOAN.Model; +using DOAN.Model.MES.base_; +using DOAN.Model.MES.base_.Dto; +using DOAN.Repository; +using DOAN.Service.Business.IBusinessService; +using Infrastructure.Attribute; +using Infrastructure.Extensions; +using SqlSugar; + +namespace DOAN.Service.Business +{ + /// + /// 工艺路线Service业务层处理 + /// + [AppService(ServiceType = typeof(IBaseWorkRouteService), ServiceLifetime = LifeTime.Transient)] + public class BaseWorkRouteService : BaseService, IBaseWorkRouteService + { + /// + /// 查询工艺路线列表 + /// + /// + /// + public PagedInfo GetList(BaseWorkRouteQueryDto parm) + { + var predicate = Expressionable + .Create() + .AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name.Contains(parm.Name)) + .AndIF(!string.IsNullOrEmpty(parm.Code), it => it.Code.Contains(parm.Code)) + .AndIF(parm.Status > -1, it => it.Status == parm.Status); + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + + return response; + } + + /// + /// 获取详情 + /// + /// + /// + public BaseWorkRoute GetInfo(int Id) + { + var response = Queryable().Where(x => x.Id == Id).First(); + + return response; + } + + /// + /// 添加工艺路线 + /// + /// + /// + public BaseWorkRoute AddBaseWorkRoute(BaseWorkRoute model) + { + return Context.Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改工艺路线 + /// + /// + /// + public int UpdateBaseWorkRoute(BaseWorkRoute model) + { + //var response = Update(w => w.Id == model.Id, it => new BaseWorkRoute() + //{ + // Name = model.Name, + // Status = model.Status, + // Remark = model.Remark, + // CreatedBy = model.CreatedBy, + // CreatedTime = model.CreatedTime, + // UpdatedBy = model.UpdatedBy, + // UpdatedTime = model.UpdatedTime, + // Code = model.Code, + // LogicFlowData = model.LogicFlowData, + //}); + //return response; + return Update(model, true); + } + } +} diff --git a/DOAN.Service/MES/base/IService/IBaseWorkRouteService.cs b/DOAN.Service/MES/base/IService/IBaseWorkRouteService.cs new file mode 100644 index 0000000..f4d0ce0 --- /dev/null +++ b/DOAN.Service/MES/base/IService/IBaseWorkRouteService.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using DOAN.Model; +using DOAN.Model.MES.base_; +using DOAN.Model.MES.base_.Dto; + +namespace DOAN.Service.Business.IBusinessService +{ + /// + /// 工艺路线service接口 + /// + public interface IBaseWorkRouteService : IBaseService + { + PagedInfo GetList(BaseWorkRouteQueryDto parm); + + BaseWorkRoute GetInfo(int Id); + + BaseWorkRoute AddBaseWorkRoute(BaseWorkRoute parm); + + int UpdateBaseWorkRoute(BaseWorkRoute parm); + } +}