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

重要：代码全局优化与添加一次合格，抛光仓库的截止日期数据查询功能

Browse Source
This commit is contained in:
赵正易
2025-07-28 15:40:59 +08:00
parent 89c113e5e1
commit 42de49629b
162 changed files with 3335 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ZR.Service/mes/ql/PLRawMaterialService.cs
View File

@@ -1,12 +1,10 @@
using Aliyun.OSS;
using Infrastructure.Attribute;
using Infrastructure.Attribute;
using SqlSugar;
using System;
using ZR.Model.MES.ql;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using ZR.Service.mes.ql.IService;
using static Org.BouncyCastle.Crypto.Engines.SM2Engine;
namespace ZR.Service.mes.ql
{
@@ -62,7 +60,7 @@ namespace ZR.Service.mes.ql
/// 查询数据记录，要改成分页查询
/// </summary>
/// <returns></returns>
public (List<PLRawMaterial>, int) GetRawMaterialTable(DateTime starttime, DateTime endTime, string pci, string colorCode,string description, int pageNum, int pageSize)
public (List<PLRawMaterial>, int) GetRawMaterialTable(DateTime starttime, DateTime endTime, string pci, string colorCode, string description, int pageNum, int pageSize)
{
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
@@ -71,7 +69,7 @@ namespace ZR.Service.mes.ql
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.CreatedTime >= starttime.ToLocalTime())
.AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.CreatedTime <= endTime.ToLocalTime())
.AndIF(!string.IsNullOrEmpty(pci), it => it.Pci.Contains(pci))
.AndIF(!string.IsNullOrEmpty(colorCode), it =>it.Code.Contains(colorCode))
.AndIF(!string.IsNullOrEmpty(colorCode), it => it.Code.Contains(colorCode))
.AndIF(!string.IsNullOrEmpty(description), it => it.Description.Contains(description))
.ToExpression();