生产工单 任务单 提报表 相关数量的类型 int 改成 decimal

This commit is contained in:
2024-09-20 10:20:48 +08:00
parent 28742d05d0
commit ab4eddc079
24 changed files with 85 additions and 73 deletions

View File

@@ -6,7 +6,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string mo_task_code { get; set; }
public string material_id { get; set; }
public string material_code { get; set; }
public int? num { get; set; }
public decimal? num { get; set; }
public List<MaterialPreparationPlanDOutput> children { get; set; } = new List<MaterialPreparationPlanDOutput>();
}

View File

@@ -40,9 +40,9 @@
// /// </summary>
// public string progress_bar { get; set; }
public int? complete_qty { get; set; }
public decimal? complete_qty { get; set; }
public int? scheduled_qty { get; set; }
public decimal? scheduled_qty { get; set; }
/// <summary>
/// 领用设备

View File

@@ -50,24 +50,24 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 已完工数量
/// </summary>
public int? complete_qty { get; set; }
public decimal? complete_qty { get; set; }
/// <summary>
/// 报废数量
/// </summary>
public int? scrap_qty { get; set; }
public decimal? scrap_qty { get; set; }
/// <summary>
/// 已排产数量
/// </summary>
public int? scheduled_qty { get; set; }
public decimal? scheduled_qty { get; set; }
/// <summary>
/// 排产类型:1、注塑、挤出2、组装、包装
/// </summary>
public int? schedule_type { get; set; }
public int? reported_work_qty { get; set; }
public decimal? reported_work_qty { get; set; }
/// <summary>
/// 计划开始时间

View File

@@ -44,19 +44,19 @@
/// <summary>
/// 生产任务数量
/// </summary>
public int? scheduled_qty { get; set; }
public decimal? scheduled_qty { get; set; }
/// <summary>
/// 计划数量
/// </summary>
public int? plan_qty { get; set; }
public decimal? plan_qty { get; set; }
/// <summary>
/// 已完成数量
/// </summary>
public int? complete_qty { get; set; }
public decimal? complete_qty { get; set; }
/// <summary>
/// 工序任务量
/// </summary>
public int? process_task_qty { get; set; }
public decimal? process_task_qty { get; set; }
/// <summary>
/// bom_id
/// </summary>

View File

@@ -11,7 +11,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
public string plan_start_date { get; set; }
public string plan_end_date { get; set; }
public string material_id { get; set; }
public int? plan_qty { get; set; }
public decimal? plan_qty { get; set; }
public string unit_id { get; set; }
public string mo_status { get; set; }
public string ebom_version { get; set; }

View File

@@ -8,8 +8,8 @@ namespace Tnb.ProductionMgr.Entities.Dto
public string mold_id { get; set; }
public string eqp_id { get; set; }
public string mo_task_status { get; set; }
public int? plan_qty { get; set; }
public int? scheduled_qty { get; set; }
public decimal? plan_qty { get; set; }
public decimal? scheduled_qty { get; set; }
public string create_time { get; set; }
public string workstation_id { get; set; }
public string worker_id { get; set; }

View File

@@ -55,12 +55,12 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 完成数量
/// </summary>
public int? complete_qty { get; set; }
public decimal? complete_qty { get; set; }
/// <summary>
/// 计划生产数量
/// </summary>
public int? plan_qty { get; set; }
public int? scheduled_qty { get; set; }
public decimal? plan_qty { get; set; }
public decimal? scheduled_qty { get; set; }
/// <summary>
/// 预计开工时间

View File

@@ -9,8 +9,8 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string eqp_id { get; set; } = string.Empty;
public string plan_start_date { get; set; } = string.Empty;
public string plan_end_date { get; set; } = string.Empty;
public int? plan_qty { get; set; }
public int? complete_qty { get; set; }
public decimal? plan_qty { get; set; }
public decimal? complete_qty { get; set; }
public string? mo_task_status { get; set; } = string.Empty;
public string? schedule_type { get; set; } = string.Empty;
}

View File

@@ -25,11 +25,11 @@
/// <summary>
/// 计划生产量
/// </summary>
public int? plan_qty { get; set; }
public decimal? plan_qty { get; set; }
/// <summary>
/// 已完工数量
/// </summary>
public int? comple_qty { get; set; }
public decimal? comple_qty { get; set; }
/// <summary>
/// 产品名称
/// </summary>

View File

@@ -10,10 +10,10 @@ namespace Tnb.ProductionMgr.Entities.Dto
public string? mo_task_id_id { get; set; } = string.Empty;
public string? mo_task_type { get; set; } = string.Empty;
public string? plan_end_date { get; set; } = string.Empty;
public int? plan_qty { get; set; }
public int? completed_qty { get; set; }
public decimal? plan_qty { get; set; }
public decimal? completed_qty { get; set; }
public string? plan_start_date { get; set; } = string.Empty;
public int? reported_work_qty { get; set; }
public decimal? reported_work_qty { get; set; }
public string? status { get; set; } = string.Empty;
public string mo_code { get; set; }
@@ -24,7 +24,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
public class ReportRecordListChildrenOutput
{
public int? reported_qty { get; set; }
public decimal? reported_qty { get; set; }
public string? create_id { get; set; } = string.Empty;
public string? create_id_id { get; set; } = string.Empty;

View File

@@ -12,9 +12,9 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string material_id_id { get; set; }
public string mold_id { get; set; }
public string mold_id_id { get; set; }
public int? plan_qty { get; set; }
public int? complete_qty { get; set; }
public int? scheduled_qty { get; set; }
public decimal? plan_qty { get; set; }
public decimal? complete_qty { get; set; }
public decimal? scheduled_qty { get; set; }
public string workline_id { get; set; }
public string worker_id { get; set; }
public string workline_id_id { get; set; }

View File

@@ -24,10 +24,10 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string material_name { get; set; }
public string workline_name { get; set; }
public string report_type { get; set; }
public int qty { get; set; }
public decimal qty { get; set; }
public string repoter_name { get; set; }
public int plan_qty { get; set; }
public int remain_plan_qty { get; set; }
public decimal plan_qty { get; set; }
public decimal remain_plan_qty { get; set; }
public string report_time { get; set; }
}

View File

@@ -20,9 +20,9 @@ namespace Tnb.ProductionMgr.Entities
public string process_id_id { get; set; }
public string process_code { get; set; }
public string mbom_process_id { get; set; }
public int? scheduled_qty { get; set; }
public int? reported_work_qty { get; set; }
public int? scrap_qty { get; set; }
public decimal? scheduled_qty { get; set; }
public decimal? reported_work_qty { get; set; }
public decimal? scrap_qty { get; set; }
public string plan_start_date { get; set; }

View File

@@ -42,27 +42,27 @@ public partial class PrdMo : BaseEntity<string>
/// <summary>
/// 计划生产数量
/// </summary>
public int? plan_qty { get; set; }
public decimal? plan_qty { get; set; }
/// <summary>
/// 已投入数量
/// </summary>
public int? input_qty { get; set; }
public decimal? input_qty { get; set; }
/// <summary>
/// 已完工数量
/// </summary>
public int? complete_qty { get; set; }
public decimal? complete_qty { get; set; }
/// <summary>
/// 已报工数量
/// </summary>
public int? reported_work_qty { get; set; }
public decimal? reported_work_qty { get; set; }
/// <summary>
/// 报废数量
/// </summary>
public int? scrap_qty { get; set; }
public decimal? scrap_qty { get; set; }
/// <summary>
/// 计划开始时间
@@ -227,7 +227,7 @@ public partial class PrdMo : BaseEntity<string>
/// <summary>
/// 已排产数量
/// </summary>
public int? scheduled_qty { get; set; }
public decimal? scheduled_qty { get; set; }
/// <summary>
/// 父工单id
/// </summary>

View File

@@ -67,32 +67,32 @@ public partial class PrdMoTask : BaseEntity<string>
/// <summary>
/// 计划数量
/// </summary>
public int? plan_qty { get; set; }
public decimal? plan_qty { get; set; }
/// <summary>
/// 已投入数量
/// </summary>
public int? input_qty { get; set; }
public decimal? input_qty { get; set; }
/// <summary>
/// 已完工数量
/// </summary>
public int? complete_qty { get; set; }
public decimal? complete_qty { get; set; }
/// <summary>
/// 已报工数量
/// </summary>
public int? reported_work_qty { get; set; }
public decimal? reported_work_qty { get; set; }
/// <summary>
/// 报废数量
/// </summary>
public int? scrap_qty { get; set; }
public decimal? scrap_qty { get; set; }
/// <summary>
/// 已排产数量
/// </summary>
public int? scheduled_qty { get; set; }
public decimal? scheduled_qty { get; set; }
/// <summary>
/// 排产类型:1、注塑、挤出2、组装、包装
@@ -172,7 +172,7 @@ public partial class PrdMoTask : BaseEntity<string>
/// <summary>
/// 工序任务量
/// </summary>
public int? process_task_qty { get; set; }
public decimal? process_task_qty { get; set; }
/// <summary>
/// 工序id
/// </summary>

View File

@@ -47,12 +47,12 @@ public partial class PrdMoTaskDefectRecord : BaseEntity<string>
/// <summary>
/// 计划生产数量
/// </summary>
public int? plan_qty { get; set; }
public decimal? plan_qty { get; set; }
/// <summary>
/// 报废数量
/// </summary>
public int scrap_qty { get; set; }
public decimal scrap_qty { get; set; }
/// <summary>
/// 生产任务单状态

View File

@@ -62,17 +62,17 @@ public partial class PrdReport : BaseEntity<string>
/// <summary>
/// 生产数量
/// </summary>
public int? prd_qty { get; set; }
public decimal? prd_qty { get; set; }
/// <summary>
/// 已报工数量
/// </summary>
public int? reported_work_qty { get; set; }
public decimal? reported_work_qty { get; set; }
/// <summary>
/// 报工数量
/// </summary>
public int? reported_qty { get; set; }
public decimal? reported_qty { get; set; }
/// <summary>
/// 生产任务编码
@@ -97,7 +97,7 @@ public partial class PrdReport : BaseEntity<string>
/// <summary>
/// 条码数量
/// </summary>
public int barqty { get; set; }
public decimal barqty { get; set; }
/// <summary>

View File

@@ -42,12 +42,12 @@ public partial class PrdReportRecord : BaseEntity<string>
/// <summary>
/// 计划生产数量
/// </summary>
public int? plan_qty { get; set; }
public decimal? plan_qty { get; set; }
/// <summary>
/// 完成数量
/// </summary>
public int completed_qty { get; set; }
public decimal completed_qty { get; set; }
/// <summary>
/// 任务单号
@@ -68,7 +68,7 @@ public partial class PrdReportRecord : BaseEntity<string>
/// <summary>
/// 已报工数量
/// </summary>
public int reported_work_qty { get; set; }
public decimal reported_work_qty { get; set; }
/// <summary>
/// 工单号