From f7ad3416dfc1558be842f3190688adc9a5a8933d Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期日, 18 一月 2026 14:51:23 +0800
Subject: [PATCH] 添加盘点，合托流程
---
WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs
index 02b3a7e..e8982d8 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs
@@ -46,7 +46,7 @@
{
try
{
-
+
List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
if (searchParametersList?.Any() == true)
{
@@ -58,7 +58,14 @@
if (!string.IsNullOrEmpty(param.Value?.ToString()))
{
sugarQueryable1 = sugarQueryable1
- .Where(x=>x.PalletCode.Contains(param.Value.ToString()));
+ .Where(x => x.PalletCode.Contains(param.Value.ToString()));
+ }
+ break;
+ case var name when name == nameof(Dt_StockInfo.System).FirstLetterToLower():
+ if (!string.IsNullOrEmpty(param.Value?.ToString()))
+ {
+ sugarQueryable1 = sugarQueryable1
+ .Where(x => x.System.Contains(param.Value.ToString()));
}
break;
case var name when name == nameof(Dt_StockInfoDetail.MaterielCode).FirstLetterToLower():
@@ -126,7 +133,7 @@
{
}
}
-
+
ISugarQueryable<StockViewDTO> list = sugarQueryable1
.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode)
@@ -148,6 +155,7 @@
PalletCode = b.PalletCode,
StockRemark = b.Remark,
RoadwayNo = a.RoadwayNo,
+ System = b.System,
Row = a.Row,
StockId = b.Id,
StockStatus = b.StockStatus,
@@ -333,7 +341,7 @@
{
x.MaterielCode = string.Join(",", x.Details.Select(d => d.MaterielCode).Distinct());
x.BatchNo = string.Join(",", x.Details.Select(d => d.BatchNo).Distinct());
- x.SupplierBatch= string.Join(",", x.Details.Select(d => d.SupplierBatch).Distinct());
+ x.SupplierBatch = string.Join(",", x.Details.Select(d => d.SupplierBatch).Distinct());
x.StockCounts = Math.Round(x.Details.Sum(x => x.StockQuantity), 3).ToString();
x.MaterielSpec = x.Details.FirstOrDefault()?.MaterieSpec ?? "";
x.MaterielName = x.Details.FirstOrDefault()?.MaterielName ?? "";
--
Gitblit v1.9.3