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_AllocateService/AllocateService.cs | 311 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 250 insertions(+), 61 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 8759a0b..35bbece 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,15 +1,6 @@
-锘縰sing Autofac.Core;
-using MailKit.Search;
-using Microsoft.Extensions.Logging;
+锘縰sing Microsoft.Extensions.Logging;
using SqlSugar;
-using SqlSugar.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text.RegularExpressions;
using WIDESEA_Common.AllocateEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
@@ -21,6 +12,7 @@
using WIDESEA_Core.Helper;
using WIDESEA_Core.Seed;
using WIDESEA_IAllocateService;
+using WIDESEA_IBasicService;
using WIDESEA_IInboundService;
using WIDESEA_IOutboundService;
using WIDESEA_Model.Models;
@@ -36,7 +28,8 @@
public readonly IOutboundService _outboundService;
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;
@@ -47,7 +40,9 @@
IRepository<Dt_AllocateOrder> allocateOrderRepository,
IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository,
IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository,
- ILogger<AllocateService> logger) : base(BaseDal)
+ ILogger<AllocateService> logger,
+ IMaterielInfoService materielInfoService,
+ IRepository<Dt_MaterielInfo> materielInforepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_inboundService = inboundService;
@@ -56,6 +51,8 @@
_allocateOrderDetailRepository = allocateOrderDetailRepository;
_logger = logger;
_inboundOrderDetailRepository = inboundOrderDetailRepository;
+ _materielInfoService = materielInfoService;
+ _materielInforepository = materielInforepository;
}
public IRepository<Dt_AllocateOrder> Repository => BaseDal;
@@ -86,9 +83,18 @@
{
if (BaseDal.QueryFirst(x => x.UpperOrderNo == allocateOrder.UpperOrderNo) != null)
{
- return WebResponseContent.Instance.Error($"璋冩嫧鍗曞彿閲嶅");
+ return WebResponseContent.Instance.Error($"{allocateOrder.UpperOrderNo}璋冩嫧鍗曞彿閲嶅");
}
allocateOrder.OrderNo = CreateCodeByRule(nameof(RuleCodeEnum.AllocateOrderCodeRule));
+ var materielCodes = allocateOrder.Details.Select(x => x.MaterielCode).Distinct().ToList();
+ var materielInfos = _materielInfoService.Db.Queryable<Dt_MaterielInfo>().Where(x => materielCodes.Contains(x.MaterielCode)).ToList();
+ foreach (var item in allocateOrder.Details)
+ {
+ if (materielInfos.Any())
+ {
+ item.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
+ }
+ }
Db.InsertNav(allocateOrder).Include(x => x.Details).ExecuteCommand();
await AddInOutData(allocateOrder);
return WebResponseContent.Instance.OK();
@@ -137,6 +143,7 @@
try
{
var allocateOrder = Db.Queryable<Dt_AllocateOrder>().Where(x => x.UpperOrderNo == model.UpperOrderNo).Includes(x => x.Details).First();
+ var outOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.UpperOrderNo).Includes(x => x.Details).First();
if (allocateOrder == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟淇℃伅");
@@ -145,16 +152,20 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟鏄庣粏淇℃伅");
}
+ if (outOrder.OrderStatus != (int)OutOrderStatusEnum.鏈紑濮�)
+ {
+ return WebResponseContent.Instance.Error($"璇ヨ鍗曠姸鎬佷笉鍏佽淇敼");
+ }
List<Dt_AllocateOrderDetail> allocateOrderDetails = new List<Dt_AllocateOrderDetail>();
List<Dt_AllocateOrderDetail> updateAllocateOrderDetails = new List<Dt_AllocateOrderDetail>();
List<int> detailIds = new List<int>();
+
+ var materielCodes = allocateOrder.Details.Select(x => x.MaterielCode).Distinct().ToList();
+ var materielInfos = _materielInfoService.Db.Queryable<Dt_MaterielInfo>().Where(x => materielCodes.Contains(x.MaterielCode)).ToList();
+
foreach (var item in model.Details)
{
- if (string.IsNullOrEmpty(item.Barcode))
- {
-
- }
- else
+ if (!string.IsNullOrEmpty(item.Barcode))
{
Dt_AllocateOrderDetail? allocateOrderDetail = allocateOrder.Details.FirstOrDefault(x => x.Barcode == item.Barcode);
if (allocateOrderDetail == null)
@@ -172,6 +183,10 @@
BarcodeQty = (decimal)item.BarcodeQty,
OrderQuantity = item.OrderQuantity
};
+ if (materielInfos.Any())
+ {
+ allocateOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
+ }
allocateOrderDetails.Add(allocateOrderDetail);
}
else
@@ -185,7 +200,10 @@
allocateOrderDetail.BarcodeUnit = item.BarcodeUnit;
allocateOrderDetail.BarcodeQty = item.BarcodeQty;
allocateOrderDetail.OrderQuantity = item.OrderQuantity;
-
+ if (materielInfos.Any())
+ {
+ allocateOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
+ }
updateAllocateOrderDetails.Add(allocateOrderDetail);
detailIds.Add(allocateOrderDetail.Id);
@@ -241,6 +259,12 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌皟鎷ㄥ崟鏄庣粏淇℃伅");
}
+ var outOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.UpperOrderNo).Includes(x => x.Details).First();
+
+ if (outOrder.OrderStatus != (int)OutOrderStatusEnum.鏈紑濮�)
+ {
+ return WebResponseContent.Instance.Error($"璇ヨ鍗曠姸鎬佷笉鍏佽鍒犻櫎");
+ }
//Db.DeleteNav(Allocate).Include(x => x.Details).ExecuteCommand();
_unitOfWorkManage.BeginTran();
// BaseDal.DeleteAndMoveIntoHty(allocateOrder, OperateTypeEnum.鑷姩鍒犻櫎);
@@ -291,6 +315,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(){
@@ -307,9 +340,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,
@@ -321,9 +355,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()
}
};
@@ -441,8 +476,6 @@
public override PageGridData<Dt_AllocateOrder> 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)
@@ -455,44 +488,195 @@
orderByModels.Add(orderByModel);
}
+
+ ISugarQueryable<Dt_AllocateOrder> sugarQueryable1 = BaseDal.Db.Queryable<Dt_AllocateOrder>()
+ .Includes(x => x.Details);
int totalCount = 0;
List<SearchParameters> searchParametersList = new List<SearchParameters>();
+
+ string filterOrderStatus = string.Empty;
+ string filterreturnToMESStatus = string.Empty;
+
+
if (!string.IsNullOrEmpty(options.Wheres))
{
try
{
searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
- options.Filter = searchParametersList;
+ if (searchParametersList.Count > 0)
+ {
+ var orderNoParams = searchParametersList
+ .Where(x => x.Name.Equals("orderNo", StringComparison.OrdinalIgnoreCase)
+ && !string.IsNullOrEmpty(x.Value?.ToString()))
+ .ToList();
+
+ if (orderNoParams.Any())
+ {
+ string searchValue = orderNoParams.First().Value.ToString().Trim();
+ sugarQueryable1 = sugarQueryable1.Where(x =>
+ x.OrderNo.Contains(searchValue) ||
+ x.UpperOrderNo.Contains(searchValue) ||
+ x.Details.Any(d => d.Barcode.Contains(searchValue))||
+ x.Details.Any(d=>d.BoxSN.Contains(searchValue)));
+ }
+
+ var orderTypeParams = searchParametersList
+ .Where(x => x.Name.Equals("orderType", StringComparison.OrdinalIgnoreCase)
+ && !string.IsNullOrEmpty(x.Value?.ToString()))
+ .DistinctBy(x => x.Value)
+ .ToList();
+
+ if (orderTypeParams.Any())
+ {
+ string orderTypeValue = orderTypeParams.First().Value.ToString().Trim();
+ sugarQueryable1 = sugarQueryable1.Where(x => x.OrderType == orderTypeValue.ObjToInt());
+ }
+
+ var detailMaterielCode = searchParametersList.FirstOrDefault(x => x.Name == "materielCode");
+ if (detailMaterielCode != null && !string.IsNullOrEmpty(detailMaterielCode.Value?.ToString()))
+ {
+ string materielCode = detailMaterielCode.Value.ToString().Trim();
+ sugarQueryable1 = sugarQueryable1.Where(x => x.Details.Any(d => d.MaterielCode.Contains(materielCode)));
+ }
+
+ var detailMaterielName = searchParametersList.FirstOrDefault(x => x.Name == "materielName");
+ if (detailMaterielName != null && !string.IsNullOrEmpty(detailMaterielName.Value?.ToString()))
+ {
+ string materielName = detailMaterielName.Value.ToString().Trim();
+ sugarQueryable1 = sugarQueryable1.Where(x => x.Details.Any(d => d.MaterielName.Contains(materielName)));
+ }
+
+ var orderStatusParam = searchParametersList.FirstOrDefault(x =>x.Name.Equals("orderStatus", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrEmpty(x.Value?.ToString()));
+ if (orderStatusParam != null)
+ {
+ filterOrderStatus = orderStatusParam.Value.ToString().Trim();
+ }
+
+ var returnToMESStatusParam = searchParametersList.FirstOrDefault(x => x.Name.Equals("returnToMESStatus", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrEmpty(x.Value?.ToString()));
+ if (returnToMESStatusParam != null)
+ {
+ filterreturnToMESStatus = returnToMESStatusParam.Value.ToString().Trim();
+ }
+
+ var createDateParams = searchParametersList
+ .Where(x => x.Name.Equals("createDate", StringComparison.OrdinalIgnoreCase)
+ && !string.IsNullOrEmpty(x.Value?.ToString()))
+ .ToList();
+
+ DateTime? minCreateDate = null;
+ DateTime? maxCreateDate = null;
+
+ foreach (var dateParam in createDateParams)
+ {
+ if (DateTime.TryParse(dateParam.Value.ToString(), out DateTime dateValue))
+ {
+ LinqExpressionType expressionType = dateParam.DisplayType.GetLinqCondition();
+ switch (expressionType)
+ {
+ case LinqExpressionType.ThanOrEqual:
+ minCreateDate = dateValue;
+ break;
+ case LinqExpressionType.LessThanOrEqual:
+ maxCreateDate = dateValue;
+ break;
+ }
+ }
+ }
+
+ if (minCreateDate.HasValue)
+ {
+ sugarQueryable1 = sugarQueryable1.Where(x => x.CreateDate >= minCreateDate.Value);
+ }
+ if (maxCreateDate.HasValue)
+ {
+ sugarQueryable1 = sugarQueryable1.Where(x => x.CreateDate <= maxCreateDate.Value);
+ }
+ options.Filter = searchParametersList;
+ }
}
- catch { }
+ catch (Exception ex)
+ {
+
+ }
}
- var data = BaseDal.Db.Queryable<Dt_AllocateOrder>()
- .WhereIF(!wheres.IsNullOrEmpty(), wheres)
+
+
+ var data = sugarQueryable1
+
.OrderBy(orderByModels)
.ToPageList(options.Page, options.Rows, ref totalCount);
+
- foreach (var item in data)
+ if (data.Any())
{
- Dt_InboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == item.UpperOrderNo).First();
- Dt_OutboundOrder OutboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == item.UpperOrderNo).First();
- if (_InboundOrder != null)
+ var upperOrderNos = data.Select(x => x.UpperOrderNo)
+ .Distinct()
+ .Where(x => !string.IsNullOrEmpty(x))
+ .ToList();
+
+ var inboundOrders = SqlSugarHelper.DbWMS.Queryable<Dt_InboundOrder>()
+ .Where(x => upperOrderNos.Contains(x.UpperOrderNo))
+ .ToList();
+ var inboundOrderDict = new Dictionary<string, Dt_InboundOrder>();
+ foreach (var order in inboundOrders)
{
- item.OrderStatus = _InboundOrder.OrderStatus;
- item.OrderType = _InboundOrder.OrderType;
- }else if (OutboundOrder!=null)
+ if (!string.IsNullOrEmpty(order.UpperOrderNo) && !inboundOrderDict.ContainsKey(order.UpperOrderNo))
+ {
+ inboundOrderDict.Add(order.UpperOrderNo, order);
+ }
+ }
+
+ var outboundOrders = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>()
+ .Where(x => upperOrderNos.Contains(x.UpperOrderNo))
+ .ToList();
+ var outboundOrderDict = new Dictionary<string, Dt_OutboundOrder>();
+ foreach (var order in outboundOrders)
{
- item.OrderStatus = OutboundOrder.OrderStatus;
- item.OrderType = OutboundOrder.OrderType;
+ if (!string.IsNullOrEmpty(order.UpperOrderNo) && !outboundOrderDict.ContainsKey(order.UpperOrderNo))
+ {
+ outboundOrderDict.Add(order.UpperOrderNo, order);
+ }
+ }
+
+ foreach (var allocateOrder in data)
+ {
+ if (inboundOrderDict.TryGetValue(allocateOrder.UpperOrderNo, out var inboundOrder))
+ {
+ allocateOrder.OrderStatus = inboundOrder.OrderStatus;
+ allocateOrder.OrderType = inboundOrder.OrderType;
+ allocateOrder.Modifier = inboundOrder.Operator;
+ allocateOrder.ReturnToMESStatus = inboundOrder.ReturnToMESStatus;
+ }
+ else if (outboundOrderDict.TryGetValue(allocateOrder.UpperOrderNo, out var outboundOrder))
+ {
+ allocateOrder.OrderStatus = outboundOrder.OrderStatus;
+ allocateOrder.OrderType = outboundOrder.OrderType;
+ allocateOrder.Modifier = outboundOrder.Operator;
+ allocateOrder.ReturnToMESStatus = outboundOrder.ReturnToMESStatus;
+ }
+ }
+
+ if (!string.IsNullOrEmpty(filterOrderStatus))
+ {
+ data = data.Where(x => x.OrderStatus == filterOrderStatus.ObjToInt()).ToList();
+ totalCount = data.Count;
+ }
+
+ if (!string.IsNullOrEmpty(filterreturnToMESStatus))
+ {
+ data = data.Where(x => x.ReturnToMESStatus == filterreturnToMESStatus.ObjToInt()).ToList();
+ totalCount = data.Count;
}
}
+
return new PageGridData<Dt_AllocateOrder>(totalCount, data);
}
+
public override PageGridData<Dt_InboundOrderDetail> GetDetailPage(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)
@@ -505,7 +689,6 @@
orderByModels.Add(orderByModel);
}
-
int totalCount = 0;
List<SearchParameters> searchParametersList = new List<SearchParameters>();
if (!string.IsNullOrEmpty(options.Wheres))
@@ -517,35 +700,41 @@
}
catch { }
}
- //var data = BaseDal.Db.Queryable<Dt_AllocateOrderDetail>()
- // .WhereIF(!wheres.IsNullOrEmpty(), wheres)
- // .OrderBy(orderByModels)
- // .ToPageList(options.Page, options.Rows, ref totalCount);
- //Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == (int)options.Value);
- //Dt_InboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();
- //var details = _inboundOrderDetailRepository.QueryData(x => x.OrderId == _InboundOrder.Id );
- //foreach (var item in data)
- //{
- // var detail = details.Where(x => x.MaterielCode == item.MaterielCode).FirstOrDefault();
- // if (detail != null)
- // {
- // item.OrderQuantity = detail.OrderQuantity;
- // item.ReceiptQuantity = detail.ReceiptQuantity;
- // item.OverInQuantity = detail.OverInQuantity;
- // item.OrderDetailStatus = detail.OrderDetailStatus;
- // }
- //}
- //return new PageGridData<Dt_AllocateOrderDetail>(totalCount, data);
Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == (int)options.Value);
Dt_InboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();
+ var Id = _InboundOrder == null ? 0 : _InboundOrder.Id;
var data = BaseDal.Db.Queryable<Dt_InboundOrderDetail>()
- .WhereIF(!wheres.IsNullOrEmpty(), wheres)
- .WhereIF(!_InboundOrder.IsNullOrEmpty(), x => x.OrderId == _InboundOrder.Id)
+ .WhereIF(!string.IsNullOrEmpty(wheres), wheres)
+ .Where(x => x.OrderId == Id)
.OrderBy(orderByModels)
.ToPageList(options.Page, options.Rows, ref totalCount);
+ foreach (var detail in data)
+ {
+ if (string.IsNullOrEmpty(detail.Barcode))
+ {
+ detail.Pallet = string.Empty;
+ continue;
+ }
+
+ var stockDetail = BaseDal.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(sd => sd.Barcode == detail.Barcode)
+ .First();
+
+ if (stockDetail == null || stockDetail.StockId <= 0)
+ {
+ detail.Pallet = string.Empty;
+ continue;
+ }
+
+ var stock = BaseDal.Db.Queryable<Dt_StockInfo>()
+ .Where(s => s.Id == stockDetail.StockId)
+ .First();
+
+ detail.Pallet = stock == null ? string.Empty : stock.PalletCode;
+ }
return new PageGridData<Dt_InboundOrderDetail>(totalCount, data);
}
--
Gitblit v1.9.3