From 036db6cdb6bd7818fc14d3970255d31938fe92a7 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期二, 27 一月 2026 19:06:34 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 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_OutboundService/OutboundOrderService.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_OutboundService/OutboundOrderService.cs"
index 91a8c46..eea7122 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_OutboundService/OutboundOrderService.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_OutboundService/OutboundOrderService.cs"
@@ -331,8 +331,6 @@
public override PageGridData<Dt_OutboundOrder> GetPageData(PageDataOptions options)
{
- string wheres = ValidatePageOptions(options);
- //鑾峰彇鎺掑簭瀛楁
Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
List<OrderByModel> orderByModels = new List<OrderByModel>();
foreach (var item in orderbyDic)
@@ -345,7 +343,7 @@
orderByModels.Add(orderByModel);
}
-
+ ISugarQueryable<Dt_OutboundOrder> sugarQueryable1 = BaseDal.Db.Queryable<Dt_OutboundOrder>().Includes(x => x.Details);
int totalCount = 0;
List<SearchParameters> searchParametersList = new List<SearchParameters>();
if (!string.IsNullOrEmpty(options.Wheres))
@@ -354,11 +352,50 @@
{
searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
options.Filter = searchParametersList;
+
+ if (searchParametersList.Count > 0)
+ {
+ var materielCodeParam = searchParametersList.FirstOrDefault(x =>
+ x.Name.Equals("materielCode", StringComparison.OrdinalIgnoreCase));
+ if (materielCodeParam != null && !string.IsNullOrEmpty(materielCodeParam.Value?.ToString()))
+ {
+ string materielCode = materielCodeParam.Value.ToString().Trim();
+ sugarQueryable1 = sugarQueryable1.Where(x =>
+ x.Details.Any(d => d.MaterielCode.Contains(materielCode)));
+ }
+ var upperOrderNoParam = searchParametersList.FirstOrDefault(x =>
+ x.Name.Equals(nameof(Dt_OutboundOrder.UpperOrderNo).FirstLetterToLower(), StringComparison.OrdinalIgnoreCase));
+ if (upperOrderNoParam != null && !string.IsNullOrEmpty(upperOrderNoParam.Value?.ToString()))
+ {
+ string upperOrderNo = upperOrderNoParam.Value.ToString().Trim();
+ sugarQueryable1 = sugarQueryable1.Where(x => x.UpperOrderNo.Contains(upperOrderNo));
+ }
+ var orderNoParam = searchParametersList.FirstOrDefault(x =>
+ x.Name.Equals(nameof(Dt_OutboundOrder.OrderNo).FirstLetterToLower(), StringComparison.OrdinalIgnoreCase));
+ if (orderNoParam != null && !string.IsNullOrEmpty(orderNoParam.Value?.ToString()))
+ {
+ string orderNo = orderNoParam.Value.ToString().Trim();
+ sugarQueryable1 = sugarQueryable1.Where(x => x.OrderNo.Contains(orderNo));
+ }
+ var orderStatusParam = searchParametersList.FirstOrDefault(x =>
+ x.Name.Equals(nameof(Dt_OutboundOrder.OrderStatus).FirstLetterToLower(), StringComparison.OrdinalIgnoreCase));
+ if (orderStatusParam != null && !string.IsNullOrEmpty(orderStatusParam.Value?.ToString()))
+ {
+ string orderStatus = orderStatusParam.Value.ToString().Trim();
+ sugarQueryable1 = sugarQueryable1.Where(x => x.OrderStatus.Equals(orderStatus));
+ }
+ var returnToMESStatusParam = searchParametersList.FirstOrDefault(x =>
+ x.Name.Equals(nameof(Dt_OutboundOrder.ReturnToMESStatus).FirstLetterToLower(), StringComparison.OrdinalIgnoreCase));
+ if (returnToMESStatusParam != null && !string.IsNullOrEmpty(returnToMESStatusParam.Value?.ToString()))
+ {
+ string returnToMESStatus = returnToMESStatusParam.Value.ToString().Trim();
+ sugarQueryable1 = sugarQueryable1.Where(x => x.ReturnToMESStatus.Equals(returnToMESStatus));
+ }
+ }
}
catch { }
}
- var data = BaseDal.Db.Queryable<Dt_OutboundOrder>()
- .WhereIF(!wheres.IsNullOrEmpty(), wheres)
+ var data = sugarQueryable1
.Where(x => x.OrderType == 0 || x.OrderType == 116)
.OrderBy(orderByModels)
.ToPageList(options.Page, options.Rows, ref totalCount);
--
Gitblit v1.9.3