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-17 14:43:46 +08:00
parent 949c5a0184
commit fd3982b375
26 changed files with 443 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,15 +43,15 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 生产任务数量
/// </summary>
public int scheduled_qty { get; set; }
public int? scheduled_qty { get; set; }
/// <summary>
/// 计划数量
/// </summary>
public int plan_qty { get; set; }
public int? plan_qty { get; set; }
/// <summary>
/// 工序任务量
/// </summary>
public int process_task_qty { get; set; }
public int? process_task_qty { get; set; }
}
}

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

@@ -18,24 +18,24 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// Default:
/// Nullable:True
/// </summary>
public string mo_task_code { get; set; }
public List<BatchItem> batchItems { get; set; }
public string? mo_task_code { get; set; }
public List<BatchItem>? batchItems { get; set; }
}
public class BatchItem
{
public string batch { get; set; }
public string? batch { get; set; }
public string create_time { get; set; }
public string? create_time { get; set; }
/// <summary>
/// 报废数量
/// </summary>
public int scrap_qty { get; set; }
public int? scrap_qty { get; set; }
/// <summary>
///次品分类数组
/// </summary>
public List<CategoryItem> categoryItems { get; set; }
public List<CategoryItem>? categoryItems { get; set; }
}
public class CategoryItem
@@ -43,16 +43,16 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 次品分类名称
/// </summary>
public string name { get; set; }
public string? name { get; set; }
/// <summary>
/// 次品分类数量
/// </summary>
public int qty { get; set; }
public int? qty { get; set; }
/// <summary>
/// 次品项数组
/// </summary>
public List<DefectItem> defectItems { get; set; }
public List<DefectItem>? defectItems { get; set; }
}
public class DefectItem
@@ -60,10 +60,10 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 次品分类名称
/// </summary>
public string name { get; set; }
public string? name { get; set; }
/// <summary>
/// 次品分类数量
/// </summary>
public int qty { get; set; }
public int? qty { get; set; }
}
}

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

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

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

@@ -28,15 +28,15 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// <summary>
/// 是否同组标识
/// </summary>
public int group_flag { get; set; }
public int? group_flag { get; set; }
/// <summary>
/// 计划生产量
/// </summary>
public int plan_qty { get; set; }
public int? plan_qty { get; set; }
/// <summary>
/// 已完工数量
/// </summary>
public int comple_qty { get; set; }
public int? comple_qty { get; set; }
/// <summary>
/// 产品名称
/// </summary>

10
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMo.cs
View File

@@ -64,28 +64,28 @@ namespace Tnb.ProductionMgr.Entities
/// Default:
/// Nullable:True
/// </summary>
public decimal? plan_qty {get;set;}
public int? plan_qty {get;set;}
/// <summary>
/// Desc:已投入数量
/// Default:
/// Nullable:True
/// </summary>
public decimal? input_qty {get;set;}
public int? input_qty {get;set;}
/// <summary>
/// Desc:已完工数量
/// Default:
/// Nullable:True
/// </summary>
public decimal? complete_qty {get;set;}
public int? complete_qty {get;set;}
/// <summary>
/// Desc:报废数量
/// Default:
/// Nullable:True
/// </summary>
public decimal? scrap_qty {get;set;}
public int? scrap_qty {get;set;}
/// <summary>
/// Desc:计划开始时间
@@ -155,7 +155,7 @@ namespace Tnb.ProductionMgr.Entities
/// Default:
/// Nullable:True
/// </summary>
public decimal? relation_ratio {get;set;}
public int? relation_ratio {get;set;}
/// <summary>
/// Desc:下发人员ID

411
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs
View File

@@ -12,234 +12,255 @@ namespace Tnb.ProductionMgr.Entities
[SugarTable("prd_mo_task")]
public partial class PrdMoTask
{
public PrdMoTask(){
public PrdMoTask()
{
}
/// <summary>
/// Desc:编号
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey=true)]
public string id {get;set;} = SnowflakeIdHelper.NextId();
}
/// <summary>
/// Desc:编号
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey = true)]
public string id { get; set; } = SnowflakeIdHelper.NextId();
/// <summary>
/// Desc:生产任务编号
/// Default:
/// Nullable:True
/// </summary>
public string? mo_task_code {get;set;}
/// <summary>
/// Desc:生产任务编号
/// Default:
/// Nullable:True
/// </summary>
public string? mo_task_code { get; set; }
/// <summary>
/// Desc:工单Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? mo_id {get;set;}
/// <summary>
/// Desc:工单Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? mo_id { get; set; }
/// <summary>
/// Desc:物料Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? material_id {get;set;}
/// <summary>
/// Desc:物料Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? material_id { get; set; }
/// <summary>
/// Desc:模具Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? mold_id {get;set;}
/// <summary>
/// Desc:模具Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? mold_id { get; set; }
/// <summary>
/// Desc:设备Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? eqp_id {get;set;}
/// <summary>
/// Desc:设备Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? eqp_id { get; set; }
/// <summary>
/// Desc:产线id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? workline_id {get;set;}
/// <summary>
/// Desc:产线id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? workline_id { get; set; }
/// <summary>
/// Desc:工位id
/// Default:
/// Nullable:True
/// </summary>
public string? workstation_id {get;set;}
/// <summary>
/// Desc:工位id
/// Default:
/// Nullable:True
/// </summary>
public string? workstation_id { get; set; }
/// <summary>
/// Desc:工艺路线id
/// Default:
/// Nullable:True
/// </summary>
public string? workroute_id {get;set;}
/// <summary>
/// Desc:工艺路线id
/// Default:
/// Nullable:True
/// </summary>
public string? workroute_id { get; set; }
/// <summary>
/// Desc:生产bom id
/// Default:
/// Nullable:True
/// </summary>
public string? bom_id {get;set;}
/// <summary>
/// Desc:生产bom id
/// Default:
/// Nullable:True
/// </summary>
public string? bom_id { get; set; }
/// <summary>
/// Desc:任务单状态
/// Default:
/// Nullable:True
/// </summary>
public string? mo_task_status {get;set;}
/// <summary>
/// Desc:任务单状态
/// Default:
/// Nullable:True
/// </summary>
public string? mo_task_status { get; set; }
/// <summary>
/// Desc:计划数量
/// Default:
/// Nullable:True
/// </summary>
public decimal? plan_qty {get;set;}
/// <summary>
/// Desc:计划数量
/// Default:
/// Nullable:True
/// </summary>
public int? plan_qty { get; set; }
/// <summary>
/// Desc:已投入数量
/// Default:
/// Nullable:True
/// </summary>
public decimal? input_qty {get;set;}
/// <summary>
/// Desc:已投入数量
/// Default:
/// Nullable:True
/// </summary>
public int? input_qty { get; set; }
/// <summary>
/// Desc:已完工数量
/// Default:
/// Nullable:True
/// </summary>
public decimal? complete_qty {get;set;}
/// <summary>
/// Desc:已完工数量
/// Default:
/// Nullable:True
/// </summary>
public int? complete_qty { get; set; }
/// <summary>
/// Desc:报废数量
/// Default:
/// Nullable:True
/// </summary>
public decimal? scrap_qty {get;set;}
/// <summary>
/// Desc:报废数量
/// Default:
/// Nullable:True
/// </summary>
public int? scrap_qty { get; set; }
/// <summary>
/// Desc:已排产数量
/// Default:
/// Nullable:True
/// </summary>
public decimal? scheduled_qty {get;set;}
/// <summary>
/// Desc:已排产数量
/// Default:
/// Nullable:True
/// </summary>
public int? scheduled_qty { get; set; }
/// <summary>
/// Desc:排产类型:1、注塑、挤出2、组装、包装
/// Default:
/// Nullable:True
/// </summary>
public int? schedule_type {get;set;}
/// <summary>
/// Desc:排产类型:1、注塑、挤出2、组装、包装
/// Default:
/// Nullable:True
/// </summary>
public int? schedule_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_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? plan_end_date { get; set; }
/// <summary>
/// Desc:实际开工日期
/// Default:
/// Nullable:True
/// </summary>
public DateTime? act_start_date {get;set;}
/// <summary>
/// Desc:实际开工日期
/// Default:
/// Nullable:True
/// </summary>
public DateTime? act_start_date { get; set; }
/// <summary>
/// Desc:实际完工日期
/// Default:
/// Nullable:True
/// </summary>
public DateTime? act_end_date {get;set;}
/// <summary>
/// Desc:实际完工日期
/// Default:
/// Nullable:True
/// </summary>
public DateTime? act_end_date { get; set; }
/// <summary>
/// Desc:创建人
/// Default:
/// Nullable:True
/// </summary>
public string? create_id {get;set;}
/// <summary>
/// Desc:创建人
/// Default:
/// Nullable:True
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// Desc:创建时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? create_time {get;set;}
/// <summary>
/// Desc:创建时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// Desc:修改人
/// Default:
/// Nullable:True
/// </summary>
public string? modify_id {get;set;}
/// <summary>
/// Desc:修改人
/// Default:
/// Nullable:True
/// </summary>
public string? modify_id { get; set; }
/// <summary>
/// Desc:修改时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? modify_time {get;set;}
/// <summary>
/// Desc:修改时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? modify_time { get; set; }
/// <summary>
/// Desc:扩展字段
/// Default:
/// Nullable:True
/// </summary>
public string? extras {get;set;}
/// <summary>
/// Desc:扩展字段
/// Default:
/// Nullable:True
/// </summary>
public string? extras { get; set; }
/// <summary>
/// Desc:生产顺序
/// Default:
/// Nullable:True
/// </summary>
public int? prd_order {get;set;}
/// <summary>
/// Desc:生产顺序
/// Default:
/// Nullable:True
/// </summary>
public int? prd_order { 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 int? group_flag {get;set;}
/// <summary>
/// Desc:同组标识
/// Default:
/// Nullable:True
/// </summary>
public int? group_flag { get; set; }
/// <summary>
/// Desc:父任务Id
/// Default:
/// Nullable:True
/// </summary>
public string? parent_id {get;set;}
/// <summary>
/// Desc:父任务Id
/// Default:
/// Nullable:True
/// </summary>
public string? parent_id { get; set; }
/// <summary>
/// Desc:工序任务量
/// Default:
/// Nullable:True
/// </summary>
public int? process_task_qty {get;set;}
/// <summary>
/// Desc:工序任务量
/// Default:
/// Nullable:True
/// </summary>
public int? process_task_qty { get; set; }
/// <summary>
/// 设备类型编码
/// </summary>
[SugarColumn(IsIgnore = true)]
public string eqp_type_code { get; set; }
/// <summary>
/// 模具编号
/// </summary>
[SugarColumn(IsIgnore = true)]
public string mold_code { get; set; }
/// <summary>
/// 模具名称
/// </summary>
[SugarColumn(IsIgnore = true)]
public string mold_name { get; set; }
/// <summary>
/// 模具型腔数
/// </summary>
[SugarColumn(IsIgnore = true)]
public int mold_cavity_qty { get; set; }
}
}

2
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipTool.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.ProductionMgr.Entities
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey=true)]
public char id {get;set;} = SnowflakeIdHelper.NextId();
public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary>
/// Desc:TODO

20
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -402,7 +402,7 @@ namespace Tnb.ProductionMgr
})
.Mapper(it =>
{
it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString() : "";
it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString()! : "";
})
.ToListAsync();
}
@@ -434,7 +434,7 @@ namespace Tnb.ProductionMgr
scheduled_qty = a.scheduled_qty,
plan_qty = d.plan_qty
})
.Mapper(it => it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString() : "")
.Mapper(it => it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString()! : "")
.ToListAsync();
return result;
}
@@ -465,7 +465,7 @@ namespace Tnb.ProductionMgr
plan_qty = d.plan_qty,
process_task_qty = a.process_task_qty,
})
.Mapper(it => it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString() : "")
.Mapper(it => it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString()! : "")
.ToListAsync();
return result;
}
@@ -699,7 +699,7 @@ namespace Tnb.ProductionMgr
var mo = await _db.Queryable<PrdMo>().FirstAsync(it => it.id == input.mo_id);
var moCode = mo?.mo_code;
var taskCode = await _db.Queryable<PrdMoTask>().Where(it => !string.IsNullOrEmpty(it.mo_task_code) && it.mo_task_code.Contains(moCode)).OrderByDescending(it => it.mo_task_code).Select(it => it.mo_task_code).FirstAsync();
if (taskCode.IsNullOrEmpty())
if (taskCode!.IsNullOrEmpty())
{
moTask.mo_task_code = $"{moCode}-01";
}
@@ -727,7 +727,7 @@ namespace Tnb.ProductionMgr
taskLog.create_id = _userManager.UserId;
taskLog.create_time = DateTime.Now;
taskLog.mo_task_id = moTask.id;
taskLog.mo_task_code = moTask.mo_task_code;
taskLog.mo_task_code = moTask.mo_task_code!;
row = await _db.Insertable(taskLog).ExecuteCommandAsync();
//根据工单号获取当前工单包含的已排产数
var schedQty = _db.Queryable<PrdMoTask>().Where(it => it.mo_id == input.mo_id)?.Sum(d => d.scheduled_qty);
@@ -781,7 +781,7 @@ namespace Tnb.ProductionMgr
subMoTasks.Add(subMoTask);
}
//根据生产任务编号生成子任务编号
if (moTask.mo_task_code.IsNotEmptyOrNull())
if (moTask.mo_task_code!.IsNotEmptyOrNull())
{
for (int i = 1; i <= subMoTasks.Count; i++)
{
@@ -884,19 +884,19 @@ namespace Tnb.ProductionMgr
taskLog.id = SnowflakeIdHelper.NextId();
if (taskItem != null)
{
if (taskItem.mo_id.IsNotEmptyOrNull())
if (taskItem.mo_id!.IsNotEmptyOrNull())
{
taskLog.mo_code = (await db.Queryable<PrdMo>().FirstAsync(it => it.id == taskItem.mo_id))?.mo_code!;
}
if (taskItem.eqp_id.IsNotEmptyOrNull())
if (taskItem.eqp_id!.IsNotEmptyOrNull())
{
taskLog.eqp_code = (await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == taskItem.eqp_id))?.code!;
}
if (taskItem.mold_id.IsNotEmptyOrNull())
if (taskItem.mold_id!.IsNotEmptyOrNull())
{
taskLog.mold_code = (await db.Queryable<Molds>().FirstAsync(it => it.id == taskItem.mold_id))?.mold_code!;
}
if (taskItem.material_id.IsNotEmptyOrNull())
if (taskItem.material_id!.IsNotEmptyOrNull())
{
var material = await db.Queryable<BasMaterial>().FirstAsync(it => it.id == taskItem.material_id);
taskLog.item_code = material?.code!;