From 13b91828a0301ba53585662f5207ed45ff485638 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 27 八月 2024 09:00:28 +0800
Subject: [PATCH] 库存统计重写
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 4978a4e..ecefa7d 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -227,7 +227,9 @@
BllQualityInspect quality = new BllQualityInspect();
if (model.Type == "0")
{
- quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
+ quality = Db.Queryable<BllQualityInspect>()
+ .Where(a => a.IsDel == "0" && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo)
+ .OrderByDescending(a => a.CreateTime).First();
}
DataStockDetail sd1 = null;
@@ -593,7 +595,7 @@
#endregion
- #region 鎵樼洏缁戝畾
+ #region 缁勬墭鏀惰揣
public List<PalletBindDto> GetPalletBindList(PalletBindVm model, out int count)
{
try
@@ -602,8 +604,17 @@
if (!string.IsNullOrWhiteSpace(model.SkuNo) || !string.IsNullOrWhiteSpace(model.SkuName))
{
- var detailList = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && m.SkuNo.Contains(model.SkuNo.Trim()) && m.SkuName.Contains(model.SkuName.Trim())).Select(m => m.Id).Distinct().ToList();
+ var detailList = Db.Queryable<BllArrivalNoticeDetail>()
+ .Where(m => m.IsDel == "0" && m.SkuNo.Contains(model.SkuNo.Trim()) && m.SkuName.Contains(model.SkuName.Trim()))
+ .Select(m => m.Id).Distinct().ToList();
strList = detailList;
+ if (strList.Count <= 0)
+ {
+ // 鐗╂枡缂栫爜銆佸悕绉版绱㈠け璐ョ洿鎺ヨ繑鍥瀗ull
+ count = 0;
+ return null;
+ }
+
}
Expression<Func<BllPalletBind, bool>> item = Expressionable.Create<BllPalletBind>()
.AndIF(!string.IsNullOrWhiteSpace(model.ASNNo), it => it.ASNNo.Contains(model.ASNNo.Trim()))
@@ -615,7 +626,7 @@
.AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.LotText), it => it.LotText.Contains(model.LotText.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.StartTime), it => it.CreateTime >= Convert.ToDateTime(model.StartTime))
- .AndIF(!string.IsNullOrWhiteSpace(model.EndTime), it => it.CreateTime <= Convert.ToDateTime(model.EndTime))
+ .AndIF(!string.IsNullOrWhiteSpace(model.EndTime), it => it.CreateTime <= Convert.ToDateTime(model.EndTime).AddDays(1))
.AndIF(!string.IsNullOrWhiteSpace(model.Status), it => it.Status == model.Status)
.And(m => m.IsDel == "0")
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
--
Gitblit v1.8.0