wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生产管理模块代码调整

Browse Source
This commit is contained in:
DEVICE8\12494
2023-05-12 22:58:16 +08:00
parent 85e7338669
commit 77bb079eee
31 changed files with 2315 additions and 1412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/IcmoUpInput.cs
View File

@@ -26,14 +26,14 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// <summary>
/// 模具Id
/// </summary>
public string mold_id { get; set; }
/// <summary>
/// 设备Id
/// </summary>
public string eqp_id { get; set; }
//public string mold_id { get; set; }
///// <summary>
///// 设备Id
///// </summary>
//public string eqp_id { get; set; }
/// <summary>
/// 生产任务单数量
/// </summary>
public int scheduled_qty { get; set; }
//public int scheduled_qty { get; set; }
}
}

26
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MoldListOutput.cs
View File

@@ -10,12 +10,32 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// <summary>
/// 模具列表输出参数
/// </summary>
public class MoldListOutput : Molds
public class MoldListOutput
{
/// <summary>
/// 产品 名称
/// 模具名称
/// </summary>
public string item_name { get; set; }
public string mold_name { get; set; }
/// <summary>
/// 物料名称
/// </summary>
public string material_name { get; set; }
/// <summary>
/// 物料编号
/// </summary>
public string material_code { get; set; }
/// <summary>
/// 模具编号
/// </summary>
public string mold_code { get; set; }
/// <summary>
/// 模具型号
/// </summary>
public string mold_type_code { get; set; }
/// <summary>
/// 型腔数
/// </summary>
public int? cavity_qty { get; set; }
public string mold_id { get; set;}
}
}

69
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskDefectOutput.cs Normal file
View File

@@ -0,0 +1,69 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using DbModels;
using Tnb.ProductionMgr.Entities;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 提报记录统计明细
/// </summary>
public class PrdMoTaskDefectOutput
{
/// <summary>
/// Desc:任务单号
/// Default:
/// Nullable:True
/// </summary>
public string mo_task_code { get; set; }
public List<BatchItem> batchItems { get; set; }
}
public class BatchItem
{
public string batch { get; set; }
public string create_time { get; set; }
/// <summary>
/// 报废数量
/// </summary>
public int scrap_qty { get; set; }
/// <summary>
///次品分类数组
/// </summary>
public List<CategoryItem> categoryItems { get; set; }
}
public class CategoryItem
{
/// <summary>
/// 次品分类名称
/// </summary>
public string name { get; set; }
/// <summary>
/// 次品分类数量
/// </summary>
public int qty { get; set; }
/// <summary>
/// 次品项数组
/// </summary>
public List<DefectItem> defectItems { get; set; }
}
public class DefectItem
{
/// <summary>
/// 次品分类名称
/// </summary>
public string name { get; set; }
/// <summary>
/// 次品分类数量
/// </summary>
public int qty { get; set; }
}
}

6
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportCrInput.cs
View File

@@ -86,7 +86,11 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// Default:
/// Nullable:True
/// </summary>
public string icmo_code { get; set; }
public string mo_task_code { get; set; }
/// <summary>
/// renwu di
/// </summary>
public string mo_task_id { get; set; }
/// <summary>
/// Desc:生产任务量

20
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportOutput.cs
View File

@@ -26,5 +26,25 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public int? prd_qty { get; set; }
public int? scrap_qty { get; set; }
/// <summary>
/// 模具编码
/// </summary>
public string mold_code { get; set; }
/// <summary>
/// 设备编码
/// </summary>
public string eqp_code { get; set; }
/// <summary>
/// 物料编码
/// </summary>
public string material_code { get; set; }
/// <summary>
/// 物料名称
/// </summary>
public string material_name { get; set; }
/// <summary>
/// 物料属性
/// </summary>
public string material_property { get; set; }
}
}

126
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/ProductionSchedulingCrInput.cs
View File

@@ -17,11 +17,11 @@ namespace Tnb.ProductionMgr.Entities.Dto
public string id { get; set; }
/// <summary>
/// Desc:工单类型 1、注塑/挤出工单 2、组装/包装工单
/// Desc:排产类型 1、注塑/挤出工单 2、组装/包装工单
/// Default:
/// Nullable:True
/// </summary>
public int? mo_type { get; set; }
public int? schedule_type { get; set; }
/// <summary>
/// Desc:计划开始时间
@@ -37,27 +37,21 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// </summary>
public DateTime? plan_end_date { get; set; }
/// <summary>
/// Desc:预计开始时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? estimated_start_date { get; set; }
///// <summary>
///// Desc:预计开始时间
///// Default:
///// Nullable:True
///// </summary>
//public DateTime? estimated_start_date { get; set; }
/// <summary>
/// Desc:预计结束时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? estimated_end_date { get; set; }
///// <summary>
///// Desc:预计结束时间
///// Default:
///// Nullable:True
///// </summary>
//public DateTime? estimated_end_date { get; set; }
/// <summary>
/// Desc:生产任务单状态
/// Default:
/// Nullable:True
/// </summary>
public string status { get; set; }
/// <summary>
/// Desc:工单Id
@@ -66,48 +60,18 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// </summary>
public string mo_id { get; set; }
/// <summary>
/// Desc:工单代码
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mo_code { get; set; }
/// <summary>
/// Desc:模具Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mold_id { get; set; }
/// <summary>
/// 模具编号
/// </summary>
public string mold_code { get; set; }
/// <summary>
/// Desc:模具名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mold_name { get; set; }
/// <summary>
/// Desc:设备Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string eqp_id { get; set; }
/// <summary>
/// 设备编号
/// </summary>
public string eqp_code { get; set; }
/// <summary>
/// Desc:设备名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string eqp_name { get; set; }
/// <summary>
/// Desc:产线编号
@@ -116,62 +80,20 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// </summary>
public string line_id { get; set; }
/// <summary>
/// Desc:产线名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string line_name { get; set; }
/// <summary>
/// Desc:产品Id
/// Desc:物料Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string item_id { get; set; }
/// <summary>
/// 产品编号
/// </summary>
public string item_code { get; set; }
/// <summary>
/// Desc:产品名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string item_name { get; set; }
/// <summary>
/// 产品规格型号
/// </summary>
public string item_standard { get; set; }
/// <summary>
/// Desc:创建用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string create_id { get; set; }
/// <summary>
/// Desc:修改用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string modify_id { get; set; }
public string material_id { get; set; }
/// <summary>
/// Desc:生产车间
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string workshop { get; set; }
/// <summary>
/// Desc:模穴数
/// Default:
/// Nullable:True
/// </summary>
public int? mold_cavity_qty { get; set; }
public string workshop_id { get; set; }
/// <summary>
/// Desc:计划生产数量
@@ -180,24 +102,10 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// </summary>
public int? plan_qty { get; set; }
/// <summary>
/// Desc:吨位
/// Default:
/// Nullable:True
/// </summary>
public decimal? tonnage { get; set; }
/// <summary>
/// 已排产数量
/// </summary>
public int scheduled_qty { get; set; }
/// <summary>
/// 设备型号
/// </summary>
public string eqp_type_code { get; set; }
}
}

33
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/SelfTestScrappedInput.cs
View File

@@ -16,7 +16,11 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// Default:
/// Nullable:True
/// </summary>
public string icmo_code { get; set; }
//public string mo_task_code { get; set; }
/// <summary>
/// 生产任务单Id
/// </summary>
public string mo_task_id { get; set; }
/// <summary>
/// Desc:报废数量
/// Default:
@@ -39,14 +43,35 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public class SelfTestScrappedInputItem
{
public string defective_category { get; set; }
/// <summary>
/// 次品分类Id
/// </summary>
public string category_id { get; set; }
/// <summary>
/// Desc:分类数量
/// Default:
/// Nullable:True
/// </summary>
public int? category_qty { get; set; }
public List<SelfTestScrappedItem> items { get; set; }
//public int? category_qty { get; set; }
public List<defectItem> items { get; set; }
}
public class defectItem
{
/// <summary>
/// Desc:次品项
/// Default:
/// Nullable:True
/// </summary>
public string defective_item { get; set; }
/// <summary>
/// Desc:次品项数量
/// Default:
/// Nullable:True
/// </summary>
public int defective_item_qty { get; set; }
}
}

48
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/SelfTestScrappedOutput.cs
View File

@@ -1,48 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using DbModels;
using Tnb.ProductionMgr.Entities;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 提报记录统计明细
/// </summary>
public class SelfTestScrappedOutput
{
/// <summary>
/// Desc:任务单号
/// Default:
/// Nullable:True
/// </summary>
public string icmo_code { get; set; }
/// <summary>
/// Desc:报废数量
/// Default:
/// Nullable:True
/// </summary>
public int scrap_qty { get; set; }
/// <summary>
/// 自检报废集合
/// </summary>
public List<SelfTestScrappedOutputItem> categoryItems { get; set; }
}
public class SelfTestScrappedOutputItem
{
public string defective_category { get; set; }
/// <summary>
/// Desc:分类数量
/// Default:
/// Nullable:True
/// </summary>
public int? category_qty { get; set; }
public List<PrdScrappedDefectiveItem> items { get; set; }
}
}