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-04-26 17:58:53 +08:00
parent 631bb0c0e8
commit 6118106b72
9 changed files with 84 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs
View File

@@ -11,6 +11,22 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// </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>
@@ -22,7 +38,11 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// <summary>
/// 最早开始时间
/// </summary>
public DateTime? first_date { get; set; }
public string first_date { get; set; }
/// <summary>
/// 预计结束时间
/// </summary>
public DateTime? estimated_end_date { get; set; }

2
ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/IcmoUpInput.cs
View File

@@ -12,7 +12,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
public class IcmoUpInput
{
/// <summary>
/// 类别 1、模具 2、设备
/// 类别 1、设备 2、模具
/// </summary>
public int category { get; set; }
/// <summary>

29
ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
View File

@@ -93,26 +93,24 @@ namespace Tnb.ProductionMgr
{
var items = await _repository.AsSugarClient().Queryable<EqpEquipment>()
.Where(it => it.mold_id == moldId)
.Select(it => new
.Select(it => new EquipmentListOutput
{
eqp_id = it.id,
eqp_code = it.eqp_code,
eqp_type_code = it.eqp_type_code,
eqp_machine_num = it.eqp_machine_num,
tonnage = it.tonnage,
task_list_qty = SqlFunc.Subqueryable<PrdTask>().Where(x => x.eqp_id == it.id).Count(),
first_date = SqlFunc.Subqueryable<PrdTask>().Where(x => x.eqp_id == it.id).OrderByDesc(o => o.estimated_end_date).Select(x => x.estimated_end_date)
estimated_end_date = SqlFunc.Subqueryable<PrdTask>().Where(x => x.eqp_id == it.id).OrderByDesc(o => o.estimated_end_date).Select(x => x.estimated_end_date)
})
.Mapper(x =>
{
x.first_date = x.estimated_end_date.HasValue ? x.estimated_end_date.Value.ToString("yyyy-MM-dd HH:mm:ss") : "";
})
.ToListAsync();
//var items = await _repository.AsSugarClient().Queryable<EqpEquipment>()
// .InnerJoin<PrdTask>((a, b) => a.id == b.eqp_id)
// .Where((a, b) => a.mold_id == moldId)
// .Select((a, b) => new
// {
// eqp_code = a.eqp_code,
// eqp_type_code = a.eqp_type_code,
// tonnage = b.tonnage,
// task_list_qty = SqlFunc.Subqueryable<PrdTask>().Where(it => it.eqp_id == a.id).Count(),
// first_date = SqlFunc.Subqueryable<PrdTask>().Where(it => it.eqp_id == a.id).OrderByDesc(o => o.estimated_end_date).Select(it => it.estimated_end_date)
// }).ToListAsync();
return items;
}
@@ -154,7 +152,8 @@ namespace Tnb.ProductionMgr
comple_qty = x.comple_qty,
item_name = x.item_name,
mold_code = x.mold_code,
}).ToList();
})
.ToList();
return data;
}
/// <summary>
@@ -483,7 +482,7 @@ namespace Tnb.ProductionMgr
icmoItem.mold_cavity_qty = moldItem.cavity_qty;
break;
}
row = await db.Updateable(icmoItem).WhereColumns(it => new { input.icmo_id }).ExecuteCommandAsync();
row = await db.Updateable(icmoItem).ExecuteCommandAsync();
return (row > 0);
}