From 37454e625df68d40897112b2e8c2e3cf4d7163e3 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 25 三月 2026 11:43:10 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs | 82 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 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 e6b3476..5b2b67e 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"
@@ -2,6 +2,7 @@
using AutoMapper;
using MailKit.Search;
using SqlSugar;
+using System.Text.RegularExpressions;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
@@ -491,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);
// 鎵ц鏌ヨ骞舵寜鍏堣繘鍏堝嚭鎺掑簭
@@ -522,23 +523,25 @@
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,
+ StockStatus = item.Status,
+ OrderDetailId = orderDetail.Id // 鍏宠仈鍒板叿浣撶殑鍑哄簱鍗曟槑缁�
+ });
+ }
+
}
}
}
@@ -546,5 +549,50 @@
return result;
}
+
+ public override PageGridData<Dt_StockInfo> GetPageData(PageDataOptions options)
+ {
+ ISugarQueryable<Dt_StockInfo> sugarQueryable = Db.Queryable<Dt_StockInfo>();
+
+ ValidatePageOptions(options, ref sugarQueryable);
+
+ List<OrderByModel> orderByModels = new List<OrderByModel>();
+
+ if (OrderByParameters != null)
+ {
+ foreach (var item in OrderByParameters)
+ {
+ OrderByModel orderByModel = new OrderByModel()
+ {
+ FieldName = item.Key,
+ OrderByType = item.Value
+ };
+ orderByModels.Add(orderByModel);
+ }
+ }
+ if (EnableWebOrderBy)
+ {
+ //鑾峰彇鎺掑簭瀛楁
+ Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
+
+ foreach (var item in orderbyDic)
+ {
+ OrderByModel orderByModel = new OrderByModel()
+ {
+ FieldName = item.Key,
+ OrderByType = item.Value
+ };
+ orderByModels.Add(orderByModel);
+ }
+ }
+
+ int total = 0;
+ PageGridData<Dt_StockInfo> pageGridData = new PageGridData<Dt_StockInfo>();
+ sugarQueryable = sugarQueryable.OrderBy(orderByModels);
+ pageGridData.Rows = sugarQueryable.ToPageList(options.Page, options.Rows, ref total);
+ pageGridData.Total = total;
+
+ return pageGridData;
+ }
}
}
--
Gitblit v1.9.3