Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

仓库货物，出库记录查询调整

Browse Source
This commit is contained in:
赵正易
2024-06-28 15:21:25 +08:00
parent 9b63150b66
commit c7cd6ba42c
23 changed files with 335 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ZR.Service/mes/mm/MmIngredientTaskService.cs
View File

@@ -1,14 +1,11 @@
using System;
using SqlSugar;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using SqlSugar;
using System;
using ZR.Model;
using ZR.Repository;
using ZR.Model.MES.mm;
using ZR.Service.mes.mm.IService;
using System.Linq;
using ZR.Model.MES.mm.Dto;
using ZR.Repository;
using ZR.Service.mes.mm.IService;
namespace ZR.Service.mes.mm
{
@@ -26,12 +23,12 @@ namespace ZR.Service.mes.mm
public PagedInfo<MmIngredientTaskDto> GetList(MmIngredientTaskQueryDto parm)
{
var predicate = Expressionable.Create<MmIngredientTask>()
.AndIF(parm.Starttime!=null&&parm.Starttime>new DateTime(1899,1,1),it=>it.CreatedTime>=parm.Starttime)
.AndIF(parm.Endtime!=null&&parm.Starttime>new DateTime(1899,1,1),it=>it.CreatedTime<=parm.Endtime)
.AndIF(!string.IsNullOrEmpty(parm.Workorder),it=>it.Workorder.Contains(parm.Workorder));
.AndIF(parm.Starttime != null && parm.Starttime > new DateTime(1899, 1, 1), it => it.CreatedTime >= parm.Starttime)
.AndIF(parm.Endtime != null && parm.Starttime > new DateTime(1899, 1, 1), it => it.CreatedTime <= parm.Endtime)
.AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder));
var response = Queryable()
.OrderByDescending(it=>it.CreatedTime)
.OrderByDescending(it => it.CreatedTime)
.Where(predicate.ToExpression())
.ToPage<MmIngredientTask, MmIngredientTaskDto>(parm);