From 6c9b3926334f9eb043c1938ba6d46e2b37deca22 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期三, 14 一月 2026 18:02:40 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
index 794e638..4e15598 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
@@ -492,7 +492,7 @@
// 鏋勫缓鏌ヨ鏉′欢
var stockQuery = Db.Queryable<Dt_StockInfo>()
.Where(x => locationCodes.Contains(x.LocationCode))
- .Where(x => x.StockStatus == (int)StockStatusEmun.鍏ュ簱瀹屾垚 || x.StockStatus == (int)StockStatusEmun.杩囨湡)
+ .Where(x => x.StockStatus == (int)StockStatusEmun.鍏ュ簱瀹屾垚)
.Includes(x => x.Details);
// 鎵ц鏌ヨ骞舵寜鍏堣繘鍏堝嚭鎺掑簭
@@ -523,23 +523,24 @@
if (relevantDetails.Any())
{
- var firstDetail = relevantDetails.First();
- var useableQuantity = relevantDetails.Sum(d => d.StockQuantity - d.OutboundQuantity);
-
- result.Add(new StockSelectViewDTO
+ foreach (var item in relevantDetails)
{
- LocationCode = stock.LocationCode,
- MaterielCode = firstDetail.MaterielCode,
- MaterielName = firstDetail.MaterielName,
- BatchNo = orderDetail.BatchNo,
- SupplyCode = orderDetail.SupplyCode,
- Barcode = firstDetail.Barcode,
- PalletCode = stock.PalletCode,
- UseableQuantity = useableQuantity,
- StockCreateDate = stock.CreateDate,
- StockId = stock.Id,
- OrderDetailId = orderDetail.Id // 鍏宠仈鍒板叿浣撶殑鍑哄簱鍗曟槑缁�
- });
+ result.Add(new StockSelectViewDTO
+ {
+ LocationCode = stock.LocationCode,
+ MaterielCode = item.MaterielCode,
+ MaterielName = item.MaterielName,
+ BatchNo = item.BatchNo,
+ SupplyCode = item.SupplyCode,
+ Barcode = item.Barcode,
+ PalletCode = stock.PalletCode,
+ UseableQuantity = item.StockQuantity,
+ StockCreateDate = stock.CreateDate,
+ StockId = item.Id,
+ OrderDetailId = orderDetail.Id // 鍏宠仈鍒板叿浣撶殑鍑哄簱鍗曟槑缁�
+ });
+ }
+
}
}
}
--
Gitblit v1.9.3