From d741e7a7ad7de5045e5c6b6145d9da1783cadecd Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 13 一月 2026 09:55:03 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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_AllocateService/AllocateService.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_AllocateService/AllocateService.cs"
index 4ef506d..2dca956 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_AllocateService/AllocateService.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_AllocateService/AllocateService.cs"
@@ -1,5 +1,6 @@
锘縰sing Microsoft.Extensions.Logging;
using SqlSugar;
+using System.Text.RegularExpressions;
using WIDESEA_Common.AllocateEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
@@ -464,6 +465,9 @@
public override PageGridData<Dt_AllocateOrder> GetPageData(PageDataOptions options)
{
string wheres = ValidatePageOptions(options);
+
+ string pattern = @"orderNo like '[^']+'\s*and\s*";
+ wheres = Regex.Replace(wheres, pattern, "", RegexOptions.IgnoreCase);
//鑾峰彇鎺掑簭瀛楁
Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
List<OrderByModel> orderByModels = new List<OrderByModel>();
@@ -476,7 +480,7 @@
};
orderByModels.Add(orderByModel);
}
-
+ ISugarQueryable<Dt_AllocateOrder> sugarQueryable1 = BaseDal.Db.Queryable<Dt_AllocateOrder>();
int totalCount = 0;
List<SearchParameters> searchParametersList = new List<SearchParameters>();
@@ -485,13 +489,32 @@
try
{
searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+ if (searchParametersList.Count > 0)
+ {
+
+ SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_AllocateOrder.OrderNo).FirstLetterToLower());
+ if (searchParameters != null)
+ {
+ sugarQueryable1 = sugarQueryable1.Where(x => x.OrderNo.Contains(searchParameters.Value.ToString())
+ || x.UpperOrderNo.Contains(searchParameters.Value.ToString()) ||
+ x.Details.Any(d => d.Barcode == searchParameters.Value.ToString()) ||
+ x.Details.Any(d => d.BoxSN == searchParameters.Value.ToString()));
+ }
+ searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_AllocateOrder.OrderType).FirstLetterToLower());
+ if (searchParameters != null)
+ {
+ sugarQueryable1 = sugarQueryable1.Where(x => x.OrderType.Equals(searchParameters.Value.ToString()));
+ }
+ //var dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
+ //return new PageGridData<Dt_InboundOrder>(totalCount, dataList);
+ }
options.Filter = searchParametersList;
}
catch { }
}
- var data = BaseDal.Db.Queryable<Dt_AllocateOrder>()
+ var data = sugarQueryable1
.WhereIF(!wheres.IsNullOrEmpty(), wheres)
- .OrderBy(orderByModels)
+ .OrderBy(orderByModels).Includes(x=>x.Details)
.ToPageList(options.Page, options.Rows, ref totalCount);
foreach (var item in data)
@@ -502,10 +525,14 @@
{
item.OrderStatus = _InboundOrder.OrderStatus;
item.OrderType = _InboundOrder.OrderType;
+ item.Modifier = _InboundOrder.Operator;
+ item.ReturnToMESStatus = _InboundOrder.ReturnToMESStatus;
}else if (OutboundOrder!=null)
{
item.OrderStatus = OutboundOrder.OrderStatus;
item.OrderType = OutboundOrder.OrderType;
+ item.Modifier = OutboundOrder.Operator;
+ item.ReturnToMESStatus = OutboundOrder.ReturnToMESStatus;
}
}
return new PageGridData<Dt_AllocateOrder>(totalCount, data);
--
Gitblit v1.9.3