From 3edc6956b30df3fc11025e0b719f320fcb1ec9c5 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 19 一月 2026 16:31:15 +0800
Subject: [PATCH] 更新出库线体配置，PP、干膜质检单独判断
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs"
index 0bcc37b..dc62d79 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs"
@@ -80,6 +80,13 @@
.Where(x => x.LocationCode == param.Value.ToString());
}
break;
+ case var name when name == nameof(Dt_StockInfo.PalletCode).FirstLetterToLower():
+ if (!string.IsNullOrEmpty(param.Value?.ToString()))
+ {
+ sugarQueryable1 = sugarQueryable1
+ .Where(x => x.PalletCode == param.Value.ToString());
+ }
+ break;
case var name when name == nameof(Dt_StockInfo.CreateDate).FirstLetterToLower():
if (DateTime.TryParse(param.Value?.ToString(), out DateTime minDate))
@@ -113,6 +120,22 @@
}
+ }
+ break;
+ case "inventoryage":
+ int inventoryage = param.Value.ObjToInt();
+ if (inventoryage > 0)
+ {
+ DateTime dateTime = DateTime.Now.AddDays(-inventoryage);
+ sugarQueryable1 = sugarQueryable1.Where(x => x.CreateDate >= dateTime);
+ }
+ break;
+ case "inventoryage1":
+ int inventoryage1 = param.Value.ObjToInt();
+ if (inventoryage1 > 0)
+ {
+ DateTime dateTime = DateTime.Now.AddDays(-inventoryage1);
+ sugarQueryable1 = sugarQueryable1.Where(x => x.CreateDate <= dateTime);
}
break;
}
@@ -348,7 +371,7 @@
ISugarQueryable<Dt_LocationInfo> sugarQueryable = _dbBase.Queryable<Dt_LocationInfo>().Where(whereLo);
EntityProperties.ValidatePageOptions(options, ref sugarQueryable);
-
+ List<Dt_Warehouse> warehouses = _dbBase.Queryable<Dt_Warehouse>().ToList();
ISugarQueryable<StockViewDTO> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode).Select((b, a)
=> new StockViewDTO
{
@@ -403,6 +426,12 @@
stockViewDTOs.AddRange(pklist.ToList());
stockViewDTOs.ForEach(x =>
{
+
+ Dt_Warehouse? warehouse = warehouses.FirstOrDefault(t => t.WarehouseId == x.WarehouseId);
+ if (warehouse!=null)
+ {
+ x.WarehouseName= warehouse.WarehouseName;
+ }
x.MaterielCode = (string.Join(",", x.Details.Select(x => x.MaterielCode).Distinct())) ?? "绌虹";
x.BatchNo = (string.Join(",", x.Details.Select(x => x.BatchNo).Distinct())) ?? "鏃�";
x.StockCounts = Math.Round(x.Details.Sum(x => x.StockQuantity),3).ToString() + x.Details.FirstOrDefault()?.Unit;
--
Gitblit v1.9.3