From 95c92db3c831c73b05068b09221c13ad4a250322 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期一, 02 二月 2026 20:07:00 +0800
Subject: [PATCH] 条码扫描成功音频播放功能，代码优化
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 163 insertions(+), 17 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 15ba41a..4319e11 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"
@@ -3,7 +3,8 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using SqlSugar;
-using SqlSugar.Extensions;
+using WIDESEA_BasicService;
+using WIDESEA_Common.AllocateEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
@@ -11,6 +12,7 @@
using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.DB;
using WIDESEA_Core.Enums;
+using WIDESEA_Core.Helper;
using WIDESEA_Core.Seed;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundService;
@@ -22,19 +24,22 @@
{
private readonly IMapper _mapper;
private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IMaterielInfoService _materielInfoService;
public IRepository<Dt_OutboundOrder> Repository => BaseDal;
private readonly ILogger<OutboundOrderService> _logger;
private readonly IRepository<Dt_OutboundOrderDetail> _outboundOrderDetailRepository;
private readonly IMaterialUnitService _materialUnitService;
- public OutboundOrderService(IRepository<Dt_OutboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_OutboundOrderDetail> outboundOrderDetailRepository, ILogger<OutboundOrderService> logger, IMaterialUnitService materialUnitService) : base(BaseDal)
+ public OutboundOrderService(IRepository<Dt_OutboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_OutboundOrderDetail> outboundOrderDetailRepository, ILogger<OutboundOrderService> logger, IMaterialUnitService materialUnitService, IMaterielInfoService materielInfoService) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
_outboundOrderDetailRepository = outboundOrderDetailRepository;
_logger = logger;
_materialUnitService = materialUnitService;
+ _materielInfoService = materielInfoService;
}
+ private int[] OrderTypes = new int[] { (int)InOrderTypeEnum.AllocatOutbound, (int)InOrderTypeEnum.InternalAllocat, (int)InOrderTypeEnum.ReCheck };
public async Task<WebResponseContent> ReceiveOutboundOrder(Dt_OutboundOrder model, int operateType)
{
try
@@ -61,19 +66,30 @@
if (BaseDal.QueryFirst(x => x.UpperOrderNo == model.UpperOrderNo) != null)
{
- return WebResponseContent.Instance.Error($"鍑哄簱鍗曞彿閲嶅");
+ return WebResponseContent.Instance.Error($"{model.UpperOrderNo}鍑哄簱鍗曞彿閲嶅");
}
+
+ var materielCodes = model.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)
{
- var issueoStockResult = await _materialUnitService.ConvertIssueToStockAsync(item.MaterielCode, item.BarcodeQty);
+ var issueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeQty);
item.Unit = issueoStockResult.Unit;
item.OrderQuantity = issueoStockResult.Quantity;
- var moveissueoStockResult = await _materialUnitService.ConvertIssueToStockAsync(item.MaterielCode, item.BarcodeMoveQty);
+ var moveissueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeMoveQty);
item.MoveQty = moveissueoStockResult.Quantity;
+ if (materielInfos.Any())
+ {
+ item.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
+ }
+
+ }
+ if (!OrderTypes.Contains(model.OrderType))
+ {
+ model.OrderNo = CreateCodeByRule(nameof(RuleCodeEnum.OutboundOrderRule));
}
-
- model.OrderNo = CreateCodeByRule(nameof(RuleCodeEnum.OutboundOrderRule));
Db.InsertNav(model).Include(x => x.Details).ExecuteCommand();
return WebResponseContent.Instance.OK();
@@ -97,13 +113,14 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
}
- if (outboundOrder.OrderStatus != OutOrderStatusEnum.鏈紑濮�.ObjToInt())
- {
- return WebResponseContent.Instance.Error($"璇ヨ鍗曠姸鎬佷笉鍏佽淇敼");
- }
List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
List<Dt_OutboundOrderDetail> updateoutboundOrderDetails = new List<Dt_OutboundOrderDetail>();
List<int> detailIds = new List<int>();
+
+ var materielCodes = model.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)
{
@@ -125,16 +142,25 @@
BarcodeQty = item.OrderQuantity,
BarcodeUnit = item.Unit,
};
- var issueoStockResult = await _materialUnitService.ConvertIssueToStockAsync(item.MaterielCode, item.BarcodeQty);
+ var issueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeQty);
item.Unit = issueoStockResult.Unit;
item.OrderQuantity = issueoStockResult.Quantity;
- var moveissueoStockResult = await _materialUnitService.ConvertIssueToStockAsync(item.MaterielCode, item.BarcodeMoveQty);
+ var moveissueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeMoveQty);
item.MoveQty = moveissueoStockResult.Quantity;
+
+ if (materielInfos.Any())
+ {
+ outboundOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
+ }
outboundOrderDetails.Add(outboundOrderDetail);
}
else
{
+ if(item.OrderQuantity < outboundOrderDetail.LockQuantity + outboundOrderDetail.MoveQty)
+ {
+ return WebResponseContent.Instance.Error($"淇敼鐨勮鍙穥item.lineNo}鏁伴噺瓒呰繃浜嗘櫤浠撳嚭搴撻攣瀹氭暟閲忓姞涓婃尓鏂欐暟閲忥紝涓嶅厑璁镐慨鏀�");
+ }
outboundOrderDetail.lineNo = item.lineNo;
outboundOrderDetail.MaterielCode = item.MaterielCode;
outboundOrderDetail.SupplyCode = item.SupplyCode;
@@ -146,12 +172,15 @@
outboundOrderDetail.BarcodeMoveQty = item.MoveQty;
outboundOrderDetail.BarcodeQty = item.OrderQuantity;
outboundOrderDetail.BarcodeUnit = item.Unit;
- var issueoStockResult = await _materialUnitService.ConvertIssueToStockAsync(item.MaterielCode, item.BarcodeQty);
+ var issueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeQty);
outboundOrderDetail.Unit = issueoStockResult.Unit;
outboundOrderDetail.OrderQuantity = issueoStockResult.Quantity;
- var moveissueoStockResult = await _materialUnitService.ConvertIssueToStockAsync(item.MaterielCode, item.BarcodeMoveQty);
+ var moveissueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeMoveQty);
outboundOrderDetail.MoveQty = moveissueoStockResult.Quantity;
-
+ if (materielInfos.Any())
+ {
+ outboundOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
+ }
updateoutboundOrderDetails.Add(outboundOrderDetail);
detailIds.Add(outboundOrderDetail.Id);
@@ -169,6 +198,10 @@
_unitOfWorkManage.BeginTran();
foreach (var item in deletePurchaseOrderDetails)
{
+ if(item.LockQuantity > 0)
+ {
+ return WebResponseContent.Instance.Error($"鍘熷崟鎹鍙穥item.lineNo}宸茬粡閿佸畾鍑哄簱锛屼笉鍏佽鍒犻櫎锛岃閲嶆柊鏇存敼鏁版嵁鎺ㄩ��");
+ }
// _outboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
_outboundOrderDetailRepository.DeleteData(item);
}
@@ -176,6 +209,10 @@
_outboundOrderDetailRepository.UpdateData(updateoutboundOrderDetails);
_outboundOrderDetailRepository.AddData(outboundOrderDetails);
+ if(outboundOrder.Details.All(x => x.OverOutQuantity >= x.OrderQuantity - x.MoveQty))
+ {
+ outboundOrder.OrderStatus = (int)OutOrderStatusEnum.鍑哄簱瀹屾垚;
+ }
BaseDal.UpdateData(outboundOrder);
_unitOfWorkManage.CommitTran();
@@ -201,7 +238,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
}
- if (outboundOrder.OrderStatus != OutOrderStatusEnum.鏈紑濮�.ObjToInt())
+ if (outboundOrder.OrderStatus != (int)OutOrderStatusEnum.鏈紑濮�)
{
return WebResponseContent.Instance.Error($"璇ヨ鍗曠姸鎬佷笉鍏佽鍒犻櫎");
}
@@ -298,5 +335,114 @@
return code;
}
}
+
+
+ public override PageGridData<Dt_OutboundOrder> GetPageData(PageDataOptions options)
+ {
+ Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
+ List<OrderByModel> orderByModels = new List<OrderByModel>();
+ foreach (var item in orderbyDic)
+ {
+ OrderByModel orderByModel = new()
+ {
+ FieldName = item.Key,
+ OrderByType = item.Value
+ };
+ 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))
+ {
+ try
+ {
+ 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));
+ }
+
+ 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);
+ }
+ }
+ }
+ catch { }
+ }
+ var data = sugarQueryable1
+ .Where(x => x.OrderType == 0 || x.OrderType == 116)
+ .OrderBy(orderByModels)
+ .ToPageList(options.Page, options.Rows, ref totalCount);
+
+ return new PageGridData<Dt_OutboundOrder>(totalCount, data);
+ }
}
}
--
Gitblit v1.9.3