From 11a6dde1ea7e0dae751ef1d383dcf8a14a334a52 Mon Sep 17 00:00:00 2001
From: yyk <2336760928@qq.com>
Date: 星期五, 23 八月 2024 09:21:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC26WMS
---
Wms/WMS.BLL/SysServer/MaterialsServer.cs | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/MaterialsServer.cs b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
index e10d30f..7321b66 100644
--- a/Wms/WMS.BLL/SysServer/MaterialsServer.cs
+++ b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
@@ -58,7 +58,7 @@
return Db.Queryable<SysMaterials>()
.LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
.LeftJoin<SysPackag>((a, b,c) => a.PackagNo == c.PackagNo)
- .Where((a,b,c) => c.IsDel == "0")
+ //.Where((a,b,c) => c.IsDel == "0")
.WhereIF(!string.IsNullOrEmpty(skuNo), a => a.SkuNo.Contains(skuNo))
.WhereIF(!string.IsNullOrEmpty(skuName), a => a.SkuNo.Contains(skuName))
.WhereIF(!string.IsNullOrEmpty(auditStatusNo), a => a.AuditStatusNo == auditStatusNo)
@@ -92,6 +92,16 @@
return await Db.Queryable<SysMaterials>().CountAsync(s => s.SkuNo == SkuNo && s.IsDel == "0");
}
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鏌ヨ鐗╂枡淇℃伅
+ /// </summary>
+ /// <param name="PackagNo">鍖呰缂栧彿</param>
+ /// <returns></returns>
+ public async Task<int> GetMateByPa(string PackagNo)
+ {
+ return await Db.Queryable<SysMaterials>().CountAsync(s => s.PackagNo == PackagNo && s.IsDel == "0");
+ }
/// <summary>
/// 鏂板鐗╂枡淇℃伅
/// </summary>
--
Gitblit v1.8.0