获取产线
This commit is contained in:
parent
49a84790aa
commit
b4342a07c4
@ -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
|
||||
{
|
||||
/// <summary>
|
||||
/// 物料需求计划
|
||||
/// </summary>
|
||||
[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);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
40
DOAN.Model/MES/mm/Dto/MmPreparationTaskDto.cs
Normal file
40
DOAN.Model/MES/mm/Dto/MmPreparationTaskDto.cs
Normal file
@ -0,0 +1,40 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DOAN.Model.MES.mm.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 产前备料任务查询对象
|
||||
/// </summary>
|
||||
public class MmPreparationTaskQueryDto : PagerInfo
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 产前备料任务输入输出对象
|
||||
/// </summary>
|
||||
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; }
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
44
DOAN.Model/MES/mm/Dto/MmTaskMaterialInfoDto.cs
Normal file
44
DOAN.Model/MES/mm/Dto/MmTaskMaterialInfoDto.cs
Normal file
@ -0,0 +1,44 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DOAN.Model.MES.mm.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 备料任务详情查询对象
|
||||
/// </summary>
|
||||
public class MmTaskMaterialInfoQueryDto : PagerInfo
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 备料任务详情输入输出对象
|
||||
/// </summary>
|
||||
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; }
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
64
DOAN.Model/MES/mm/MmPreparationTask.cs
Normal file
64
DOAN.Model/MES/mm/MmPreparationTask.cs
Normal file
@ -0,0 +1,64 @@
|
||||
namespace DOAN.Model.MES.mm
|
||||
{
|
||||
/// <summary>
|
||||
/// 产前备料任务
|
||||
/// </summary>
|
||||
[SugarTable("mm_preparation_task")]
|
||||
public class MmPreparationTask
|
||||
{
|
||||
/// <summary>
|
||||
/// 雪花id
|
||||
/// </summary>
|
||||
[SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
|
||||
public string Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 序号
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "serial_num")]
|
||||
public string SerialNum { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 任务code(工单号_no)
|
||||
/// </summary>
|
||||
[SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "task_code")]
|
||||
public string TaskCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 工单号
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "fk_workorder")]
|
||||
public string FkWorkorder { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备货状态(1 出货中,2 备好)
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "preparation_status")]
|
||||
public int? PreparationStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建人
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "cREATED_BY")]
|
||||
public string CreatedBy { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "cREATED_TIME")]
|
||||
public DateTime? CreatedTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 更新人
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "uPDATED_BY")]
|
||||
public string UpdatedBy { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 更新时间
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "uPDATED_TIME")]
|
||||
public DateTime? UpdatedTime { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
78
DOAN.Model/MES/mm/MmTaskMaterialInfo.cs
Normal file
78
DOAN.Model/MES/mm/MmTaskMaterialInfo.cs
Normal file
@ -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
|
||||
{
|
||||
/// <summary>
|
||||
/// 备料任务详情
|
||||
/// </summary>
|
||||
[SugarTable("mm_task_material_info")]
|
||||
public class MmTaskMaterialInfo
|
||||
{
|
||||
/// <summary>
|
||||
/// 雪花
|
||||
/// </summary>
|
||||
[SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
|
||||
public string Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 任务code
|
||||
/// </summary>
|
||||
[SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_task_code")]
|
||||
public string FkTaskCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 物料code
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "material_code")]
|
||||
public string MaterialCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 物料名称
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "material_name")]
|
||||
public string MaterialName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 规格型号
|
||||
/// </summary>
|
||||
public string Specification { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 配料数量
|
||||
/// </summary>
|
||||
public decimal Quantity { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 单位
|
||||
/// </summary>
|
||||
public string Unit { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建人
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "cREATED_BY")]
|
||||
public string CreatedBy { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "cREATED_TIME")]
|
||||
public DateTime? CreatedTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 更新人
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "uPDATED_BY")]
|
||||
public string UpdatedBy { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 更新时间
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "uPDATED_TIME")]
|
||||
public DateTime? UpdatedTime { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
15
DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs
Normal file
15
DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs
Normal file
@ -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<BaseWorkRoute> GetProcessRouteList();
|
||||
}
|
||||
}
|
||||
25
DOAN.Service/MES/mm/MmPreparantTaskService.cs
Normal file
25
DOAN.Service/MES/mm/MmPreparantTaskService.cs
Normal file
@ -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<MmPreparationTask>, IMmPreparantTaskService
|
||||
{
|
||||
public List<BaseWorkRoute> GetProcessRouteList()
|
||||
{
|
||||
return Context.Queryable<BaseWorkRoute>().Where(it=>it.Status==1).ToList();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user