From 075c5319285ab9896a74655c82cec7c1ae0e0196 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期五, 12 十二月 2025 14:13:46 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoDetailService.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 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/StockInfoDetailService.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/StockInfoDetailService.cs"
index 9f22137..d84a515 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/StockInfoDetailService.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/StockInfoDetailService.cs"
@@ -1,11 +1,13 @@
锘縰sing SqlSugar;
using WIDESEA_Common.StockEnum;
+using System.Collections.Generic;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_Core.HttpContextUser;
+using WIDESEA_Core.Utilities;
using WIDESEA_DTO.Stock;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
@@ -34,10 +36,11 @@
public PageGridData<StockInfoDetailWithPalletDto> GetPageData2(PageDataOptions options)
{
+
string wheres = ValidatePageOptions(options);
var sugarQueryable = Db.Queryable<Dt_StockInfoDetail>().InnerJoin<Dt_StockInfo>((detail, item) => detail.StockId == item.Id)
- .Where((detail, item) =>item.StockStatus==StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt());
+ .Where((detail, item) => item.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt());
Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
List<OrderByModel> orderByModels = new List<OrderByModel>();
@@ -47,7 +50,7 @@
{
OrderByModel orderByModel = new()
{
- FieldName = "detail."+item.Key,
+ FieldName = "detail." + item.Key,
OrderByType = item.Value
};
orderByModels.Add(orderByModel);
@@ -61,7 +64,7 @@
};
orderByModels.Add(orderByModel);
}
-
+
}
int totalCount = 0;
List<SearchParameters> searchParametersList = new List<SearchParameters>();
@@ -76,7 +79,6 @@
{
foreach (var param in searchParametersList)
{
- // 鍖归厤鎵樼洏缂栧彿鏌ヨ鏉′欢锛堝皬鍐欏瓧娈靛悕锛�
if (param.Name.Equals(nameof(Dt_StockInfo.PalletCode).FirstLetterToLower(), StringComparison.OrdinalIgnoreCase)
&& !string.IsNullOrEmpty(param.Value?.ToString()))
{
@@ -88,8 +90,7 @@
catch (Exception ex)
{
}
- }
-
+ }
var data = sugarQueryable
.WhereIF(!wheres.IsNullOrEmpty(), wheres)
.OrderBy(orderByModels)
--
Gitblit v1.9.3