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

init

Browse Source
This commit is contained in:
qianhao.xu
2024-12-23 14:00:01 +08:00
parent 54e920680d
commit efae96b039
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,12 +15,12 @@ namespace DOAN.Service.MES.product;
[AppService(ServiceType = typeof(IProReportworkService), ServiceLifetime = LifeTime.Transient)]
public class ProReportworkService : BaseService<ProReportwork01>, IProReportworkService
{
List<BaseWorkRoute> GetRoute()
public List<BaseWorkRoute> GetRoute()
{
return Context.Queryable<BaseWorkRoute>().ToList();
}
List<BaseWorkProcesses> GetProcessByRoute(int route_id)
public List<BaseWorkProcesses> GetProcessByRoute(int route_id)
{
return Context.Queryable<BaseRelWorkRouteProcesses>()
.LeftJoin<BaseWorkProcesses>((rel,pro)=>rel.FkWorkProcesses==pro.Id)
@@ -96,10 +96,10 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
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.RouteId>0, it => it.RouteId == parm.RouteId)
.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].AddDays(1))
.AndIF(parm.JobDateTime != null && parm.JobDateTime[0] > DateTime.MinValue, it => it.JobDateTime >= parm.JobDateTime[0])
.AndIF(parm.JobDateTime != null && parm.JobDateTime[1] > DateTime.MinValue, it => it.JobDateTime <= parm.JobDateTime[1].AddDays(1))
;
return predicate;