From 1e8987908e74641cf1265a43d6462a450b4ac753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Fri, 11 Apr 2025 15:16:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MES/Order/DeliveryScheduleController.cs | 2 +- .../Mobile/ReportFlowController.cs | 135 ++++--- .../MES/Order/DeliveryScheduleService.cs | 4 +- DOAN.Service/Mobile/ReportFlowService.cs | 343 ++++++++++-------- 4 files changed, 281 insertions(+), 203 deletions(-) diff --git a/DOAN.Admin.WebApi/Controllers/MES/Order/DeliveryScheduleController.cs b/DOAN.Admin.WebApi/Controllers/MES/Order/DeliveryScheduleController.cs index 18e04bf..6587ec5 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/Order/DeliveryScheduleController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/Order/DeliveryScheduleController.cs @@ -8,7 +8,7 @@ using DOAN.Service.MES.order; using Infrastructure.Converter; -namespace DOAN.Admin.WebApi.Controllers.MES.Order +namespace DOAN.Admin.WebApi.Controllers { /// /// 交付进度 diff --git a/DOAN.Admin.WebApi/Controllers/Mobile/ReportFlowController.cs b/DOAN.Admin.WebApi/Controllers/Mobile/ReportFlowController.cs index 0bb2a70..895e92a 100644 --- a/DOAN.Admin.WebApi/Controllers/Mobile/ReportFlowController.cs +++ b/DOAN.Admin.WebApi/Controllers/Mobile/ReportFlowController.cs @@ -19,6 +19,7 @@ public class ReportFlowController : BaseController { _reportFlowService = reportFlowService; } + /// /// 根据指定日期获取工单列表 /// @@ -28,11 +29,11 @@ public class ReportFlowController : BaseController /// [HttpGet("get_workorders_by_date")] - public IActionResult GetWorkOrdersByDate(DateTime startDate, DateTime endDate) + public IActionResult GetWorkOrdersByDate(DateTime startDate, DateTime endDate) { startDate = DOANConvertDate.ConvertLocalDate(startDate); endDate = DOANConvertDate.ConvertLocalDate(endDate); - if(startDate == DateTime.MinValue||endDate==DateTime.MinValue) + if (startDate == DateTime.MinValue || endDate == DateTime.MinValue) { throw new CustomException("date is error"); } @@ -40,8 +41,6 @@ public class ReportFlowController : BaseController return SUCCESS(response); } - - //TODO 查询工单详情 /// /// 查询工单详情 @@ -57,10 +56,11 @@ public class ReportFlowController : BaseController var response = _reportFlowService.GetWorkOrderDetail(workOrder); if (response == null) { - return ToResponse(ResultCode.SUCCESS, "工单不存在"); + return ToResponse(ResultCode.SUCCESS, "工单不存在"); } return SUCCESS(response); } + //TODO 查询工序报工详情 /// /// 查询某个工序报工详情 @@ -76,23 +76,40 @@ public class ReportFlowController : BaseController { throw new CustomException("workorder is null"); } - return ToResponse(ResultCode.SUCCESS,_reportFlowService.GetProcessReportWorkDetail(workorder, processId)); + return ToResponse( + ResultCode.SUCCESS, + _reportFlowService.GetProcessReportWorkDetail(workorder, processId) + ); } - - //TODO 领料工序 [HttpGet("feed_process_reportwork")] - public IActionResult FeedProcessReportwork(string workorder, int processId, int finish_num,string stove_code,string feed_order,string process_operator) + public IActionResult FeedProcessReportwork( + string workorder, + int processId, + int finish_num, + string stove_code, + string feed_order, + string process_operator + ) { if (string.IsNullOrEmpty(workorder)) { throw new CustomException("workorder or process is null"); } - return SUCCESS(_reportFlowService.FeedProcessReportwork(workorder, processId, finish_num, stove_code, feed_order, process_operator)); + return SUCCESS( + _reportFlowService.FeedProcessReportwork( + workorder, + processId, + finish_num, + stove_code, + feed_order, + process_operator + ) + ); } - + //TODO 工序报工 /// /// 工序报工 @@ -104,47 +121,65 @@ public class ReportFlowController : BaseController /// /// [HttpGet("process_reportwork")] - public IActionResult ProcessReportWork([FromQuery]ProReportWorkDto proReportWorkDto) + public IActionResult ProcessReportWork([FromQuery] ProReportWorkDto proReportWorkDto) { if (string.IsNullOrEmpty(proReportWorkDto.workorder)) { throw new CustomException("workorder or process is null"); } - - return SUCCESS(_reportFlowService.ProcessReportWork(proReportWorkDto.workorder, proReportWorkDto. processId, proReportWorkDto.finish_num, proReportWorkDto.bad_num, proReportWorkDto.process_operator)); + + return SUCCESS( + _reportFlowService.ProcessReportWork( + proReportWorkDto.workorder, + proReportWorkDto.processId, + proReportWorkDto.finish_num, + proReportWorkDto.bad_num, + proReportWorkDto.process_operator + ) + ); } //TODO 出货工序 [HttpGet("shipment_process_reportwork")] - public IActionResult ShipmentProcessReportwork(string workorder, int processId, int finish_num, int bad_num, string customer_order, string process_operator) + public IActionResult ShipmentProcessReportwork( + string workorder, + int processId, + int finish_num, + int bad_num, + string customer_order, + string process_operator + ) { if (string.IsNullOrEmpty(workorder)) { throw new CustomException("workorder or process is null"); } - int ret = _reportFlowService.ShipmentProcessReportwork(workorder, processId, finish_num, bad_num, customer_order, process_operator); + int ret = _reportFlowService.ShipmentProcessReportwork( + workorder, + processId, + finish_num, + bad_num, + customer_order, + process_operator + ); string data = ""; - if (ret == 0) - { - data = "失败"; - - } - if (ret==1) + if (ret == 0) + { + data = "系统操作失败"; + } + if (ret == 1) { data = "成功"; - - } - if (ret == 2) - { - data = "采购订单号和工单号不匹配"; - - } - if (ret == 3) - { - data = "出货数量超额"; - - } - return SUCCESS(data); + } + if (ret == 2) + { + data = "采购订单号和工单号不匹配"; + } + if (ret == 3) + { + data = "出货数量超额"; + } + return SUCCESS(data); } //TODO 获取工单下的报工列表 @@ -159,49 +194,35 @@ public class ReportFlowController : BaseController return SUCCESS(_reportFlowService.GetWorkOrderReportWorkList(workorder)); } - //TODO 输入姓名拼音，查询此人今日报工记录 [HttpGet("get_report_info_by_name")] - public IActionResult GetReportInfoByName([FromQuery] ProReportWorkDto2 query ) + public IActionResult GetReportInfoByName([FromQuery] ProReportWorkDto2 query) { - if (string.IsNullOrEmpty(query.name)) + if (string.IsNullOrEmpty(query.name)) { throw new CustomException("name is null"); - } - var response= _reportFlowService.GetReportInfoByName(query); - return SUCCESS(response); - + var response = _reportFlowService.GetReportInfoByName(query); + return SUCCESS(response); } - - - //TODO 根据工艺路线获取所有工序 [HttpGet("get_process_by_route")] - public IActionResult GetProcessByRoute(int route_id=32) + public IActionResult GetProcessByRoute(int route_id = 32) { var response = _reportFlowService.GetProcessByRoute(route_id); return SUCCESS(response); - } - - //TODO 输入工序id 查询今天报工记录 [HttpGet("get_report_by_processid")] public IActionResult GetReportByProcessId([FromQuery] ProReportWorkDto3 query) { - if (query.processId <= 0) { + if (query.processId <= 0) + { throw new CustomException("processId is error"); } var response = _reportFlowService.GetReportByProcessId(query); return SUCCESS(response); } - - - - - - -} \ No newline at end of file +} diff --git a/DOAN.Service/MES/Order/DeliveryScheduleService.cs b/DOAN.Service/MES/Order/DeliveryScheduleService.cs index 1b50c57..90adf07 100644 --- a/DOAN.Service/MES/Order/DeliveryScheduleService.cs +++ b/DOAN.Service/MES/Order/DeliveryScheduleService.cs @@ -25,7 +25,7 @@ namespace DOAN.Service.MES.Order { var predicate = QueryExp(parm); var queryResult = Context.Queryable() - .LeftJoin((o, w) => o.OrderNoMes == w.FeedOrder) + .LeftJoin((o, w) => o.OrderNoMes == w.CustomerOrder) .Where(predicate.ToExpression()) .Where((o, w) => !SqlFunc.IsNullOrEmpty(o.OrderNoMes)) .OrderBy((o, w) => o.Id) @@ -61,7 +61,7 @@ namespace DOAN.Service.MES.Order UpdatedBy = o.UpdatedBy, UpdatedTime = o.UpdatedTime, Children = SqlFunc.Subqueryable() - .Where(w => w.FeedOrder == o.OrderNoMes) // 子查询，获取对应的工单数据 + .Where(w => w.CustomerOrder == o.OrderNoMes) // 子查询，获取对应的工单数据 .ToList() }) .Distinct() diff --git a/DOAN.Service/Mobile/ReportFlowService.cs b/DOAN.Service/Mobile/ReportFlowService.cs index 491a678..969b217 100644 --- a/DOAN.Service/Mobile/ReportFlowService.cs +++ b/DOAN.Service/Mobile/ReportFlowService.cs @@ -1,3 +1,4 @@ +using System.Diagnostics; using DOAN.Model; using DOAN.Model.MES.base_; using DOAN.Model.MES.base_.Dto; @@ -10,11 +11,12 @@ using DOAN.Repository; using DOAN.Service.Mobile.IService; using DOAN.Service.Public.IPublicService; using Infrastructure.Attribute; +using JinianNet.JNTemplate; using Mapster; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Mvc; using NPOI.SS.Formula.Functions; using SqlSugar.DistributedSystem.Snowflake; -using System.Diagnostics; namespace DOAN.Service.Mobile; @@ -28,15 +30,21 @@ public class ReportFlowService : BaseService, IReportFlowServic { return Context.Queryable().Where(x => x.Workorder == workorder).First(); } + public List GetWorkOrdersByDate(DateTime startDate, DateTime endDate) { - return Context.Queryable() - .Where(it => it.WorkorderDate >= startDate && it.WorkorderDate <= endDate).ToList(); + return Context + .Queryable() + .Where(it => it.WorkorderDate >= startDate && it.WorkorderDate <= endDate) + .ToList(); } public ProReportwork01 GetProcessReportWorkDetail(string workorder, int process) { - return Context.Queryable().Where(x => x.Workorder == workorder && x.ProcessId == process).First(); + return Context + .Queryable() + .Where(x => x.Workorder == workorder && x.ProcessId == process) + .First(); } /// @@ -49,24 +57,42 @@ public class ReportFlowService : BaseService, IReportFlowServic /// /// /// - public bool FeedProcessReportwork(string workorder, int processId, int finish_num, string stove_code, string feed_order, string Worker) + public bool FeedProcessReportwork( + string workorder, + int processId, + int finish_num, + string stove_code, + string feed_order, + string Worker + ) { int result = 0; - bool Exist = Context.Queryable().Where(it => it.Workorder == workorder && it.ProcessId == processId).Any(); + bool Exist = Context + .Queryable() + .Where(it => it.Workorder == workorder && it.ProcessId == processId) + .Any(); - string NickName = Context.Queryable().Where(it => it.UserName == Worker).Select(it => it.NickName).First(); + string NickName = Context + .Queryable() + .Where(it => it.UserName == Worker) + .Select(it => it.NickName) + .First(); Worker = string.IsNullOrEmpty(NickName) ? Worker + "|异常人员|" : NickName; if (Exist) { - result = Context.Updateable().Where(it => it.Workorder == workorder && it.ProcessId == processId) + result = Context + .Updateable() + .Where(it => it.Workorder == workorder && it.ProcessId == processId) .SetColumns(it => it.FinishNum == finish_num) .SetColumns(it => it.Worker == Worker) .SetColumns(it => it.JobDateTime == DateTime.Now) - .SetColumns(it => it.RouteId == 32) + .SetColumns(it => it.RouteId == 32) .SetColumns(it => it.UpdatedBy == Worker) .SetColumns(it => it.UpdatedTime == DateTime.Now) .ExecuteCommand(); - Context.Updateable().Where(it => it.Workorder == workorder) + Context + .Updateable() + .Where(it => it.Workorder == workorder) .SetColumns(it => it.StoveCode == stove_code) .SetColumns(it => it.FeedOrder == feed_order) .ExecuteCommand(); @@ -84,24 +110,40 @@ public class ReportFlowService : BaseService, IReportFlowServic proReportwork01.CreatedBy = Worker; proReportwork01.CreatedTime = DateTime.Now; result = Context.Insertable(proReportwork01).ExecuteCommand(); - Context.Updateable().Where(it => it.Workorder == workorder) - .SetColumns(it => it.StoveCode == stove_code) - .SetColumns(it => it.FeedOrder == feed_order) - .ExecuteCommand(); - + Context + .Updateable() + .Where(it => it.Workorder == workorder) + .SetColumns(it => it.StoveCode == stove_code) + .SetColumns(it => it.FeedOrder == feed_order) + .ExecuteCommand(); } return result > 0; } - public bool ProcessReportWork(string workorder, int process, int finish_num, int bad_num, string Worker) + public bool ProcessReportWork( + string workorder, + int process, + int finish_num, + int bad_num, + string Worker + ) { int result = 0; - bool Exist = Context.Queryable().Where(it => it.Workorder == workorder && it.ProcessId == process).Any(); - string NickName = Context.Queryable().Where(it => it.UserName == Worker).Select(it => it.NickName).First(); + bool Exist = Context + .Queryable() + .Where(it => it.Workorder == workorder && it.ProcessId == process) + .Any(); + string NickName = Context + .Queryable() + .Where(it => it.UserName == Worker) + .Select(it => it.NickName) + .First(); Worker = string.IsNullOrEmpty(NickName) ? Worker + "|异常人员|" : NickName; if (Exist) { - result = Context.Updateable().Where(it => it.Workorder == workorder && it.ProcessId == process) + result = Context + .Updateable() + .Where(it => it.Workorder == workorder && it.ProcessId == process) .SetColumns(it => it.FinishNum == finish_num) .SetColumns(it => it.BadNum == bad_num) .SetColumns(it => it.Worker == Worker) @@ -110,7 +152,6 @@ public class ReportFlowService : BaseService, IReportFlowServic .SetColumns(it => it.UpdatedBy == Worker) .SetColumns(it => it.UpdatedTime == DateTime.Now) .ExecuteCommand(); - } else { @@ -126,7 +167,6 @@ public class ReportFlowService : BaseService, IReportFlowServic proReportwork01.CreatedBy = Worker; proReportwork01.CreatedTime = DateTime.Now; result = Context.Insertable(proReportwork01).ExecuteCommand(); - } return result > 0; } @@ -138,158 +178,175 @@ public class ReportFlowService : BaseService, IReportFlowServic /// /// /// - /// + /// 客户订单号 /// /// - public int ShipmentProcessReportwork(string workorder, int processId, int finish_num, int bad_num, string customer_order, string Worker) + public int ShipmentProcessReportwork( + string workorder, + int processId, + int finish_num, + int bad_num, + string customer_order, + string Worker + ) { - //采购订单号和工单号是否匹配 - bool isexistfree_order = Context.Queryable().Where(o=>o.FeedOrder==customer_order).Any(); - if (isexistfree_order) + try { - OrderPurchase orderPurchase= Context.Queryable().Where(o => o.OrderNoMes == customer_order).First(); - if (orderPurchase.DeliveryQuantity + finish_num> orderPurchase.DemandQuantity) + //TODO 20250411 采购订单号和工单号是否匹配逻辑不适配实际情况，进行修改 + + // 判断订单号是否存在 + OrderPurchase orderPurchase = Context + .Queryable() + .Where(o => o.OrderNoMes == customer_order) + .First(); + if (orderPurchase == null) { - return 3;//超额 - } + // 订单号不存在 + return 2; + } + string NickName = Context + .Queryable() + .Where(it => it.UserName == Worker) + .Select(it => it.NickName) + .First(); + Worker = string.IsNullOrEmpty(NickName) ? Worker + "|异常人员|" : NickName; - } - else - { - return 2;//采购订单号和工单号不匹配 - } - - int result = 0; - bool Exist = Context.Queryable().Where(it => it.Workorder == workorder && it.ProcessId == processId).Any(); - string NickName = Context.Queryable().Where(it => it.UserName == Worker).Select(it => it.NickName).First(); - Worker = string.IsNullOrEmpty(NickName) ? Worker + "|异常人员|" : NickName; - if (Exist) - { - UseTran2(() => - { - result = Context.Updateable() - .Where(it => it.Workorder == workorder && it.ProcessId == processId) - .SetColumns(it => it.FinishNum == finish_num) - .SetColumns(it => it.RouteId == 32) - .SetColumns(it => it.BadNum == bad_num) - .SetColumns(it => it.Worker == Worker) - .SetColumns(it => it.JobDateTime == DateTime.Now) - .SetColumns(it => it.UpdatedBy == Worker) - .SetColumns(it => it.UpdatedTime == DateTime.Now) - .ExecuteCommand(); - Context.Updateable().Where(it => it.Workorder == workorder) - .SetColumns(it => it.CustomerOrder == customer_order) - .ExecuteCommand(); - //调整工单完成数 - Context.Updateable() - .SetColumns(it => it.ShipmentNum == finish_num) - .Where(it => it.Workorder == workorder).ExecuteCommand(); - //调整采购完成数 - var OrderPurchase = Context.Queryable().Where(it => it.OrderNoMes == SqlFunc.Subqueryable().Where(s => s.Workorder == workorder).Select(s => s.FeedOrder)).First(); - int? ShipmentNum= Context.Queryable().Where(it => it.FeedOrder == SqlFunc.Subqueryable().Where(s => s.Workorder == workorder).Select(s => s.FeedOrder)).Sum(it => it.ShipmentNum); - int Orderindicator = OrderPurchase.DemandQuantity<=ShipmentNum?1:0; - Context.Updateable() - .SetColumns(it => it.Orderindicator == Orderindicator) - .SetColumns(it=>it.DeliveryQuantity == ShipmentNum) - .Where(it => it.Id == OrderPurchase.Id).ExecuteCommand(); - - }); - - - - } - else - { - ProReportwork01 proReportwork01 = new ProReportwork01(); - proReportwork01.Id = XueHua; - proReportwork01.Workorder = workorder; - proReportwork01.ProcessId = processId; - proReportwork01.FinishNum = finish_num; - proReportwork01.BadNum = bad_num; - proReportwork01.Worker = Worker; - proReportwork01.RouteId = 32; - proReportwork01.JobDateTime = DateTime.Now; - proReportwork01.CreatedBy = Worker; - proReportwork01.CreatedTime = DateTime.Now; - UseTran2(() => + int result = 0; + + // 判断报工信息是否存在 + Context.Ado.BeginTran(); + // 更新报工信息 + ProReportwork01 ReportWorkOrderDetail = Context + .Queryable() + .Where(it => it.Workorder == workorder && it.ProcessId == processId) + .First(); + if (ReportWorkOrderDetail == null) { + // 新增 + ProReportwork01 proReportwork01 = + new() + { + Id = XueHua, + Workorder = workorder, + ProcessId = processId, + FinishNum = finish_num, + BadNum = bad_num, + Worker = Worker, + RouteId = 32, + JobDateTime = DateTime.Now, + CreatedBy = Worker, + CreatedTime = DateTime.Now + }; result = Context.Insertable(proReportwork01).ExecuteCommand(); - Context.Updateable().Where(it => it.Workorder == workorder) - .SetColumns(it => it.CustomerOrder == customer_order) - .ExecuteCommand(); - //出货工序 - Context.Updateable() - .SetColumns(it => it.ShipmentNum == finish_num) - .Where(it => it.Workorder == workorder).ExecuteCommand(); - //调整采购完成数 - var OrderPurchase = Context.Queryable().Where(it => it.OrderNoMes == SqlFunc.Subqueryable().Where(s => s.Workorder == workorder).Select(s => s.FeedOrder)).First(); - int? ShipmentNum = Context.Queryable().Where(it => it.FeedOrder == SqlFunc.Subqueryable().Where(s => s.Workorder == workorder).Select(s => s.FeedOrder)).Sum(it => it.ShipmentNum); - int Orderindicator = OrderPurchase.DemandQuantity <= ShipmentNum ? 1 : 0; - Context.Updateable() - .SetColumns(it => it.Orderindicator == Orderindicator) - .SetColumns(it => it.DeliveryQuantity == ShipmentNum) - .Where(it => it.Id == OrderPurchase.Id).ExecuteCommand(); - }); - - + + } + else + { + // 修改 + ReportWorkOrderDetail.FinishNum = finish_num; + ReportWorkOrderDetail.BadNum = bad_num; + ReportWorkOrderDetail.Worker = Worker; + ReportWorkOrderDetail.UpdatedBy = Worker; + ReportWorkOrderDetail.UpdatedTime = DateTime.Now; + result = Context.Updateable(ReportWorkOrderDetail).ExecuteCommand(); + + } + // 修改工单信息 + Context + .Updateable() + .Where(it => it.Workorder == workorder) + .SetColumns(it => it.ShipmentNum == finish_num) + .SetColumns(it => it.CustomerOrder == customer_order) + .ExecuteCommand(); + // 修改采购订单信息 + int newQuantity = Context + .Queryable() + .Where(it => it.CustomerOrder == customer_order) + .Sum(it => it.ShipmentNum) ?? 0; + orderPurchase.DeliveryQuantity = newQuantity; + if (orderPurchase.DeliveryQuantity > orderPurchase.DemandQuantity) + { + // 订单超额了 + Context.Ado.RollbackTran(); + return 3; + } + if (orderPurchase.DeliveryQuantity == orderPurchase.DemandQuantity) + { + orderPurchase.Orderindicator = 1; + } + else + { + orderPurchase.Orderindicator = 0; + } + int res = Context.Updateable(orderPurchase).ExecuteCommand(); + Context.Ado.CommitTran(); + return result > 0 ? 1 : 0; + } + catch (Exception) + { + Context.Ado.RollbackTran(); + throw; } - return result > 0?1:0; } public List GetWorkOrderReportWorkList(string workorder) { - return Context.Queryable() + return Context + .Queryable() .LeftJoin((rw, wp) => rw.ProcessId == wp.Id) .Where((rw, wp) => rw.Workorder == workorder) .OrderBy(rw => rw.ProcessId) - .Select((rw, wp) => new ProReportWorkDetialDto() - { - ProcessName = wp.Name, - }, true) + .Select((rw, wp) => new ProReportWorkDetialDto() { ProcessName = wp.Name, }, true) .ToList(); } public PagedInfo GetReportInfoByName(ProReportWorkDto2 query) { - - string NickName = Context.Queryable().Where(it => it.UserName == query.name).Select(it => it.NickName).First(); + string NickName = Context + .Queryable() + .Where(it => it.UserName == query.name) + .Select(it => it.NickName) + .First(); query.name = string.IsNullOrEmpty(NickName) ? query.name + "|异常人员|" : NickName; - return Context.Queryable() - .LeftJoin((rw, wp) => rw.ProcessId == wp.Id) - .Where((rw, wp) => rw.Worker == query.name && rw.JobDateTime >= DateTime.Today && rw.JobDateTime < DateTime.Today.AddDays(1)) - .OrderBy(rw => rw.ProcessId) - .Select((rw, wp) => new ProReportWorkDetialDto() - { - ProcessName = wp.Name, - }, true) - .ToPage_NO_Convert(query); - + return Context + .Queryable() + .LeftJoin((rw, wp) => rw.ProcessId == wp.Id) + .Where( + (rw, wp) => + rw.Worker == query.name + && rw.JobDateTime >= DateTime.Today + && rw.JobDateTime < DateTime.Today.AddDays(1) + ) + .OrderBy(rw => rw.ProcessId) + .Select((rw, wp) => new ProReportWorkDetialDto() { ProcessName = wp.Name, }, true) + .ToPage_NO_Convert(query); } public List GetProcessByRoute(int route_id) { - - return Context.Queryable() - .LeftJoin((rel, pro) => rel.FkWorkProcesses == pro.Id) - .Where((rel, pro) => rel.FkWorkRoute == route_id) - .Select((rel, pro) => pro) - .ToList() - .Adapt, List>(); - + return Context + .Queryable() + .LeftJoin((rel, pro) => rel.FkWorkProcesses == pro.Id) + .Where((rel, pro) => rel.FkWorkRoute == route_id) + .Select((rel, pro) => pro) + .ToList() + .Adapt, List>(); } public PagedInfo GetReportByProcessId(ProReportWorkDto3 query) { - return Context.Queryable() - .LeftJoin((rw, wp) => rw.ProcessId == wp.Id) - .Where((rw, wp) => rw.ProcessId == query.processId && rw.JobDateTime >= DateTime.Today && rw.JobDateTime < DateTime.Today.AddDays(1)) - .OrderBy(rw => rw.ProcessId) - .Select((rw, wp) => new ProReportWorkDetialDto() - { - ProcessName = wp.Name, - }, true) - .ToPage_NO_Convert(query); + return Context + .Queryable() + .LeftJoin((rw, wp) => rw.ProcessId == wp.Id) + .Where( + (rw, wp) => + rw.ProcessId == query.processId + && rw.JobDateTime >= DateTime.Today + && rw.JobDateTime < DateTime.Today.AddDays(1) + ) + .OrderBy(rw => rw.ProcessId) + .Select((rw, wp) => new ProReportWorkDetialDto() { ProcessName = wp.Name, }, true) + .ToPage_NO_Convert(query); } } -