2024-09-04 16:31:41 +08:00
|
|
|
|
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; }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2024-09-04 17:16:52 +08:00
|
|
|
|
}
|
2024-09-05 11:45:20 +08:00
|
|
|
|
|
2024-09-04 17:16:52 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 任务及其配料详情
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
|
|
|
|
public class MmPreparationTaskAndInfoDto
|
|
|
|
|
|
{
|
|
|
|
|
|
[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; }
|
|
|
|
|
|
|
|
|
|
|
|
public List<MmTaskMaterialInfoDto> mmTaskMaterialInfoDtos { get; set; } = new List<MmTaskMaterialInfoDto>();
|
|
|
|
|
|
|
2024-09-04 16:31:41 +08:00
|
|
|
|
}
|
2024-09-05 16:27:27 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 带任务配料数量占工单数量的百分比
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:21:15 +08:00
|
|
|
|
public class MmPreparationTaskDto3 : MmPreparationTaskDto
|
2024-09-05 16:27:27 +08:00
|
|
|
|
{
|
|
|
|
|
|
//任务配料数量占工单数量的百分比
|
|
|
|
|
|
public float Percentage { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2024-09-07 14:13:53 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 表格形式查看搜索查询
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public class FormsWorkoderAndTaskQuery : PagerInfo
|
|
|
|
|
|
{
|
2024-09-07 14:21:15 +08:00
|
|
|
|
public string Workorder { get; set; }
|
|
|
|
|
|
public DateTime[] searchDate { get; set; }
|
2024-09-07 14:13:53 +08:00
|
|
|
|
|
2024-09-07 14:21:15 +08:00
|
|
|
|
public string route_code { get; set; }
|
2024-09-07 14:13:53 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
2024-09-20 14:28:30 +08:00
|
|
|
|
public class FormsWorkoderAndTaskQuery2 : PagerInfo
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
public DateTime[] searchDate { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
public string route_code { get; set; }
|
|
|
|
|
|
}
|
2024-09-07 14:13:53 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Forms show work orders and tasks
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:21:15 +08:00
|
|
|
|
public class FormsWorkoderAndTaskInfo
|
2024-09-07 14:13:53 +08:00
|
|
|
|
{
|
2024-09-07 14:41:25 +08:00
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 工单号
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public string FkWorkorder { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 线别
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public string RouteCode { get; set; }
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 产品名称
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public string ProductionName { get; set; }
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 产品编码
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public string ProductionCode { get; set; }
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 工单交货数量
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public int? DeliveryNum { get; set; }
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 客户编码
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public string CustomCode { get; set; }
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 工单日期
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public DateTime? WorkorderDate { get; set; }
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 产前备料任务 id
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public string Id { get; set; }
|
2024-09-07 14:36:23 +08:00
|
|
|
|
|
|
|
|
|
|
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 产前备料任务 序号
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public int SerialNum { get; set; }
|
2024-09-07 14:36:23 +08:00
|
|
|
|
|
|
|
|
|
|
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 产前备料任务 任务code(工单号_no)
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public string TaskCode { get; set; }
|
2024-09-07 14:36:23 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2024-09-07 14:41:25 +08:00
|
|
|
|
|
2024-09-07 14:36:23 +08:00
|
|
|
|
|
|
|
|
|
|
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 产前备料任务 备货状态(1 出货中,2 备好)
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public int? PreparationStatus { get; set; }
|
|
|
|
|
|
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 产前备料任务
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public string CreatedBy { get; set; }
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 产前备料任务
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public DateTime? CreatedTime { get; set; }
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 产前备料任务
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public string UpdatedBy { get; set; }
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 产前备料任务
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public DateTime? UpdatedTime { get; set; }
|
|
|
|
|
|
|
2024-09-07 14:21:15 +08:00
|
|
|
|
|
2024-09-07 14:13:53 +08:00
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
2024-09-07 14:21:15 +08:00
|
|
|
|
///备料任务详情 id
|
2024-09-07 14:13:53 +08:00
|
|
|
|
/// </summary>
|
|
|
|
|
|
public string SubId { get; set; }
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
///备料任务详情 任务号
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public string FkTaskCode { get; set; }
|
|
|
|
|
|
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
///备料任务详情 物料号
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public string MaterialCode { get; set; }
|
|
|
|
|
|
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
///备料任务详情 物料名称
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public string MaterialName { get; set; }
|
|
|
|
|
|
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
///备料任务详情 规格
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public string Specification { get; set; }
|
|
|
|
|
|
|
2024-09-07 14:21:15 +08:00
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
///备料任务详情数量
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public decimal Quantity { get; set; }
|
|
|
|
|
|
|
2024-09-07 14:21:15 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
///备料任务 单位
|
|
|
|
|
|
/// </summary>
|
2024-09-07 14:13:53 +08:00
|
|
|
|
public string Unit { get; set; }
|
|
|
|
|
|
/// <summary>
|
2024-09-07 14:21:15 +08:00
|
|
|
|
///备料任务
|
2024-09-07 14:13:53 +08:00
|
|
|
|
/// </summary>
|
|
|
|
|
|
public string SubCreatedBy { get; set; }
|
|
|
|
|
|
/// <summary>
|
2024-09-07 14:21:15 +08:00
|
|
|
|
///备料任务
|
2024-09-07 14:13:53 +08:00
|
|
|
|
/// </summary>
|
|
|
|
|
|
public DateTime? SubCreatedTime { get; set; }
|
|
|
|
|
|
/// <summary>
|
2024-09-07 14:21:15 +08:00
|
|
|
|
///备料任务
|
2024-09-07 14:13:53 +08:00
|
|
|
|
/// </summary>
|
|
|
|
|
|
public string SubUpdatedBy { get; set; }
|
|
|
|
|
|
/// <summary>
|
2024-09-07 14:21:15 +08:00
|
|
|
|
///备料任务
|
2024-09-07 14:13:53 +08:00
|
|
|
|
/// </summary>
|
|
|
|
|
|
public DateTime? SubUpdatedTime { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2024-09-20 14:28:30 +08:00
|
|
|
|
public class FormLineAndTaskAndTaskInfo
|
|
|
|
|
|
{
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 雪花id
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
|
|
|
|
public string Id { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 序号
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
|
|
|
|
public int? SerialNum { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 任务code(工单号_no)
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
|
|
|
|
public string TaskCode { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 产线code
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
|
|
|
|
public string LineCode { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 任务日期
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
|
|
|
|
public DateTime? TaskDate { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 备货状态(1 未备料,2 备料完成)
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
|
|
|
|
public int? PreparationStatus { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 物料code
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
|
|
|
|
public string MaterialCode { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 物料名称
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
|
|
|
|
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; }
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2024-09-07 14:13:53 +08:00
|
|
|
|
|
|
|
|
|
|
|
2024-09-04 16:31:41 +08:00
|
|
|
|
}
|