From 4da743d3d8b1cd3c9c1bd118c74ef1aa297b2a3a Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期五, 28 十一月 2025 16:04:06 +0800
Subject: [PATCH] AddMate增加“是否批次管理”判断
---
Wms/WMS.BLL/SysServer/MaterialsServer.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/MaterialsServer.cs b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
index aaa6ff4..d586460 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,
@@ -157,6 +158,10 @@
mate.IsControlled = string.IsNullOrWhiteSpace(mate.IsControlled) ? "0" : mate.IsControlled; //鏄惁鍙楁帶
mate.IsInspect = string.IsNullOrWhiteSpace(mate.IsInspect) ? "0" : mate.IsInspect; //鏄惁鍏嶆
mate.IsPasteCode = string.IsNullOrWhiteSpace(mate.IsPasteCode) ? "0" : mate.IsPasteCode; //鏄惁鍏嶆
+
+ //鏄惁鎵规绠＄悊
+ mate.IsLotManage = string.IsNullOrWhiteSpace(mate.IsLotManage) ? "0" : mate.IsLotManage;
+
mate.Origin = "WMS"; //鏉ユ簮
mate.IsDel = "0";
mate.CreateTime = DateTime.Now;
@@ -226,9 +231,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
@@ -236,7 +242,7 @@
#endregion
#region erp
-
+
/// <summary>
/// 鑾峰彇erp鏁版嵁
/// </summary>
--
Gitblit v1.8.0