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

去除引用common.props

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:35:59 +08:00
parent 6a2154edd9
commit c6b8dfc861
810 changed files with 3910 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/DictionaryTreeOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto
namespace Tnb.ProductionMgr.Entities.Dto
{
public class DictionaryTreeOutput
{

4
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/AddAndonInput.cs
View File

@@ -3,9 +3,9 @@ namespace Tnb.ProductionMgr.Entities.Dto
public class AddAndonInput
{
public string andon_type_id { get; set; }
public string andon_info_id { get; set; }
public string andon_breakdown_id { get; set; }
}
}

4
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/AndonPadListInput.cs
View File

@@ -3,9 +3,9 @@ namespace Tnb.ProductionMgr.Entities.Dto
public class AndonPadListInput
{
public string andon_type_id { get; set; }
public string status { get; set; }
/// <summary>
/// 页码.
/// </summary>

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

@@ -2,15 +2,15 @@ namespace Tnb.ProductionMgr.Entities.Dto
{
public class AndonPadListOutput
{
public string id { get; set; }
public string andon_info_name { get; set; }
public string promoter_name { get; set; }
public string repair_name { get; set; }
public string? promoter_time { get; set; }
public string? response_time { get; set; }
public string? start_repair_time { get; set; }
public string? end_repair_time { get; set; }
public string? confirm_time { get; set; }
public string status { get; set; }
public string id { get; set; }
public string andon_info_name { get; set; }
public string promoter_name { get; set; }
public string repair_name { get; set; }
public string? promoter_time { get; set; }
public string? response_time { get; set; }
public string? start_repair_time { get; set; }
public string? end_repair_time { get; set; }
public string? confirm_time { get; set; }
public string status { get; set; }
}
}

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/AndonRecordInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
public class AndonRecordInput
{

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/CloseDownStartInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 停机开始输入参数

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/ClosedownHistoryOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
public class ClosedownHistoryOutput
{

7
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/ClosedownHistoryQuery.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Filter;
using JNPF.Common.Filter;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{

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

@@ -6,17 +6,17 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public class CountEstimatedEndTimeInput
{
public DateTime estimated_start_date { get; set; }
public int scheduled_qty { get; set; }
public string? equip_id { get; set; }
public string? molds_id { get; set; }
public string? material_id { get; set; }
public string? mbom_id { get; set; }
/// <summary>
/// 1 注塑挤出排产 2 组装包装排产
/// </summary>

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/EquipmentListOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto
namespace Tnb.ProductionMgr.Entities.Dto
{
/// <summary>
/// 设备列表输出参数

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

@@ -11,16 +11,16 @@ namespace Tnb.ProductionMgr.Entities.Dto
{
public string id { get; set; }
public string code { get; set; }
public string mo_task_id { get; set; }
public List<FeedingRecordMaterialChildren> children { get; set; } = new List<FeedingRecordMaterialChildren>();
}
public class FeedingRecordMaterialChildren
{
public string material_code { get; set; }
public string material_name { get; set; }
}
}

4
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/GanntSaveInput.cs
View File

@@ -6,13 +6,13 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string row_id { get; set; }
public GanntTime time { get; set; }
}
public class GanntTime
{
public DateTime? start { get; set; }
public DateTime? end { get; set; }
}
public class GanntTimeTips
{
public string mo_task_code { get; set; }

10
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/GenSubMoCrInput.cs
View File

@@ -1,15 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
public class GenSubMoCrInput
{
public string bom_id { get; set; }
/// <summary>
/// 父工单id
/// </summary>

4
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/GeneralOutstockInput.cs
View File

@@ -6,11 +6,11 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// 目标库位编号
/// </summary>
public string location_code { get; set; } = string.Empty;
/// 所属工位
/// </summary>
public string? workstation_id { get; set; }
/// <summary>
/// 任务单
/// </summary>

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

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto
namespace Tnb.ProductionMgr.Entities.Dto
{
/// <summary>
/// 生产任务单更新输入参数
@@ -35,5 +29,5 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// 生产任务单数量
/// </summary>
//public int scheduled_qty { get; set; }
}
}
}

34
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/KittingOutInput.cs
View File

@@ -7,82 +7,82 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// 出库仓库ID
/// </summary>
public string warehouse_id { get; set; } = string.Empty;
/// <summary>
/// 目标库位编号
/// </summary>
public string location_code { get; set; } = string.Empty;
/// <summary>
/// 产品ID
/// </summary>
public string material_id { get; set; } = string.Empty;
/// <summary>
/// 产品编号
/// </summary>
public string? material_code { get; set; }
/// <summary>
/// 齐套搭配方案ID
/// </summary>
public string collocation_scheme_id { get; set; } = string.Empty;
/// <summary>
/// 齐套搭配方案编号
/// </summary>
public string? collocation_scheme_code { get; set; }
/// <summary>
/// 顺序号
/// </summary>
public string? seq { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// 所属组织
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 流程任务Id
/// </summary>
public string? f_flowtaskid { get; set; }
/// <summary>
/// 流程引擎Id
/// </summary>
public string? f_flowid { get; set; }
/// <summary>
/// 单据号
/// </summary>
public string code { get; set; } = string.Empty;
/// <summary>
/// 所属工位
/// </summary>
public string? workstation_id { get; set; }
/// <summary>
/// 所属产线
/// </summary>
public string? workline_id { get; set; }
/// <summary>
/// 任务单
/// </summary>
public string? mo_task_id { get; set; }
public List<Dictionary<string,object>> tableField115 { get; set; }
public List<Dictionary<string, object>> tableField115 { get; set; }
}
}

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

@@ -2,26 +2,26 @@ namespace Tnb.ProductionMgr.Entities.Dto
{
public class KittingOutNewInput
{
/// <summary>
/// 目标库位编号
/// </summary>
public string location_code { get; set; } = string.Empty;
/// <summary>
/// 齐套搭配方案ID
/// </summary>
public string collocation_scheme_id { get; set; } = string.Empty;
/// 所属工位
/// </summary>
public string? workstation_id { get; set; }
/// <summary>
/// 任务单
/// </summary>
public string? mo_task_id { get; set; }
}
}

2
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MaterialPreparationPlanOutput.cs
View File

@@ -21,7 +21,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string workstation_id { get; set; }
public List<MaterialPreparationPlanDDOutput> children { get; set; } = new List<MaterialPreparationPlanDDOutput>();
}
public class MaterialPreparationPlanDDOutput
{
public string material_id { get; set; }

24
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MaterialReceiptInput.cs
View File

@@ -3,52 +3,52 @@ namespace Tnb.ProductionMgr.Entities.Dto
public class MaterialReceiptInput
{
public string? id { get; set; }
/// <summary>
/// 签收单号
/// </summary>
public string code { get; set; } = string.Empty;
/// <summary>
/// 工位id
/// </summary>
public string station_id { get; set; } = string.Empty;
/// <summary>
/// 任务单id
/// </summary>
public string? mo_task_id { get; set; }
/// <summary>
/// 工序id
/// </summary>
public string? process_id { get; set; }
/// <summary>
/// 设备id
/// </summary>
public string? equip_id { get; set; }
/// <summary>
/// 车间id
/// </summary>
public string? workshop_id { get; set; }
/// <summary>
/// 载具id
/// </summary>
public string? carry_id { get; set; }
/// <summary>
/// 产线id
/// </summary>
public string? workline_id { get; set; }
/// <summary>
/// 二维码信息
/// </summary>
public string? carry_code { get; set; }
/// <summary>
/// 备注
/// </summary>
@@ -58,7 +58,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// 生产bom工序id
/// </summary>
public string? mbom_process_id { get; set; }
public List<Dictionary<string,object>>? details { get; set; }
public List<Dictionary<string, object>>? details { get; set; }
}
}

10
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MaterialReceiptNewInput.cs
View File

@@ -6,22 +6,22 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// 工位id
/// </summary>
public string station_id { get; set; } = string.Empty;
/// <summary>
/// 任务单id
/// </summary>
public string? mo_task_id { get; set; }
/// <summary>
/// 设备id
/// </summary>
public string? equip_id { get; set; }
/// <summary>
/// 二维码信息
/// </summary>
public string? carry_code { get; set; }
public List<Dictionary<string,string>>? details { get; set; }
public List<Dictionary<string, string>>? details { get; set; }
}
}

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MoCrInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto
namespace Tnb.ProductionMgr.Entities.Dto
{
/// <summary>
/// 生产工单下发输入参数

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

@@ -1,11 +1,4 @@
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
namespace Tnb.ProductionMgr.Entities.Dto
{
/// <summary>
/// 模具列表输出参数
@@ -36,6 +29,6 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// 可用台数
/// </summary>
public int available_stations { get; set; }
public string mold_id { get; set;}
public string mold_id { get; set; }
}
}

36
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PADPackageTaskPageOutput.cs
View File

@@ -3,12 +3,12 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public class PADPackageTaskPageOutput
{
public string id { get; set; }
/// <summary>
/// 工单号号
/// </summary>
public string? mo_code { get; set; }
/// <summary>
/// 生产任务编号
/// </summary>
@@ -23,15 +23,15 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 物料Id
/// </summary>
public string material_id { get; set; }
public string material_code { get; set; }
public string material_name { get; set; }
/// <summary>
/// 产线id
/// </summary>
public string? workline_id { get; set; }
public string? workline_name { get; set; }
/// <summary>
@@ -43,7 +43,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 任务单状态
/// </summary>
public string? mo_task_status { get; set; }
/// <summary>
@@ -65,7 +65,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 排产类型:1、注塑、挤出2、组装、包装
/// </summary>
public int? schedule_type { get; set; }
public int? reported_work_qty { get; set; }
/// <summary>
@@ -81,14 +81,14 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 父任务Id
/// </summary>
public string? parent_id { get; set; }
/// <summary>
/// 工序id
/// </summary>
public string process_id { get; set; }
public string process_name { get; set; }
public string mbom_process_id { get; set; }
public string equip_id { get; set; }
public string equip_code { get; set; }
@@ -97,7 +97,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string mold_code { get; set; }
public string mold_name { get; set; }
public DateTime? create_time { get; set; }
/// <summary>
/// 成型周期
/// </summary>
@@ -107,17 +107,17 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 模穴数
/// </summary>
public int? mold_cavity { get; set; }
/// <summary>
/// 标准工时
/// </summary>
public string? standard_time { get; set; }
/// <summary>
/// 实际开工日期
/// </summary>
public string? act_start_date { get; set; }
/// <summary>
/// 预计结束时间
/// </summary>
@@ -134,22 +134,22 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 最小包装
/// </summary>
public decimal? minpacking { get; set; }
/// <summary>
/// 主单位数量
/// </summary>
public string? main_num { get; set; }
/// <summary>
/// 副单位数量（kg）
/// </summary>
public string? deputy_num { get; set; }
/// <summary>
/// 第三方平台设备编号
/// </summary>
public string? third_equip_code { get; set; }
/// <summary>
/// 称重点位名称
/// </summary>

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackPrdTaskUpInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 组装、包装，生产任务修改输入参数

7
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackReportTreeOutput.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Security;
using JNPF.Common.Security;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{

10
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSchedlingCrInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 组装、包装排产输入参数
@@ -27,7 +21,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 物料Id
/// </summary>
public string material_id { get; set; }
/// <summary>
/// 排产数量
/// </summary>

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackScheldToBeIssueListInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 组装、包装待下发列表输入参数

11
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs
View File

@@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.DirectoryServices.Protocols;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 组装、包装生产任务待下发输出参数列表
@@ -80,7 +73,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 预计结束时间
/// </summary>
public string? estimated_end_date { get; set; }
/// <summary>
/// 工序名称
/// </summary>

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackingSchedulingListOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 组装、包装排产列表输出类

14
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockInput.cs
View File

@@ -7,7 +7,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// 单据类型
/// </summary>
public string bill_type { get; set; } = string.Empty;
/// <summary>
/// 载具编号
@@ -18,22 +18,22 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// 起始库位编号
/// </summary>
public string location_code { get; set; } = string.Empty;
/// <summary>
/// 检验(0-未检 1-已检)
/// </summary>
public int is_check { get; set; }
public string? station_id { get; set; }
public string? workline_id { get; set; }
public string? workshop_id { get; set; }
/// <summary>
/// 子表明细
/// </summary>
public List<Dictionary<string,string>> details { get; set; }
public List<Dictionary<string, string>> details { get; set; }
}
}

100
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoFromOneListOutput.cs
View File

@@ -9,28 +9,28 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 工单id
/// </summary>
public string id { get; set; }
public string mo_code { get; set; }
public string material_id { get; set; }
public string material_code { get; set; }
public string material_name { get; set; }
public string? material_standard { get; set; }
public string? act_start_date { get; set; }
public string? act_end_date { get; set; }
/// <summary>
/// 类型 1注塑挤出 2 组装包装
/// </summary>
public int type { get; set; }
}
/// <summary>
/// 工单追溯二级列表输出类
/// </summary>
@@ -40,33 +40,33 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 任务单id
/// </summary>
public string id { get; set; }
public string mo_task_code { get; set; }
public string material_id { get; set; }
public string material_code { get; set; }
public string material_name { get; set; }
public string? material_standard { get; set; }
public string? act_start_date { get; set; }
public string? act_end_date { get; set; }
public string? workline_name { get; set; }
public string? workshop_name { get; set; }
public string? mbom_version { get; set; }
public string station_name { get; set; }
public string equip_code { get; set; }
}
/// <summary>
/// 工单追溯三级列表输出类
/// </summary>
@@ -76,25 +76,25 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 任务单id
/// </summary>
public string id { get; set; }
public string mo_task_code { get; set; }
public string material_id { get; set; }
public string material_code { get; set; }
public string material_name { get; set; }
public string? workline_id { get; set; }
public string? batch { get; set; }
public string process_id { get; set; }
public string process_name { get; set; }
public string station_name { get; set; }
}
/// <summary>
/// 工单追溯人输出类
/// </summary>
@@ -106,16 +106,16 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
// public string id { get; set; }
//
// public string workgroup_name { get; set; }
public string employee_name { get; set; }
public string work_time { get; set; }
public DateTime? start_time { get; set; }
public DateTime? end_time { get; set; }
}
/// <summary>
/// 工单追溯机输出类
/// </summary>
@@ -123,9 +123,9 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
public string equip_code { get; set; }
public string mold_code { get; set; }
}
/// <summary>
/// 工单追溯料输出类
/// </summary>
@@ -138,8 +138,8 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string instock_time { get; set; }
public string feeding_time { get; set; }
public string check_conclusion { get; set; }
}
public class PrdMoReverseFromMaterialoutput
@@ -163,7 +163,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 批次
/// </summary>
public string code_batch { get; set;}
public string code_batch { get; set; }
/// <summary>
/// 采购单号
/// </summary>
@@ -223,7 +223,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string supplier_name { get; set; }
public string unit_name { get; set; }
}
/// <summary>
/// 物料反向追溯投料信息输出父类
/// </summary>
@@ -236,9 +236,9 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string material_name { get; set; }
public string material_standard { get; set; }
public List<PrdMoReverseFromFeedingDetailOutput> children { get; set; } = new List<PrdMoReverseFromFeedingDetailOutput>();
}
/// <summary>
/// 物料反向追溯投料信息输出字类
/// </summary>
@@ -255,9 +255,9 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string feeding_name { get; set; }
public string station_name { get; set; }
public string process_name { get; set; }
}
public class PrdMoReverseFromOutput
{
/// <summary>
@@ -278,7 +278,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 批次
/// </summary>
public string code_batch { get; set;}
public string code_batch { get; set; }
/// <summary>
/// 单位ID
/// </summary>
@@ -332,5 +332,5 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// </summary>
public string delivery_time { get; set; }
}
}

18
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoFromQueryInput.cs
View File

@@ -11,11 +11,11 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 每页行数.
/// </summary>
public int pageSize { get; set; } = 50;
public string? mo_code { get; set; }
public string? mo_task_code { get; set; }
public string? barcode { get; set; }
}
@@ -25,25 +25,25 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string mo_task_code { get; set; }
public string barcode { get; set; }
}
public class PrdMoFromThreeQueryInput
{
public string mo_task_id { get; set; }
public string mo_task_code { get; set; }
public string barcode { get; set; }
}
}
public class PrdMoFromTabQueryInput
{
public string mo_task_id { get; set; }
public string barcode { get; set; }
}
}
public class PrdMoReverseFromQueryInput
{
public string barcode { get; set; }
}
public class PrdMoReverseFromOutInfoQueryInput
{
public string feeding_detail_id { get; set; }

4
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListOuput.cs
View File

@@ -3,9 +3,9 @@ namespace Tnb.ProductionMgr.Entities.Dto
public class PrdMoListOuput
{
public string id { get; set; }
public string mo_type { get; set; }
public string mo_source { get; set; }
public string mo_code { get; set; }
public string plan_start_date { get; set; }

11
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListTreeOutput.cs
View File

@@ -1,13 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Security;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
public class PrdMoListTreeOutput
public class PrdMoListTreeOutput
{
//public Dictionary<string, object> row { get; set; }
@@ -136,7 +129,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 父工单id
/// </summary>
public string parent_id { get; set; } = string.Empty;
/// <summary>
/// 获取节点id.
/// </summary>

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

@@ -1,12 +1,4 @@
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
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 提报记录统计明细
@@ -27,7 +19,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string? batch { get; set; }
public string? create_time { get; set; }
public string? create_name { get; set; }
/// <summary>
/// 报废数量

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskFromEqpIdInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 根据设备id 获取生产任务列表，输入参数

4
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs
View File

@@ -5,8 +5,8 @@ namespace Tnb.ProductionMgr.Entities.Dto
public string id { get; set; }
public string mo_task_code { get; set; }
public string material_id { get; set; }
public string mold_id { get; set; }
public string eqp_id { get; set; }
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; }

19
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskOutput.cs
View File

@@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.DirectoryServices.Protocols;
using System.Linq;
using System.Security.Principal;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Security;
using JNPF.Common.Security;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
@@ -76,7 +69,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 预计完工时间
/// </summary>
public string estimated_end_date { get; set; }= string.Empty;
public string estimated_end_date { get; set; } = string.Empty;
/// <summary>
/// 工序编码
/// </summary>
@@ -84,8 +77,8 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 工序名称
/// </summary>
public string process_name { get; set;}
public string process_name { get; set; }
public string create_time { get; set; }
}
public class PrdMoTaskTreeOutput : TreeModel
@@ -97,7 +90,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string? material_id { get; set; }
public string? mold_id { get; set; }
public string? eqp_id { get; set; }
/// <summary>
/// 物料
/// </summary>
@@ -122,7 +115,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 预计结束时间
/// </summary>
public string? estimated_end_date { get; set; }
/// <summary>
/// 创建时间
/// </summary>

7
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMotreeOutput.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Security;
using JNPF.Common.Security;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdPackReportQueryInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Filter;
using Microsoft.AspNetCore.Mvc.RazorPages;
using JNPF.Common.Filter;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{

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

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 生产提报输入参数
@@ -98,12 +92,12 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// Nullable:True
/// </summary>
public int icmo_qty { get; set; }
/// <summary>
/// 工位
/// </summary>
public string? station { get; set; }
/// <summary>
/// 料箱二维码
/// </summary>

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

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
public class PrdReportOutput
{
@@ -47,6 +41,6 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// </summary>
public string material_property { get; set; }
}
}

10
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskOperInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto
namespace Tnb.ProductionMgr.Entities.Dto
{
/// <summary>
/// 生产操作记录查询参数
@@ -30,7 +24,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// <summary>
/// 计划生产开始日期
/// </summary>
public DateTime? plan_start_date{ get; set; }
public DateTime? plan_start_date { get; set; }
/// <summary>
/// 计划生产结束日期
/// </summary>

11
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskOperOutput.cs
View File

@@ -1,11 +1,4 @@
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
namespace Tnb.ProductionMgr.Entities.Dto
{
/// <summary>
/// 生产操作记录输出类
@@ -16,7 +9,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
///任务单操作状态
/// </summary>
public string statusName { get; set; }
/// <summary>
/// 排产类型:1、注塑、挤出2、组装、包装
/// </summary>

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskReleaseUpInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto
namespace Tnb.ProductionMgr.Entities.Dto
{
/// <summary>
/// 生产任务单下发输入参数

13
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskSortOutput.cs
View File

@@ -1,16 +1,9 @@
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
namespace Tnb.ProductionMgr.Entities.Dto
{
/// <summary>
/// 生产任务重新排序输出参数
/// </summary>
public class PrdTaskSortOutput
public class PrdTaskSortOutput
{
/// <summary>
/// 序号
@@ -24,7 +17,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// 生产任务状态
/// 生产任务状态
/// </summary>
public string status { get; set;}
public string status { get; set; }
/// <summary>
/// 是否同组标识
/// </summary>

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

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto
namespace Tnb.ProductionMgr.Entities.Dto
{
/// <summary>
/// 生产工单排产输入参数
@@ -15,7 +9,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
///
/// </summary>
public string id { get; set; }
/// <summary>
/// Desc:排产类型 1、注塑/挤出工单 2、组装/包装工单
/// Default:
@@ -43,14 +37,14 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// 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:
@@ -126,5 +120,5 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// </summary>
public string bom_id { get; set; }
}
}

6
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/ReportRecordListOutput.cs
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? plan_qty { get; set; }
public int? completed_qty { get; set; }
public string? plan_start_date { get; set; } = string.Empty;
public int? reported_work_qty { get; set; }
public int? reported_work_qty { get; set; }
public string? status { get; set; } = string.Empty;
public List<ReportRecordListChildrenOutput>? tablefield107 { get; set; } = new List<ReportRecordListChildrenOutput>();
@@ -27,7 +27,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
public string? create_id { get; set; } = string.Empty;
public string? create_id_id { get; set; } = string.Empty;
public string? create_time { get; set; } = string.Empty;
public string? batch { get; set; } = string.Empty;
}
}

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

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 自检报废输入类
@@ -57,7 +51,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public List<defectItem> items { get; set; }
}
public class defectItem
public class defectItem
{
/// <summary>

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/SwapMoldUpInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 模具更换输入参数

9
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/TaskOperRecordOutput.cs
View File

@@ -1,11 +1,4 @@
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
namespace Tnb.ProductionMgr.Entities.Dto
{
public class TaskOperRecordOutput
{

9
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/TransferPlatformUpInput.cs
View File

@@ -1,11 +1,4 @@
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
namespace Tnb.ProductionMgr.Entities.Dto
{
/// <summary>
/// 转移机台输入参数

8
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/UnPackSchedlingInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
/// <summary>
/// 拆解组装包装排产输入参数