From f6d9155a4a0cf27fd5732314b70109cbc090ccf8 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 04 十一月 2025 08:06:10 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Wms/WMS.BLL/SysServer/MaterialsServer.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/MaterialsServer.cs b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
index aaa6ff4..d7dd7f6 100644
--- a/Wms/WMS.BLL/SysServer/MaterialsServer.cs
+++ b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
@@ -61,7 +61,7 @@
{
Expression<Func<SysMaterials, bool>> item = Expressionable.Create<SysMaterials>()
.AndIF(!string.IsNullOrWhiteSpace(model.SkuNo), it => it.SkuNo.Contains(model.SkuNo.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuNo.Contains(model.SkuName.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuName.Contains(model.SkuName.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.AuditStatusNo), it => it.AuditStatusNo == model.AuditStatusNo)
.AndIF(!string.IsNullOrWhiteSpace(model.Type), it => it.Type == model.Type)
.AndIF(!string.IsNullOrWhiteSpace(model.IsControlled), it => it.IsControlled == model.IsControlled)
@@ -80,6 +80,7 @@
.LeftJoin<SysMaterialCategory>((a, b, c, d) => a.CategoryNo == d.CategoryNo && d.IsDel == "0")
.Select((a, b, c, d) => new MaterialsDto()
{
+ Id = a.Id,
SkuNo = a.SkuNo,
SkuName = a.SkuName,
Standard = a.Standard,
@@ -226,9 +227,10 @@
/// 鑾峰彇鍖呰淇℃伅鍒楄〃
/// </summary>
/// <returns></returns>
- public async Task<List<SysPackag>> GetPackagList()
+ public async Task<List<SysPackag>> GetPackagList(int page)
{
- return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").ToListAsync();
+ int pageSize = 1000;
+ return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").ToPageListAsync(page, pageSize);
}
#endregion
--
Gitblit v1.8.0