From b88cbdbc97735732fe6406fbe5aa3228eaa1b551 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 20 十月 2025 13:13:44 +0800
Subject: [PATCH] 修改包装管理,包装可输入小数

---
 Wms/WMS.BLL/SysServer/MaterialsServer.cs |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Wms/WMS.BLL/SysServer/MaterialsServer.cs b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
index aaa6ff4..74ec721 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,11 @@
         /// 鑾峰彇鍖呰淇℃伅鍒楄〃
         /// </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 = 3000;
+            int skipCount = pageSize * (page - 1);
+            return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").Skip(skipCount).Take(pageSize).ToListAsync();
         }
 
         #endregion

--
Gitblit v1.8.0