Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

报工修改

Browse Source
This commit is contained in:
qianhao.xu
2024-12-03 20:24:07 +08:00
parent 3ae2ceb7d9
commit b4aafa8345
2 changed files with 71 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DOAN.Model/MES/Product/Dto/ProReportworkDto.cs
View File

@@ -30,6 +30,7 @@ namespace DOAN.Model.BZFM.Dto
public string RouteCode { get; set; }
public int ProcessId { get; set; }
public string ProcessName { get; set; }
public int? PlanNum { get; set; }

36
DOAN.Service/MES/Product/ProReportworkService.cs
View File

@@ -1,20 +1,18 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using DOAN.Model.BZFM.Dto;
using DOAN.Model.BZFM;
using DOAN.Model.MES.base_;
using DOAN.Model.MES.product;
using DOAN.Repository;
using DOAN.Service.MES.product.IService;
using Infrastructure.Attribute;
namespace DOAN.Service.MES.product;
namespace DOAN.Service.MES.product
/// <summary>
/// 报工Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IProReportworkService), ServiceLifetime = LifeTime.Transient)]
public class ProReportworkService : BaseService<ProReportwork01>, IProReportworkService
{
/// <summary>
/// 报工Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IProReportworkService), ServiceLifetime = LifeTime.Transient)]
public class ProReportworkService : BaseService<ProReportwork01>, IProReportworkService
{
/// <summary>
/// 查询报工列表
/// </summary>
@@ -24,9 +22,15 @@ namespace DOAN.Service.MES.product
{
var predicate = QueryExp(parm);
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<ProReportwork01, ProReportworkDto>(parm);
var query = Queryable()
.Where(predicate.ToExpression());
var response = Context.Queryable(query).LeftJoin<BaseWorkProcesses>((q, w) => q.ProcessId == w.Id)
.Select((q, w) => new ProReportworkDto
{
ProcessName = w.Name
}, true
)
.ToPage_NO_Convert(parm);
return response;
}
@@ -76,14 +80,12 @@ namespace DOAN.Service.MES.product
var predicate = Expressionable.Create<ProReportwork01>()
.AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder))
.AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker))
.AndIF(!string.IsNullOrEmpty(parm.RouteCode), it => it.RouteCode==parm.RouteCode)
.AndIF(parm.ProcessId>0, it => it.ProcessId==parm.ProcessId)
.AndIF(!string.IsNullOrEmpty(parm.RouteCode), it => it.RouteCode == parm.RouteCode)
.AndIF(parm.ProcessId > 0, it => it.ProcessId == parm.ProcessId)
.AndIF(parm.JobDate != null && parm.JobDate[0] > DateTime.MinValue, it => it.JobDate >= parm.JobDate[0])
.AndIF(parm.JobDate != null && parm.JobDate[1] > DateTime.MinValue, it => it.JobDate <= parm.JobDate[1])
;
return predicate;
}
}
}