Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
This commit is contained in:
@@ -0,0 +1,50 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.ProductionMgr.Entities.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 设备列表输出参数
|
||||
/// </summary>
|
||||
public class EquipmentListOutput //: EqpEquipment 不能直接继承实体类
|
||||
{
|
||||
/// <summary>
|
||||
/// 设备Id
|
||||
/// </summary>
|
||||
public string eqp_id { get; set; }
|
||||
/// <summary>
|
||||
/// 设备编码
|
||||
/// </summary>
|
||||
public string eqp_code { get; set; }
|
||||
/// <summary>
|
||||
/// 设备类型编码
|
||||
/// </summary>
|
||||
public string eqp_type_code { get; set; }
|
||||
/// <summary>
|
||||
/// 设备机台号
|
||||
/// </summary>
|
||||
public string eqp_machine_num { get; set; }
|
||||
/// <summary>
|
||||
/// 任务单数量
|
||||
/// </summary>
|
||||
public int task_list_qty { get; set; }
|
||||
/// <summary>
|
||||
/// 吨位
|
||||
/// </summary>
|
||||
public double tonnage { get; set; }
|
||||
/// <summary>
|
||||
/// 最早开始时间
|
||||
/// </summary>
|
||||
public string first_date { get; set; }
|
||||
/// <summary>
|
||||
/// 预计结束时间
|
||||
/// </summary>
|
||||
public DateTime? estimated_end_date { get; set; }
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.ProductionMgr.Entities.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 生产任务单更新输入参数
|
||||
/// </summary>
|
||||
public class IcmoUpInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 类别 1、设备 2、模具
|
||||
/// </summary>
|
||||
public int category { get; set; }
|
||||
/// <summary>
|
||||
/// 生产任务单Id
|
||||
/// </summary>
|
||||
public string icmo_id { get; set; }
|
||||
/// <summary>
|
||||
/// 工单Id
|
||||
/// </summary>
|
||||
public string mo_id { get; set; }
|
||||
/// <summary>
|
||||
/// 模具Id
|
||||
/// </summary>
|
||||
public string mold_id { get; set; }
|
||||
/// <summary>
|
||||
/// 设备Id
|
||||
/// </summary>
|
||||
public string eqp_id { get; set; }
|
||||
/// <summary>
|
||||
/// 生产任务单数量
|
||||
/// </summary>
|
||||
public int scheduled_qty { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.ProductionMgr.Entities.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 生产工单下发输入参数
|
||||
/// </summary>
|
||||
public class MoCrInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 生产工单Id列表
|
||||
/// </summary>
|
||||
public List<string> WorkOrderIds { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Tnb.ProductionMgr.Entities;
|
||||
|
||||
namespace Tnb.ProductionMgr.Entities.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 模具列表输出参数
|
||||
/// </summary>
|
||||
public class MoldListOutput : Molds
|
||||
{
|
||||
/// <summary>
|
||||
/// 产品 名称
|
||||
/// </summary>
|
||||
public string item_name { get; set; }
|
||||
public string mold_id { get; set;}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.ProductionMgr.Entities.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 生产操作记录查询参数
|
||||
/// </summary>
|
||||
public class PrdTaskOperInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 工单号
|
||||
/// </summary>
|
||||
public string mo_no { get; set; }
|
||||
/// <summary>
|
||||
/// 任务单号
|
||||
/// </summary>
|
||||
public string task_no { get; set; }
|
||||
/// <summary>
|
||||
/// 产品编号
|
||||
/// </summary>
|
||||
public string item_code { get; set; }
|
||||
/// <summary>
|
||||
/// 设备编号
|
||||
/// </summary>
|
||||
public string eqp_code { get; set; }
|
||||
/// <summary>
|
||||
/// 计划生产开始日期
|
||||
/// </summary>
|
||||
public DateTime? plan_start_date{ get; set; }
|
||||
/// <summary>
|
||||
/// 计划生产结束日期
|
||||
/// </summary>
|
||||
public DateTime? plan_end_date { get; set; }
|
||||
/// <summary>
|
||||
/// 任务ID
|
||||
/// </summary>
|
||||
public string task_id { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Tnb.ProductionMgr.Entities;
|
||||
|
||||
namespace Tnb.ProductionMgr.Entities.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 生产操作记录输出类
|
||||
/// </summary>
|
||||
public class PrdTaskOperOutput : PrdTaskLog
|
||||
{
|
||||
/// <summary>
|
||||
///任务单操作状态
|
||||
/// </summary>
|
||||
public string statusName { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.ProductionMgr.Entities.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 生产任务单下发输入参数
|
||||
/// </summary>
|
||||
public class PrdTaskReleaseUpInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 生产任务ID列表
|
||||
/// </summary>
|
||||
public List<string> TaskIds { get; set; }
|
||||
/// <summary>
|
||||
/// 行为:
|
||||
///<br/> Release(任务下发),
|
||||
///<br/> Start(任务开始),
|
||||
///<br/> Closed(任务关闭),
|
||||
///<br/> Compled(任务完成)
|
||||
/// </summary>
|
||||
public string Behavior { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Tnb.ProductionMgr.Entities;
|
||||
|
||||
namespace Tnb.ProductionMgr.Entities.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 生产任务重新排序输出参数
|
||||
/// </summary>
|
||||
public class PrdTaskSortOutput : PrdTask
|
||||
{
|
||||
/// <summary>
|
||||
/// 序号
|
||||
/// </summary>
|
||||
public int no { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,201 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.ProductionMgr.Entities.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 生产工单排产输入参数
|
||||
/// </summary>
|
||||
public class ProductionSchedulingCrInput
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:工单类型 1、注塑/挤出工单 2、组装/包装工单
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public int? mo_type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:计划开始时间
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public DateTime? plan_start_date { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:计划结束时间
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </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_end_date { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Desc:生产任务单状态
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:工单Id
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </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:产线编号
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </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
|
||||
/// 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; }
|
||||
|
||||
/// <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; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:计划生产数量
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </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; }
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
|
||||
{
|
||||
/// <summary>
|
||||
/// 模具更换输入参数
|
||||
/// </summary>
|
||||
public class SwapMoldUpInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 模具Id
|
||||
/// </summary>
|
||||
public string mold_id { get; set; }
|
||||
/// <summary>
|
||||
/// 生产任务单Id
|
||||
/// </summary>
|
||||
public string icmo_id { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Tnb.ProductionMgr.Entities;
|
||||
|
||||
namespace Tnb.ProductionMgr.Entities.Dto
|
||||
{
|
||||
public class TaskOperRecordOutput
|
||||
{
|
||||
/// <summary>
|
||||
/// 任务单状态名称
|
||||
/// </summary>
|
||||
public string statusName { get; set; }
|
||||
/// <summary>
|
||||
/// Desc:工单Id
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string mo_id { get; set; }
|
||||
/// <summary>
|
||||
/// 任务单号
|
||||
/// </summary>
|
||||
public string taskId { get; set; }
|
||||
/// <summary>
|
||||
/// Desc:设备编号
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string eqp_code { get; set; }
|
||||
/// <summary>
|
||||
/// 模具编号
|
||||
/// </summary>
|
||||
public string mold_code { get; set; }
|
||||
/// <summary>
|
||||
/// 产品型号
|
||||
/// </summary>
|
||||
public string item_code { get; set; }
|
||||
/// <summary>
|
||||
/// 操作人姓名
|
||||
/// </summary>
|
||||
public string operatorName { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Security.Principal;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tnb.ProductionMgr.Entities.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 转移机台输入参数
|
||||
/// </summary>
|
||||
public class TransferPlatformUpInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 设备Id
|
||||
/// </summary>
|
||||
public string eqp_id { get; set; }
|
||||
/// <summary>
|
||||
/// 生产任务单Id
|
||||
/// </summary>
|
||||
public string icmo_id { get; set; }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user