RIZO/guiyang-fluorescent-line-lmes-backend
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

扫码创建工单优化

Browse Source
This commit is contained in:
quowingwang 2025-12-19 10:58:46 +08:00
parent fb130197d8
commit 626a0fd841
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderController.cs
View File

@ -191,9 +191,9 @@ namespace RIZO.Admin.WebApi.Controllers.Mes.WorkOrderInfo
/// <returns></returns> /// <returns></returns>
[HttpGet("queryWorkOrderToDay")] [HttpGet("queryWorkOrderToDay")]
[ActionPermissionFilter(Permission = "workorder:list")] [ActionPermissionFilter(Permission = "workorder:list")]
public ApiResult QueryWorkOrderToDay() public ApiResult QueryWorkOrderToDay(string lineCode)
{ {
var response = _WorkOrderService.QueryWorkOrderToDay(); var response = _WorkOrderService.QueryWorkOrderToDay(lineCode);
return response; return response;
} }
} }

2
RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderService.cs
View File

@ -30,6 +30,6 @@ namespace RIZO.Service.Mes.IMesService.WorkOrderInfo
List<WorkOrder> QueryWorkOrderMonth(); List<WorkOrder> QueryWorkOrderMonth();
ApiResult QueryWorkOrderToDay(); ApiResult QueryWorkOrderToDay(string lineCode);
} }
} }

9
RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs
View File

@ -197,6 +197,7 @@ namespace RIZO.Service.Mes.WorkOrderInfo
if (WorkOrder == null) if (WorkOrder == null)
{ {
orderInfoNew.WorkOrderCode = strWorkOrderCode; orderInfoNew.WorkOrderCode = strWorkOrderCode;
orderInfoNew.Sequcence = Sequcence;
orderInfoNew.FlowCardNo = flowCard.FlowCardNo; orderInfoNew.FlowCardNo = flowCard.FlowCardNo;
orderInfoNew.MaterialCode = flowCard.MaterialCode; orderInfoNew.MaterialCode = flowCard.MaterialCode;
orderInfoNew.MaterialName = flowCard.MaterialName; orderInfoNew.MaterialName = flowCard.MaterialName;
@ -415,15 +416,19 @@ namespace RIZO.Service.Mes.WorkOrderInfo
return workOrders; return workOrders;
} }
public ApiResult QueryWorkOrderToDay() public ApiResult QueryWorkOrderToDay(string lineCode)
{ {
try try
{ {
var today = DateTime.Today; var today = DateTime.Today;
DateTime startTime = new DateTime(today.Year, today.Month, today.Day, 0, 0, 0); DateTime startTime = new DateTime(today.Year, today.Month, today.Day, 0, 0, 0);
DateTime endTime = new DateTime(today.Year, today.Month, today.Day, 23, 59, 59); DateTime endTime = new DateTime(today.Year, today.Month, today.Day, 23, 59, 59);
var predicate = Expressionable.Create<WorkOrder>();
predicate = predicate.And(it => it.CreateTime <= endTime);
predicate = predicate.And(it => it.CreateTime >= startTime);
predicate = predicate.AndIF(!string.IsNullOrEmpty(lineCode), it => it.LineCode == lineCode);
List<WorkOrder> workOrders = Queryable() List<WorkOrder> workOrders = Queryable()
.Where(it => it.CreateTime <= endTime && it.CreateTime >= startTime) .Where(predicate.ToExpression())
.ToList(); .ToList();
if (workOrders.Any()) if (workOrders.Any())
{ {