From 1866b69e8f67e382a0a75268d63e6418c8ae02e7 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 13 一月 2026 09:55:01 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 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 89a2938..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;
@@ -27,6 +28,7 @@
public readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
public readonly IRepository<Dt_AllocateOrderDetail> _allocateOrderDetailRepository;
private readonly IMaterielInfoService _materielInfoService;
+ private readonly IRepository<Dt_MaterielInfo> _materielInforepository;
public readonly IRepository<Dt_InboundOrderDetail> _inboundOrderDetailRepository;
private readonly ILogger<AllocateService> _logger;
@@ -38,7 +40,8 @@
IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository,
IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository,
ILogger<AllocateService> logger,
- IMaterielInfoService materielInfoService) : base(BaseDal)
+ IMaterielInfoService materielInfoService,
+ IRepository<Dt_MaterielInfo> materielInforepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_inboundService = inboundService;
@@ -48,6 +51,7 @@
_logger = logger;
_inboundOrderDetailRepository = inboundOrderDetailRepository;
_materielInfoService = materielInfoService;
+ _materielInforepository = materielInforepository;
}
public IRepository<Dt_AllocateOrder> Repository => BaseDal;
@@ -299,6 +303,15 @@
.Select(g => g.First())
.ToList();
+ // 鑾峰彇鎵�鏈夌墿鏂欎唬鐮�
+ var materielCodes = distinctDetails.Select(d => d.MaterielCode).Distinct().ToList();
+
+ // 浠庢暟鎹簱鏌ヨ鐗╂枡淇℃伅锛堝亣璁句娇鐢� DbContext锛�
+ var materielInfos = _materielInforepository.Db.Queryable<Dt_MaterielInfo>()
+ .Where(m => materielCodes.Contains(m.MaterielCode))
+ .Select(m => new { m.MaterielCode, m.MaterielName })
+ .ToDictionary(m => m.MaterielCode, m => m.MaterielName);
+
return new List<Dt_InboundOrder>()
{
new Dt_InboundOrder(){
@@ -315,9 +328,10 @@
Remark=allocateOrder.Remark,
Details=distinctDetails.Select(detail=>new Dt_InboundOrderDetail
{
+
OrderId= 0,
MaterielCode=detail.MaterielCode,
- MaterielName="",
+ MaterielName=detail.MaterielName,
BatchNo=detail.BatchNo,
OrderQuantity=detail.OrderQuantity,
ReceiptQuantity=detail.ReceiptQuantity,
@@ -329,9 +343,10 @@
SupplyCode=detail.SupplyCode,
WarehouseCode=detail.WarehouseCode,
Barcode=detail.Barcode,
- OutBoxbarcodes="",
+ OutBoxbarcodes= detail.BoxSN,
BarcodeQty=(decimal)detail.BarcodeQty,
- BarcodeUnit=detail.BarcodeUnit
+ BarcodeUnit=detail.BarcodeUnit,
+ ValidDate = detail.ValidDate
}).ToList()
}
};
@@ -450,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>();
@@ -462,7 +480,7 @@
};
orderByModels.Add(orderByModel);
}
-
+ ISugarQueryable<Dt_AllocateOrder> sugarQueryable1 = BaseDal.Db.Queryable<Dt_AllocateOrder>();
int totalCount = 0;
List<SearchParameters> searchParametersList = new List<SearchParameters>();
@@ -471,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)
@@ -488,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