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

17
EquipMgr/Tnb.EquipMgr/EquipmentService.cs
View File

@@ -46,21 +46,20 @@ namespace Tnb.EquipMgr
};
var pagedList = await _repository.AsQueryable()
.Where(it => it.station_code == input.station_code || string.IsNullOrEmpty(input.station_code))
//.Where(it => it.station_code == input.station_code || string.IsNullOrEmpty(input.station_code))
.Select(it => new EquipmentListOutput
{
id = it.id,
eqp_code = it.eqp_code,
eqp_name = it.eqp_name,
eqp_type_code = it.eqp_type_code,
accept_status = it.accept_status,
supplier_code = it.supplier_code,
accept_date = it.accept_date,
eqp_code = it.code,
eqp_name = it.name,
eqp_type_code = SqlFunc.Subqueryable<EqpEquipType>().Where(x=>x.id == it.equip_type_id).Select(x=>x.code),
//accept_status = it.accept_status,
//supplier_code = it.supplier_code,
install_date = it.install_date,
use_department_code = it.use_department_code,
//use_department_code = it.use_department_code,
remark = it.remark,
})
.Mapper(it => it.accept_status = dic.ContainsKey(it.accept_status) ? dic[it.accept_status] : "")
//.Mapper(it => it.accept_status = dic.ContainsKey(it.accept_status) ? dic[it.accept_status] : "")
.ToPagedListAsync(input.currentPage, input.pageSize);
return pagedList;
}