From 8893638de46547923e0684220df3d9782f7ec283 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 10 3月 2025 11:01:49 +0800
Subject: [PATCH] 缓存岛需要加个批次号条件、可以选择某个批次出
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
index 952bcc0..e064dd5 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -264,24 +264,28 @@
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曪紝骞舵彁鍙栨墍闇�淇℃伅
var list = await _wmsStockQuanRep.AsQueryable()
.WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
- .Select(x => new { x.PackageCode })
+ .WhereIF(!string.IsNullOrWhiteSpace(input.PlanNo), u => u.PlanNo.Contains(input.PlanNo.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
+ .Select(x => new { x.PackageCode, x.PlanNo, x.OrderId })
.ToListAsync();
// 鍒涘缓涓�涓垪琛ㄤ互瀛樺偍 WmsPackListOutput
var resultList = new List<WmsPackListOutput>();
// 鍒嗙粍骞惰绠楁瘡缁勪俊鎭�
- var groupedResult = list.GroupBy(x => x.PackageCode);
+ var groupedResult = list.GroupBy(x => new { x.PackageCode, x.PlanNo, x.OrderId });
foreach (var g in groupedResult)
{
// 鍦ㄨ繖閲岃绠楁瘡缁勭殑鎬绘暟
var count = g.Count();
- var mesTotalCount = await _mesBatchOrderUpiRep.AsQueryable().CountAsync(m => m.PackageCode == g.Key);
+ var mesTotalCount = await _mesBatchOrderUpiRep.AsQueryable().CountAsync(m => m.PackageCode == g.Key.PackageCode);
resultList.Add(new WmsPackListOutput
{
- PackageCode = g.Key,
+ PackageCode = g.Key.PackageCode,
+ PlanNo = g.Key.PlanNo,
+ OrderId = g.Key.OrderId,
Count = count,
MesTotalCount = mesTotalCount,
IsPack = count >= mesTotalCount, // 妫�鏌ユ槸鍚︽墦鍖�
@@ -504,6 +508,7 @@
{
if (!listDaoUbi.Contains(item.UPI)) // 浣跨敤 HashSet 杩涜鏌ユ壘
{
+ var pc = await _mesPackageGatherRep.GetFirstAsync(x => x.PackageCode == item.PackageCode);
listRes.Add(new WmsShortageListOutput
{
UPI = item.UPI,
@@ -513,10 +518,10 @@
PlanNo = item.PlanNo,
Info5 = item.Info5,
Info4 = item.Info4,
- Info10 = item.Info10,
- Info11 = item.Info11,
- Info12 = item.Info12,
- Info13 = item.Info13,
+ Info10 = pc.Info10,
+ Info11 = pc.Info11,
+ Info12 = pc.Info12,
+ Info13 = pc.Info13,
//Info14 = item.Info14,
Info15 = item.Info15,
Info16 = item.Info16,
--
Gitblit v1.9.3