From b4342a07c446b58d79eeccda533a2fc2ae54f7f2 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Wed, 4 Sep 2024 16:31:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MES/mm/MmPreparantTaskController.cs | 39 ++++++++++ DOAN.Model/MES/mm/Dto/MmPreparationTaskDto.cs | 40 ++++++++++ .../MES/mm/Dto/MmTaskMaterialInfoDto.cs | 44 +++++++++++ DOAN.Model/MES/mm/MmPreparationTask.cs | 64 +++++++++++++++ DOAN.Model/MES/mm/MmTaskMaterialInfo.cs | 78 +++++++++++++++++++ .../mm/IService/IMmPreparantTaskService.cs | 15 ++++ DOAN.Service/MES/mm/MmPreparantTaskService.cs | 25 ++++++ 7 files changed, 305 insertions(+) create mode 100644 DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs create mode 100644 DOAN.Model/MES/mm/Dto/MmPreparationTaskDto.cs create mode 100644 DOAN.Model/MES/mm/Dto/MmTaskMaterialInfoDto.cs create mode 100644 DOAN.Model/MES/mm/MmPreparationTask.cs create mode 100644 DOAN.Model/MES/mm/MmTaskMaterialInfo.cs create mode 100644 DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs create mode 100644 DOAN.Service/MES/mm/MmPreparantTaskService.cs diff --git a/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs b/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs new file mode 100644 index 0000000..0e3c235 --- /dev/null +++ b/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs @@ -0,0 +1,39 @@ + +using Microsoft.AspNetCore.Mvc; + +using DOAN.Admin.WebApi.Filters; +using DOAN.Model; +using DOAN.Model.MES.mm.Dto; +using DOAN.Model.MES.mm; +using System.Collections.Generic; + +using DOAN.Service.group.IService; +using Aliyun.OSS; +using JinianNet.JNTemplate; +using DOAN.Service.MES.mm.IService; +//创建时间：2024-08-30 +namespace DOAN.WebApi.Controllers.MES.mm +{ + /// + /// 物料需求计划 + /// + [Verify] + [Route("mes/materialManagement/PreparantTask")] + public class MmPreparantTaskController : BaseController + { + private readonly IMmPreparantTaskService preparantTaskService; + public MmPreparantTaskController(IMmPreparantTaskService preparantTaskService) + { + this.preparantTaskService=preparantTaskService; + } + + //TODO 获取产线 + [HttpGet("get_route")] + public IActionResult GetProcessRouteList() + { + var response = preparantTaskService.GetProcessRouteList(); + return SUCCESS(response); + } + + } +} \ No newline at end of file diff --git a/DOAN.Model/MES/mm/Dto/MmPreparationTaskDto.cs b/DOAN.Model/MES/mm/Dto/MmPreparationTaskDto.cs new file mode 100644 index 0000000..dc91ae1 --- /dev/null +++ b/DOAN.Model/MES/mm/Dto/MmPreparationTaskDto.cs @@ -0,0 +1,40 @@ +using System.ComponentModel.DataAnnotations; + +namespace DOAN.Model.MES.mm.Dto +{ + /// + /// 产前备料任务查询对象 + /// + public class MmPreparationTaskQueryDto : PagerInfo + { + } + + /// + /// 产前备料任务输入输出对象 + /// + public class MmPreparationTaskDto + { + [Required(ErrorMessage = "雪花id不能为空")] + public string Id { get; set; } + + public string SerialNum { get; set; } + + [Required(ErrorMessage = "任务code(工单号_no)不能为空")] + public string TaskCode { get; set; } + + public string FkWorkorder { get; set; } + + public int? PreparationStatus { 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/DOAN.Model/MES/mm/Dto/MmTaskMaterialInfoDto.cs b/DOAN.Model/MES/mm/Dto/MmTaskMaterialInfoDto.cs new file mode 100644 index 0000000..25fe8f3 --- /dev/null +++ b/DOAN.Model/MES/mm/Dto/MmTaskMaterialInfoDto.cs @@ -0,0 +1,44 @@ +using System.ComponentModel.DataAnnotations; + +namespace DOAN.Model.MES.mm.Dto +{ + /// + /// 备料任务详情查询对象 + /// + public class MmTaskMaterialInfoQueryDto : PagerInfo + { + } + + /// + /// 备料任务详情输入输出对象 + /// + public class MmTaskMaterialInfoDto + { + [Required(ErrorMessage = "雪花不能为空")] + public string Id { get; set; } + + [Required(ErrorMessage = "任务code不能为空")] + public string FkTaskCode { get; set; } + + public string MaterialCode { get; set; } + + public string MaterialName { get; set; } + + public string Specification { get; set; } + + public decimal Quantity { get; set; } + + public string Unit { 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/DOAN.Model/MES/mm/MmPreparationTask.cs b/DOAN.Model/MES/mm/MmPreparationTask.cs new file mode 100644 index 0000000..2813131 --- /dev/null +++ b/DOAN.Model/MES/mm/MmPreparationTask.cs @@ -0,0 +1,64 @@ +namespace DOAN.Model.MES.mm +{ + /// + /// 产前备料任务 + /// + [SugarTable("mm_preparation_task")] + public class MmPreparationTask + { + /// + /// 雪花id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public string Id { get; set; } + + /// + /// 序号 + /// + [SugarColumn(ColumnName = "serial_num")] + public string SerialNum { get; set; } + + /// + /// 任务code(工单号_no) + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "task_code")] + public string TaskCode { get; set; } + + /// + /// 工单号 + /// + [SugarColumn(ColumnName = "fk_workorder")] + public string FkWorkorder { get; set; } + + /// + /// 备货状态（1 出货中，2 备好） + /// + [SugarColumn(ColumnName = "preparation_status")] + public int? PreparationStatus { 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; } + + } +} \ No newline at end of file diff --git a/DOAN.Model/MES/mm/MmTaskMaterialInfo.cs b/DOAN.Model/MES/mm/MmTaskMaterialInfo.cs new file mode 100644 index 0000000..9368c35 --- /dev/null +++ b/DOAN.Model/MES/mm/MmTaskMaterialInfo.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +namespace DOAN.Model.MES.mm +{ + /// + /// 备料任务详情 + /// + [SugarTable("mm_task_material_info")] + public class MmTaskMaterialInfo + { + /// + /// 雪花 + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public string Id { get; set; } + + /// + /// 任务code + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_task_code")] + public string FkTaskCode { get; set; } + + /// + /// 物料code + /// + [SugarColumn(ColumnName = "material_code")] + public string MaterialCode { get; set; } + + /// + /// 物料名称 + /// + [SugarColumn(ColumnName = "material_name")] + public string MaterialName { get; set; } + + /// + /// 规格型号 + /// + public string Specification { get; set; } + + /// + /// 配料数量 + /// + public decimal Quantity { get; set; } + + /// + /// 单位 + /// + public string Unit { 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; } + + } +} \ No newline at end of file diff --git a/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs b/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs new file mode 100644 index 0000000..3012a94 --- /dev/null +++ b/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs @@ -0,0 +1,15 @@ +using DOAN.Model.MES.base_; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Service.MES.mm.IService +{ + public interface IMmPreparantTaskService + { + + List GetProcessRouteList(); + } +} diff --git a/DOAN.Service/MES/mm/MmPreparantTaskService.cs b/DOAN.Service/MES/mm/MmPreparantTaskService.cs new file mode 100644 index 0000000..bcc409a --- /dev/null +++ b/DOAN.Service/MES/mm/MmPreparantTaskService.cs @@ -0,0 +1,25 @@ +using DOAN.Model.MES.base_; +using DOAN.Model.MES.mm; +using DOAN.Model.MES.mm.Dto; +using DOAN.Service.group.IService; +using DOAN.Service.MES.mm.IService; +using Infrastructure.Attribute; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Service.MES.mm +{ + [AppService(ServiceType = typeof(IMmPreparantTaskService), ServiceLifetime = LifeTime.Transient)] + public class MmPreparantTaskService : BaseService, IMmPreparantTaskService + { + public List GetProcessRouteList() + { + return Context.Queryable().Where(it=>it.Status==1).ToList(); + } + + + } +}