From db215dc033392d843cec846f0a8f9dbff2578c6a Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期四, 04 十二月 2025 12:57:53 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 425 +++++++++++++++++++++++------
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs | 319 ++++++++++++++--------
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs | 72 ++++
3 files changed, 592 insertions(+), 224 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_BasicService/InvokeMESService.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_BasicService/InvokeMESService.cs"
index 3848d23..15db4f7 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_BasicService/InvokeMESService.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_BasicService/InvokeMESService.cs"
@@ -5,6 +5,7 @@
using Org.BouncyCastle.Asn1.Ocsp;
using SqlSugar;
using System;
+using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Net;
@@ -27,7 +28,7 @@
using WIDESEA_Model.Models;
namespace WIDESEA_BasicService
-{
+{
public class InvokeMESService : IInvokeMESService
{
private readonly IHttpClientFactory _httpClientFactory;
@@ -44,6 +45,12 @@
private readonly IOutboundOrderService _outboundOrderService;
private readonly IOutboundOrderDetailService _outboundOrderDetailService;
private readonly IOutStockLockInfoService _outStockLockInfoService;
+
+ // 瀛樺偍璧勬簮ID鍙婂叾瀵瑰簲鐨勯攣瀵硅薄銆備娇鐢� ConcurrentDictionary 纭繚瀵瑰瓧鍏告搷浣滄湰韬殑绾跨▼瀹夊叏銆�
+ private static readonly ConcurrentDictionary<string, object> _resourceLocks = new ConcurrentDictionary<string, object>();
+
+ // 鍏ㄥ眬闈欐�侀攣锛氱敤浜庝繚鎶� _resourceLocks 瀛楀吀涓� GetOrAdd 鎴� TryRemove 鏃剁殑绔炰簤
+ private static readonly object _globalLocker = new object();
public InvokeMESService(IHttpClientFactory httpClientFactory, ILogger<InvokeMESService> logger, IRepository<Dt_FeedbackToMes> feedbacktomesRepository, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRepository<Dt_StockInfo> stockInfoRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IOutStockLockInfoService outStockLockInfoService, IMaterialUnitService materialUnitService, IRepository<Dt_PickingRecord> pickingRecoreRepository)
{
_httpClientFactory = httpClientFactory;
@@ -105,7 +112,7 @@
_client.DefaultRequestHeaders.Clear();
_client.DefaultRequestHeaders.Add("Accept", "application/json");
- _logger.LogInformation("InvokeMESService FeedbackOutbound : "+ model.orderNo +" , " + json);
+ _logger.LogInformation("InvokeMESService FeedbackOutbound : " + model.orderNo + " , " + json);
var response = await _client.PostAsync("AldMaterialOutbound/MaterialOutbound", content);
string body = await response.Content.ReadAsStringAsync();
@@ -224,7 +231,8 @@
}
}
-
+
+
/// <summary>
///
/// </summary>
@@ -233,141 +241,159 @@
/// <returns></returns>
public async Task<WebResponseContent> BatchOrderFeedbackToMes(List<string> orderNos, int inout)
{
- if (inout == 1)
+ // 1. 銆愬唴瀛橀攣鎶㈠崰銆�
+ if (MemoryLockManager.TryAcquireLock(orderNos[0]))
{
- foreach (var orderNo in orderNos)
+ try
{
- try
+ if (inout == 1)
{
- var stockinfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>("info").Where(info => info.StockStatus == 6)
- .Where(it => SqlFunc.Subqueryable<Dt_StockInfoDetail>().Where(s => s.StockId == it.Id && s.OrderNo == orderNo).Any())
- .ToList();
- var feeds = _feedbacktomesRepository.Db.Queryable<Dt_FeedbackToMes>().Where(x => x.OrderNo == orderNo && x.ReportStatus == 1).Select(o => o.PalletCode).ToList();
- var unreports = stockinfos.Where(x => !feeds.Contains(x.PalletCode)).ToList();
- if (unreports != null && !unreports.Any())
+ foreach (var orderNo in orderNos)
{
- return WebResponseContent.Instance.Error("娌℃湁闇�瑕佸洖浼犵殑鏁版嵁");
- }
- foreach (var item in unreports)
- {
- var lists = _stockInfoDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.StockId == item.Id).ToList();
- if (lists.Any())
+ try
{
- var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == lists.FirstOrDefault().OrderNo);
- if (inboundOrder != null)
+ var stockinfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>("info").Where(info => info.StockStatus == 6)
+ .Where(it => SqlFunc.Subqueryable<Dt_StockInfoDetail>().Where(s => s.StockId == it.Id && s.OrderNo == orderNo).Any())
+ .ToList();
+ var feeds = _feedbacktomesRepository.Db.Queryable<Dt_FeedbackToMes>().Where(x => x.OrderNo == orderNo && x.ReportStatus == 1).Select(o => o.PalletCode).ToList();
+ var unreports = stockinfos.Where(x => !feeds.Contains(x.PalletCode)).ToList();
+ if (unreports != null && !unreports.Any())
{
- if (inboundOrder.OrderType == (int)InOrderTypeEnum.AllocatInbound)//璋冩嫧鍏ュ簱
+ return WebResponseContent.Instance.Error("娌℃湁闇�瑕佸洖浼犵殑鏁版嵁");
+ }
+ foreach (var item in unreports)
+ {
+ var lists = _stockInfoDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.StockId == item.Id).ToList();
+ if (lists.Any())
{
- var allocate = SqlSugarHelper.DbWMS.Queryable<Dt_AllocateOrder>().Where(x => x.OrderNo == inboundOrder.InboundOrderNo).First();
- var allocatefeedmodel = new AllocateDto
+ var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == lists.FirstOrDefault().OrderNo);
+ if (inboundOrder != null)
{
- ReqCode = Guid.NewGuid().ToString(),
- ReqTime = DateTime.Now.ToString(),
- BusinessType = "2",
- FactoryArea = inboundOrder.FactoryArea,
- OperationType = 1,
- Operator = inboundOrder.Operator,
- OrderNo = inboundOrder.UpperOrderNo,
- fromWarehouse = allocate?.FromWarehouse ?? "",
- toWarehouse = allocate?.ToWarehouse ?? "",
- Details = new List<AllocateDtoDetail>()
+ if (inboundOrder.OrderType == (int)InOrderTypeEnum.AllocatInbound)//璋冩嫧鍏ュ簱
+ {
+ var allocate = SqlSugarHelper.DbWMS.Queryable<Dt_AllocateOrder>().Where(x => x.OrderNo == inboundOrder.InboundOrderNo).First();
+ var allocatefeedmodel = new AllocateDto
+ {
+ ReqCode = Guid.NewGuid().ToString(),
+ ReqTime = DateTime.Now.ToString(),
+ BusinessType = "2",
+ FactoryArea = inboundOrder.FactoryArea,
+ OperationType = 1,
+ Operator = inboundOrder.Operator,
+ OrderNo = inboundOrder.UpperOrderNo,
+ fromWarehouse = allocate?.FromWarehouse ?? "",
+ toWarehouse = allocate?.ToWarehouse ?? "",
+ Details = new List<AllocateDtoDetail>()
- };
+ };
- var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
- .Select(group => new AllocateDtoDetail
- {
- MaterialCode = group.Key.MaterielCode,
- LineNo = group.Key.InboundOrderRowNo,
- WarehouseCode = group.Key.WarehouseCode,
- Qty = group.Sum(x => x.BarcodeQty),
- Unit = group.Key.BarcodeUnit,
- Barcodes = group.Select(row => new BarcodeInfo
- {
- Barcode = row.Barcode,
- Qty = row.BarcodeQty,
- BatchNo = row.BatchNo,
- SupplyCode = row.SupplyCode,
- Unit = row.BarcodeUnit
- }).ToList()
- }).ToList();
- allocatefeedmodel.Details = groupedData;
+ var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
+ .Select(group => new AllocateDtoDetail
+ {
+ MaterialCode = group.Key.MaterielCode,
+ LineNo = group.Key.InboundOrderRowNo,
+ WarehouseCode = group.Key.WarehouseCode,
+ Qty = group.Sum(x => x.BarcodeQty),
+ Unit = group.Key.BarcodeUnit,
+ Barcodes = group.Select(row => new BarcodeInfo
+ {
+ Barcode = row.Barcode,
+ Qty = row.BarcodeQty,
+ BatchNo = row.BatchNo,
+ SupplyCode = row.SupplyCode,
+ Unit = row.BarcodeUnit
+ }).ToList()
+ }).ToList();
+ allocatefeedmodel.Details = groupedData;
- var result = await FeedbackAllocate(allocatefeedmodel);
- if (result != null && result.code == 200)
- {
- _feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
- }
- }
- else
- {
- var feedmodel = new FeedbackInboundRequestModel
- {
- reqCode = Guid.NewGuid().ToString(),
- reqTime = DateTime.Now.ToString(),
- business_type = inboundOrder.BusinessType,
- factoryArea = inboundOrder.FactoryArea,
- operationType = 1,
- Operator = inboundOrder.Operator,
- orderNo = inboundOrder.UpperOrderNo,
- status = inboundOrder.OrderStatus,
- details = new List<FeedbackInboundDetailsModel>()
+ var result = await FeedbackAllocate(allocatefeedmodel);
+ if (result != null && result.code == 200)
+ {
+ _feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
+ }
+ }
+ else
+ {
+ var feedmodel = new FeedbackInboundRequestModel
+ {
+ reqCode = Guid.NewGuid().ToString(),
+ reqTime = DateTime.Now.ToString(),
+ business_type = inboundOrder.BusinessType,
+ factoryArea = inboundOrder.FactoryArea,
+ operationType = 1,
+ Operator = inboundOrder.Operator,
+ orderNo = inboundOrder.UpperOrderNo,
+ status = inboundOrder.OrderStatus,
+ details = new List<FeedbackInboundDetailsModel>()
- };
+ };
- var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
- .Select(group => new FeedbackInboundDetailsModel
- {
- materialCode = group.Key.MaterielCode,
- supplyCode = group.Key.SupplyCode,
- batchNo = group.Key.BatchNo,
- lineNo = group.Key.InboundOrderRowNo,
- qty = group.Sum(x => x.BarcodeQty),
- // warehouseCode = group.Key.WarehouseCode=="0"?"1072": group.Key.WarehouseCode,
- warehouseCode = group.Key.WarehouseCode,
- unit = group.Key.BarcodeUnit,
- barcodes = group.Select(row => new FeedbackBarcodesModel
- {
- barcode = row.Barcode,
- qty = row.BarcodeQty
- }).ToList()
- }).ToList();
- feedmodel.details = groupedData;
- var result = await FeedbackInbound(feedmodel);
- if (result != null && result.code == 200)
- {
- _feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
+ var groupedData = lists.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.InboundOrderRowNo, item.BarcodeUnit, item.WarehouseCode })
+ .Select(group => new FeedbackInboundDetailsModel
+ {
+ materialCode = group.Key.MaterielCode,
+ supplyCode = group.Key.SupplyCode,
+ batchNo = group.Key.BatchNo,
+ lineNo = group.Key.InboundOrderRowNo,
+ qty = group.Sum(x => x.BarcodeQty),
+ // warehouseCode = group.Key.WarehouseCode=="0"?"1072": group.Key.WarehouseCode,
+ warehouseCode = group.Key.WarehouseCode,
+ unit = group.Key.BarcodeUnit,
+ barcodes = group.Select(row => new FeedbackBarcodesModel
+ {
+ barcode = row.Barcode,
+ qty = row.BarcodeQty
+ }).ToList()
+ }).ToList();
+ feedmodel.details = groupedData;
+ var result = await FeedbackInbound(feedmodel);
+ if (result != null && result.code == 200)
+ {
+ _feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
+ }
+ }
}
}
}
}
+ catch (Exception ex)
+ {
+ _logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes 鍥炲啓MES澶辫触: " + ex.Message);
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+
}
}
- catch (Exception ex)
+ else if (inout == 2)
{
- _logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes 鍥炲啓MES澶辫触: " + ex.Message);
- return WebResponseContent.Instance.Error(ex.Message);
- }
+ foreach (var orderNo in orderNos)
+ {
+ var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().FirstAsync(x => x.OrderNo == orderNo);
+ if (outboundOrder != null && outboundOrder.IsBatch == 0)
+ {
+ var result = await HandleOutboundOrderToMESCompletion(outboundOrder, orderNo);
+ return result;
+ }
+ else if (outboundOrder != null && outboundOrder.IsBatch == 1)
+ {
+ var result = await HandleOutboundOrderBatchToMESCompletion(outboundOrder, orderNo);
+ return result;
+ }
+ }
+ }
+ }
+ finally
+ {
+ // 2. 銆愰噴鏀惧唴瀛橀攣銆戞棤璁烘垚鍔熷け璐ワ紝蹇呴』閲婃斁
+ MemoryLockManager.ReleaseLock(orderNos[0]);
}
}
- else if (inout == 2)
+ else
{
- foreach (var orderNo in orderNos)
- {
- var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().FirstAsync(x => x.OrderNo == orderNo);
- if (outboundOrder != null && outboundOrder.IsBatch == 0)
- {
- var result = await HandleOutboundOrderToMESCompletion(outboundOrder, orderNo);
- return result;
- }
- else if (outboundOrder != null && outboundOrder.IsBatch == 1)
- {
- var result = await HandleOutboundOrderBatchToMESCompletion(outboundOrder, orderNo);
- return result;
- }
- }
+ // 鎶㈤攣澶辫触锛氳鏄庢湁鍙︿竴涓嚎绋嬶紙WCS鍥炶皟鎴栦汉宸ユ搷浣滐級姝ｅ湪澶勭悊
+ return WebResponseContent.Instance.OK("WMS姝ｅ湪澶勭悊姝ゅ洖浼犱换鍔★紝璇峰嬁閲嶅鎿嶄綔銆�");
}
return WebResponseContent.Instance.OK();
}
@@ -414,7 +440,7 @@
business_type = outboundOrder.BusinessType,
factoryArea = outboundOrder.FactoryArea,
operationType = 1,
- Operator = outboundOrder.Operator!=""? outboundOrder.Operator:App.User.UserName,
+ Operator = outboundOrder.Operator != "" ? outboundOrder.Operator : App.User.UserName,
orderNo = outboundOrder.UpperOrderNo,
documentsNO = documentNo,
status = outboundOrder.OrderStatus,
@@ -469,7 +495,7 @@
else
{
barModel.qty = item.PickQuantity;
- }
+ }
detailModel.currentDeliveryQty += barModel.qty;
detailModel.barcodes.Add(barModel);
}
@@ -477,7 +503,7 @@
feedModel.details.Add(detailModel);
}
- feedModel.details = feedModel.details.GroupBy(item => new { item.materialCode, item.lineNo, item.warehouseCode, item.unit,item.qty }).Select(group => new FeedbackOutboundDetailsModel
+ feedModel.details = feedModel.details.GroupBy(item => new { item.materialCode, item.lineNo, item.warehouseCode, item.unit, item.qty }).Select(group => new FeedbackOutboundDetailsModel
{
materialCode = group.Key.materialCode,
lineNo = group.Key.lineNo,
@@ -777,7 +803,7 @@
return WebResponseContent.Instance.Error("澶勭悊鍥炰紶MES鏃跺彂鐢熷紓甯革紝璇疯仈绯荤鐞嗗憳");
}
}
- }
+ }
public static class UniqueValueGenerator
{
@@ -796,10 +822,10 @@
// 鎷兼帴锛氳鏁板櫒琛�0涓�3浣嶏紙閬垮厤浣嶆暟涓嶄竴鑷达級
return $"{datePart}{ticksPart}";
}
-
+
public static string GenerateCount()
{
- var now = DateTime.Now;
+ var now = DateTime.Now;
string datePart = now.ToString("yyyyMMddHHmmss");
@@ -810,4 +836,59 @@
return $"{datePart}{counterPart:D3}";
}
}
+
+
+ public static class MemoryLockManager
+ {
+ // 瀛樺偍璧勬簮ID鍙婂叾瀵瑰簲鐨勯攣瀵硅薄銆備娇鐢� ConcurrentDictionary 纭繚瀵瑰瓧鍏告搷浣滄湰韬殑绾跨▼瀹夊叏銆�
+ private static readonly ConcurrentDictionary<string, object> _resourceLocks = new ConcurrentDictionary<string, object>();
+
+ // 鍏ㄥ眬闈欐�侀攣锛氱敤浜庝繚鎶� _resourceLocks 瀛楀吀涓� GetOrAdd 鎴� TryRemove 鏃剁殑绔炰簤
+ private static readonly object _globalLocker = new object();
+
+ /// <summary>
+ /// 灏濊瘯閿佸畾涓�涓祫婧怚D銆�
+ /// </summary>
+ /// <param name="resourceId">瑕侀攣瀹氱殑璧勬簮ID锛堜緥濡� InboundRecord ID锛�</param>
+ /// <returns>鏄惁鎴愬姛鑾峰彇閿�</returns>
+ public static bool TryAcquireLock(string resourceId)
+ {
+ object lockObject = null;
+
+ // 鏍稿績鎬濊矾锛氫负姣忎釜璧勬簮鍒涘缓涓�涓敮涓�鐨勯攣瀵硅薄
+ lock (_globalLocker)
+ {
+ // 濡傛灉璧勬簮ID涓嶅湪瀛楀吀涓紝鍒欐坊鍔犱竴涓柊鐨勯攣瀵硅薄
+ // 鍚﹀垯锛屼娇鐢ㄥ凡瀛樺湪鐨勯攣瀵硅薄
+ lockObject = _resourceLocks.GetOrAdd(resourceId, new object());
+ }
+
+ // 灏濊瘯鑾峰彇璧勬簮鐗瑰畾鐨勯攣
+ // 浣跨敤 Monitor.TryEnter 閬垮厤闃诲锛屽苟瀹炵幇闈為樆濉炵殑鎶㈤攣
+ return Monitor.TryEnter(lockObject);
+ }
+
+ /// <summary>
+ /// 閲婃斁璧勬簮ID鐨勯攣瀹氥��
+ /// </summary>
+ /// <param name="resourceId">瑕侀噴鏀剧殑璧勬簮ID</param>
+ public static void ReleaseLock(string resourceId)
+ {
+ if (_resourceLocks.TryGetValue(resourceId, out object lockObject))
+ {
+ // 纭繚閲婃斁鐨勬槸褰撳墠绾跨▼鎸佹湁鐨勯攣
+ if (Monitor.IsEntered(lockObject))
+ {
+ Monitor.Exit(lockObject);
+
+ // 閲婃斁閿佸悗锛屽皾璇曚粠瀛楀吀涓Щ闄よ繖涓攣瀵硅薄锛屾竻鐞嗗唴瀛樸��
+ // 蹇呴』鍦� Monitor.Exit 涔嬪悗鎵ц銆�
+ lock (_globalLocker)
+ {
+ _resourceLocks.TryRemove(resourceId, out _);
+ }
+ }
+ }
+ }
+ }
}
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/OutboundOrderDetailService.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/OutboundOrderDetailService.cs"
index f78db64..bf49e91 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/OutboundOrderDetailService.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/OutboundOrderDetailService.cs"
@@ -636,24 +636,25 @@
if (userSelection == null) continue;
// 璁＄畻璇ユ墭鐩樺疄闄呭彲鐢ㄦ暟閲�
- var availableQuantity = CalculateAvailableQuantity(stock, outboundOrderDetail.MaterielCode,
- outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode);
+ var availableQuantity = CalculateAvailableQuantityByBarcode(stock, outboundOrderDetail.MaterielCode,
+ outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode, userSelection.Barcode);
// 纭畾鍒嗛厤鏁伴噺锛氬彇鐢ㄦ埛閫夋嫨鏁伴噺銆佸彲鐢ㄦ暟閲忓拰鍓╀綑闇�姹傜殑鏈�灏忓��
- var assignQuantity = Math.Min(Math.Min(userSelection.UseableQuantity, availableQuantity),remainingNeedQuantity);
+ var assignQuantity = Math.Min(Math.Min(userSelection.UseableQuantity, availableQuantity), remainingNeedQuantity);
if (assignQuantity <= 0) continue;
- // 鎵ц鍒嗛厤
- var (actualAssigned, barcode) = AssignStockQuantity(stock, outboundOrderDetail, assignQuantity);
+ // 鎵ц鍒嗛厤锛屼娇鐢ㄧ敤鎴烽�夋嫨鐨勬潯鐮�
+ var actualAssigned = AssignStockQuantity(stock, outboundOrderDetail, assignQuantity, userSelection.Barcode);
+
if (actualAssigned > 0)
{
outStocks.Add(stock);
totalAssignedFromUserSelection += actualAssigned;
remainingNeedQuantity -= actualAssigned;
- // 鍒涘缓閿佸畾璁板綍
- var lockInfo = CreateOutStockLockInfo(outboundOrder, outboundOrderDetail, stock, actualAssigned, barcode);
+ // 鍒涘缓閿佸畾璁板綍锛屼娇鐢ㄧ敤鎴烽�夋嫨鐨勬潯鐮�
+ var lockInfo = CreateOutStockLockInfo(outboundOrder, outboundOrderDetail, stock, actualAssigned, userSelection.Barcode);
outStockLockInfos.Add(lockInfo);
}
}
@@ -721,7 +722,25 @@
return (outStocks, outboundOrderDetail, outStockLockInfos, locationInfos);
}
+ private decimal CalculateAvailableQuantityByBarcode(Dt_StockInfo stock, string materielCode, string batchNo, string supplyCode, string barcode)
+ {
+ var query = stock.Details.AsQueryable()
+ .Where(d => d.MaterielCode == materielCode &&
+ (d.StockQuantity - d.OutboundQuantity) > 0 &&
+ d.Barcode == barcode);
+ if (!string.IsNullOrEmpty(batchNo))
+ {
+ query = query.Where(x => x.BatchNo == batchNo);
+ }
+
+ if (!string.IsNullOrEmpty(supplyCode))
+ {
+ query = query.Where(d => d.SupplyCode == supplyCode);
+ }
+
+ return query.Sum(d => d.StockQuantity - d.OutboundQuantity);
+ }
// 杈呭姪鏂规硶
private decimal CalculateAvailableQuantity(Dt_StockInfo stock, string materielCode, string batchNo, string supplyCode)
{
@@ -732,6 +751,41 @@
.ToList();
return relevantDetails.Sum(d => d.StockQuantity - d.OutboundQuantity);
+ }
+
+ private decimal AssignStockQuantity(Dt_StockInfo stock, Dt_OutboundOrderDetail detail, decimal assignQuantity, string barcode)
+ {
+ decimal remainingAssign = assignQuantity;
+
+ // 鎸夊厛杩涘厛鍑哄垎閰嶆寚瀹氭潯鐮佺殑搴撳瓨鏄庣粏
+ var query = stock.Details.AsQueryable()
+ .Where(d => d.MaterielCode == detail.MaterielCode &&
+ (d.StockQuantity - d.OutboundQuantity) > 0 &&
+ d.Barcode == barcode); // 鍙垎閰嶆寚瀹氭潯鐮�
+
+ if (!string.IsNullOrEmpty(detail.BatchNo))
+ {
+ query = query.Where(x => x.BatchNo == detail.BatchNo);
+ }
+ // 濡傛灉鍑哄簱鍗曟湁渚涘簲鍟嗚姹傦紝鎸変緵搴斿晢杩囨护
+ if (!string.IsNullOrEmpty(detail.SupplyCode))
+ {
+ query = query.Where(d => d.SupplyCode == detail.SupplyCode);
+ }
+ var sortedDetails = query.ToList().OrderBy(d => d.CreateDate);
+
+ foreach (var stockDetail in sortedDetails)
+ {
+ if (remainingAssign <= 0) break;
+
+ var available = stockDetail.StockQuantity - stockDetail.OutboundQuantity;
+ var assign = Math.Min(available, remainingAssign);
+
+ stockDetail.OutboundQuantity += assign;
+ remainingAssign -= assign;
+ }
+
+ return assignQuantity - remainingAssign; // 杩斿洖瀹為檯鍒嗛厤鏁伴噺
}
private (decimal assignedQuantity, string barcode) AssignStockQuantity(Dt_StockInfo stock, Dt_OutboundOrderDetail detail, decimal assignQuantity)
@@ -843,8 +897,8 @@
return (false, $"鎵樼洏[{selection.PalletCode}]涓嶅瓨鍦�");
}
- var available = CalculateAvailableQuantity(stock, outboundOrderDetail.MaterielCode,
- outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode);
+ var available = CalculateAvailableQuantityByBarcode(stock, outboundOrderDetail.MaterielCode,
+ outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode,selection.Barcode);
if (available <= 0)
{
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_TaskInfoService/TaskService_Outbound.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_TaskInfoService/TaskService_Outbound.cs"
index db099ac..5cf304e 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_TaskInfoService/TaskService_Outbound.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_TaskInfoService/TaskService_Outbound.cs"
@@ -2,6 +2,7 @@
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using System;
+using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -148,42 +149,73 @@
List<Dt_LocationInfo>? locationInfos = null;
CleanupPreviousInvalidLocks(outboundOrderDetails);
-
- (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
- if (result.Item1 != null && result.Item1.Count > 0)
+ // 寮�鍚簨鍔★紝浣跨敤鏁版嵁搴撹绾ч攣
+ using (var transaction = _outboundOrderDetailService.Db.Ado.UseTran())
{
- Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
- TaskTypeEnum typeEnum = outboundOrder.OrderType switch
+ try
{
- (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
- (int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
- (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
- _ => TaskTypeEnum.Outbound
- };
- tasks = GetTasks(result.Item1, typeEnum, outStation);
- tasks.ForEach(x =>
- {
- x.OrderNo = outboundOrder.OrderNo;
- });
- result.Item2.ForEach(x =>
- {
- x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
- });
- result.Item3.ForEach(x =>
- {
- x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
- });
+ // 浣跨敤鎮茶閿侀攣瀹氳鍗曟槑缁�
+ var lockedOrderDetails = new List<Dt_OutboundOrderDetail>();
+ foreach (var key in keys)
+ {
+ var detail = _outboundOrderDetailService.Db.Ado.SqlQuerySingle<Dt_OutboundOrderDetail>(
+ "SELECT * FROM Dt_OutboundOrderDetail WITH (UPDLOCK, ROWLOCK) WHERE Id = @Id",
+ new { Id = key });
- stockInfos = result.Item1;
- orderDetails = result.Item2;
- outStockLockInfos = result.Item3;
- locationInfos = result.Item4;
+ if (detail != null)
+ {
+ lockedOrderDetails.Add(detail);
+ }
+ }
+
+ if (!lockedOrderDetails.Any())
+ {
+ throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
+ }
+ (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
+ if (result.Item1 != null && result.Item1.Count > 0)
+ {
+ Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
+ TaskTypeEnum typeEnum = outboundOrder.OrderType switch
+ {
+ (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
+ (int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
+ (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
+ _ => TaskTypeEnum.Outbound
+ };
+ tasks = GetTasks(result.Item1, typeEnum, outStation);
+ tasks.ForEach(x =>
+ {
+ x.OrderNo = outboundOrder.OrderNo;
+ });
+ result.Item2.ForEach(x =>
+ {
+ x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ });
+ result.Item3.ForEach(x =>
+ {
+ x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
+ });
+
+ stockInfos = result.Item1;
+ orderDetails = result.Item2;
+ outStockLockInfos = result.Item3;
+ locationInfos = result.Item4;
+ transaction.CommitTran();
+ }
+ else
+ {
+ transaction.RollbackTran();
+ throw new Exception("鏃犲簱瀛�");
+ }
+ }
+ catch (Exception)
+ {
+ transaction.RollbackTran();
+ throw;
+ }
+ return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
}
- else
- {
- throw new Exception("鏃犲簱瀛�");
- }
- return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
}
/// <summary>
/// 娓呯悊涔嬪墠鐨勬棤鏁堥攣瀹氳褰�
@@ -417,6 +449,65 @@
return tasks;
}
+ #region 鍐呭瓨閿佺鐞嗗櫒
+ private static readonly ConcurrentDictionary<string, SemaphoreSlim> _normalmaterialLocks =
+ new ConcurrentDictionary<string, SemaphoreSlim>();
+ private static readonly ConcurrentDictionary<string, DateTime> _normallockLastUsed =
+ new ConcurrentDictionary<string, DateTime>();
+ private static readonly object _normalcleanupLock = new object();
+ private static DateTime _normallastCleanupTime = DateTime.MinValue;
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡绾у唴瀛橀攣
+ /// </summary>
+ private SemaphoreSlim GetNormalMaterialSemaphore(string materialCode, string batchNo, string supplyCode)
+ {
+ // 鍒涘缓閿侀敭锛氱墿鏂�+鎵规+渚涘簲鍟�
+ string lockKey = $"MaterialLock_{materialCode}_{batchNo}_{supplyCode}";
+
+ // 娓呯悊闀挎椂闂翠笉鐢ㄧ殑閿侊紙姣忓皬鏃舵竻鐞嗕竴娆★級
+ var now = DateTime.Now;
+ if ((now - _normallastCleanupTime).TotalHours >= 1)
+ {
+ lock (_normalcleanupLock)
+ {
+ if ((now - _normallastCleanupTime).TotalHours >= 1)
+ {
+ var keysToRemove = _normallockLastUsed
+ .Where(kvp => (now - kvp.Value).TotalHours > 2)
+ .Select(kvp => kvp.Key)
+ .ToList();
+
+ foreach (var key in keysToRemove)
+ {
+ if (_normalmaterialLocks.TryRemove(key, out var _semaphore))
+ {
+ _semaphore.Dispose();
+ }
+ _normallockLastUsed.TryRemove(key, out _);
+ }
+
+ _normallastCleanupTime = now;
+ }
+ }
+ }
+
+ // 鑾峰彇鎴栧垱寤轰俊鍙烽噺
+ var semaphore = _normalmaterialLocks.GetOrAdd(lockKey, _ => new SemaphoreSlim(1, 1));
+ _normallockLastUsed[lockKey] = now;
+
+ return semaphore;
+ }
+
+ /// <summary>
+ /// 鏇存柊鍐呭瓨閿佹渶鍚庝娇鐢ㄦ椂闂�
+ /// </summary>
+ private void UpdateNormalMaterialLockUsedTime(string materialCode, string batchNo, string supplyCode)
+ {
+ string lockKey = $"MaterialLock_{materialCode}_{batchNo}_{supplyCode}";
+ _normallockLastUsed[lockKey] = DateTime.Now;
+ }
+ #endregion
/// <summary>
/// 鐢熸垚鍑哄簱浠诲姟
/// </summary>
@@ -432,31 +523,90 @@
List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
-
- (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys, outStation);
- if (result.Item2 != null && result.Item2.Count > 0)
+ // 鍏堣幏鍙栨墍鏈夎鍗曟槑缁嗭紝纭畾闇�瑕侀攣瀹氱殑鐗╂枡
+ var orderDetails = _outboundOrderDetailService.Repository.QueryData(x => keys.Contains(x.Id));
+ if (orderDetails == null || orderDetails.Count == 0)
{
- stockInfos.AddRange(result.Item2);
- }
- if (result.Item3 != null && result.Item3.Count > 0)
- {
- outboundOrderDetails.AddRange(result.Item3);
- }
- if (result.Item4 != null && result.Item4.Count > 0)
- {
- outStockLockInfos.AddRange(result.Item4);
- }
- if (result.Item5 != null && result.Item5.Count > 0)
- {
- locationInfos.AddRange(result.Item5);
- }
- if (result.Item1 != null && result.Item1.Count > 0)
- {
- tasks.AddRange(result.Item1);
+ return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
}
- WebResponseContent content = await GenerateOutboundTaskDataUpdateAsync(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
- return content;
+ // 鑾峰彇鎵�鏈夐渶瑕侀攣瀹氱殑鐗╂枡鍒嗙粍
+ var materialGroups = orderDetails
+ .GroupBy(x => new { x.MaterielCode, x.BatchNo, x.SupplyCode })
+ .Select(g => new
+ {
+ g.Key.MaterielCode,
+ g.Key.BatchNo,
+ g.Key.SupplyCode,
+ Count = g.Count()
+ })
+ .ToList();
+
+ // 鎸夐『搴忚幏鍙栨墍鏈夌墿鏂欑殑鍐呭瓨閿侊紙鎸夌墿鏂欎唬鐮佹帓搴忎互閬垮厤姝婚攣锛�
+ var semaphores = new List<SemaphoreSlim>();
+ var acquiredLocks = new List<(string MaterialCode, string BatchNo, string SupplyCode)>();
+
+ try
+ {
+ foreach (var group in materialGroups.OrderBy(g => g.MaterielCode).ThenBy(g => g.BatchNo))
+ {
+ var semaphore = GetMaterialSemaphore(group.MaterielCode, group.BatchNo, group.SupplyCode);
+
+ // 绛夊緟鑾峰彇閿侊紝鏈�澶氱瓑寰�30绉�
+ bool lockAcquired = await semaphore.WaitAsync(TimeSpan.FromSeconds(30));
+
+ if (!lockAcquired)
+ {
+ // 濡傛灉鑾峰彇閿佸け璐ワ紝閲婃斁宸茶幏鍙栫殑鎵�鏈夐攣
+ foreach (var acquiredSemaphore in semaphores)
+ {
+ acquiredSemaphore.Release();
+ }
+ return WebResponseContent.Instance.Error($"鐗╂枡[{group.MaterielCode}]鎵规[{group.BatchNo}]鍒嗛厤绻佸繖锛岃绋嶅悗閲嶈瘯");
+ }
+
+ semaphores.Add(semaphore);
+ acquiredLocks.Add((group.MaterielCode, group.BatchNo, group.SupplyCode));
+ }
+
+ (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys, outStation);
+ if (result.Item2 != null && result.Item2.Count > 0)
+ {
+ stockInfos.AddRange(result.Item2);
+ }
+ if (result.Item3 != null && result.Item3.Count > 0)
+ {
+ outboundOrderDetails.AddRange(result.Item3);
+ }
+ if (result.Item4 != null && result.Item4.Count > 0)
+ {
+ outStockLockInfos.AddRange(result.Item4);
+ }
+ if (result.Item5 != null && result.Item5.Count > 0)
+ {
+ locationInfos.AddRange(result.Item5);
+ }
+ if (result.Item1 != null && result.Item1.Count > 0)
+ {
+ tasks.AddRange(result.Item1);
+ }
+
+ WebResponseContent content = await GenerateOutboundTaskDataUpdateAsync(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
+ return content;
+ }
+ finally
+ {
+ // 閲婃斁鎵�鏈夊唴瀛橀攣骞舵洿鏂颁娇鐢ㄦ椂闂�
+ foreach (var semaphore in semaphores)
+ {
+ semaphore.Release();
+ }
+
+ foreach (var lockInfo in acquiredLocks)
+ {
+ UpdateMaterialLockUsedTime(lockInfo.MaterialCode, lockInfo.BatchNo, lockInfo.SupplyCode);
+ }
+ }
}
catch (Exception ex)
{
@@ -491,17 +641,17 @@
{
return WebResponseContent.Instance.Error("鎵句笉鍒板嚭搴撳崟鎹�");
}
-
- var orderdetail = outboundOrder.Details.Where(outItem => allocorder.Details .Any(allocItem => allocItem.MaterielCode == outItem.MaterielCode && allocItem.LineNo == outItem.lineNo
- && allocItem.BarcodeQty==outItem.BarcodeQty && allocItem.WarehouseCode==outItem.WarehouseCode && allocItem.BarcodeUnit==outItem.BarcodeUnit) ) .First();
+
+ var orderdetail = outboundOrder.Details.Where(outItem => allocorder.Details.Any(allocItem => allocItem.MaterielCode == outItem.MaterielCode && allocItem.LineNo == outItem.lineNo
+ && allocItem.BarcodeQty == outItem.BarcodeQty && allocItem.WarehouseCode == outItem.WarehouseCode && allocItem.BarcodeUnit == outItem.BarcodeUnit)).First();
if (orderdetail == null)
{
return WebResponseContent.Instance.Error("鎵句笉鍒板嚭搴撴槑缁嗗崟鎹�");
}
- (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(outboundOrder.Details.First().Id, stockSelectViews,station);
+ (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(outboundOrder.Details.First().Id, stockSelectViews, station);
- WebResponseContent content =await GenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);
+ WebResponseContent content = await GenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);
return content;
}
@@ -516,7 +666,7 @@
/// <param name="orderDetailId"></param>
/// <param name="stockSelectViews"></param>
/// <returns></returns>
- public async Task<WebResponseContent> GenerateOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews,string station=null)
+ public async Task<WebResponseContent> GenerateOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews, string station = null)
{
try
{
@@ -526,9 +676,9 @@
{
return WebResponseContent.Instance.Error("鎵句笉鍒板崟鎹�");
}
- (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(outboundOrder.Details.First().Id, stockSelectViews,station);
+ (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(outboundOrder.Details.First().Id, stockSelectViews, station);
- WebResponseContent content =await GenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);
+ WebResponseContent content = await GenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);
return content;
}
@@ -545,7 +695,7 @@
/// <param name="stockSelectViews"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
- public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) OutboundTaskDataHandle(int orderDetailId, List<StockSelectViewDTO> stockSelectViews,string station=null)
+ public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) OutboundTaskDataHandle(int orderDetailId, List<StockSelectViewDTO> stockSelectViews, string station = null)
{
List<Dt_Task> tasks = new List<Dt_Task>();
Dt_OutboundOrderDetail outboundOrderDetail = _outboundOrderDetailService.Repository.QueryFirst(x => x.Id == orderDetailId);
@@ -568,7 +718,7 @@
(List<Dt_StockInfo>, Dt_OutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundOrderDetailService.AssignStockOutbound(outboundOrderDetail, stockSelectViews);
if (result.Item1 != null && result.Item1.Count > 0)
{
- Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetail.OrderId);
+ Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetail.OrderId);
TaskTypeEnum typeEnum = outboundOrder.OrderType switch
{
(int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
@@ -576,7 +726,7 @@
(int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
_ => TaskTypeEnum.Outbound
};
- tasks = GetTasks(result.Item1, typeEnum,station);
+ tasks = GetTasks(result.Item1, typeEnum, station);
result.Item2.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
result.Item3.ForEach(x =>
{
@@ -615,7 +765,7 @@
/// <param name="outStockLockInfos"></param>
/// <param name="locationInfos"></param>
/// <returns></returns>
- public async Task< WebResponseContent> GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_OutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
+ public async Task<WebResponseContent> GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_OutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
{
try
{
@@ -699,7 +849,7 @@
{
return WebResponseContent.Instance.Error("涓嬪彂鏈哄櫒浜轰换鍔″け璐ワ紒");
}
-
+
}
catch (Exception ex)
{
@@ -711,7 +861,65 @@
#region 鍒嗘壒鍒嗛厤搴撳瓨
+ #region 鍐呭瓨閿佺鐞嗗櫒
+ private static readonly ConcurrentDictionary<string, SemaphoreSlim> _materialLocks =
+ new ConcurrentDictionary<string, SemaphoreSlim>();
+ private static readonly ConcurrentDictionary<string, DateTime> _lockLastUsed =
+ new ConcurrentDictionary<string, DateTime>();
+ private static readonly object _cleanupLock = new object();
+ private static DateTime _lastCleanupTime = DateTime.MinValue;
+ /// <summary>
+ /// 鑾峰彇鐗╂枡绾у唴瀛橀攣
+ /// </summary>
+ private SemaphoreSlim GetMaterialSemaphore(string materialCode, string batchNo, string supplyCode)
+ {
+ // 鍒涘缓閿侀敭锛氱墿鏂�+鎵规+渚涘簲鍟�
+ string lockKey = $"MaterialLock_{materialCode}_{batchNo}_{supplyCode}";
+
+ // 娓呯悊闀挎椂闂翠笉鐢ㄧ殑閿侊紙姣忓皬鏃舵竻鐞嗕竴娆★級
+ var now = DateTime.Now;
+ if ((now - _lastCleanupTime).TotalHours >= 1)
+ {
+ lock (_cleanupLock)
+ {
+ if ((now - _lastCleanupTime).TotalHours >= 1)
+ {
+ var keysToRemove = _lockLastUsed
+ .Where(kvp => (now - kvp.Value).TotalHours > 2)
+ .Select(kvp => kvp.Key)
+ .ToList();
+
+ foreach (var key in keysToRemove)
+ {
+ if (_materialLocks.TryRemove(key, out var _semaphore))
+ {
+ _semaphore.Dispose();
+ }
+ _lockLastUsed.TryRemove(key, out _);
+ }
+
+ _lastCleanupTime = now;
+ }
+ }
+ }
+
+ // 鑾峰彇鎴栧垱寤轰俊鍙烽噺
+ var semaphore = _materialLocks.GetOrAdd(lockKey, _ => new SemaphoreSlim(1, 1));
+ _lockLastUsed[lockKey] = now;
+
+ return semaphore;
+ }
+
+ /// <summary>
+ /// 閲婃斁鍐呭瓨閿佸苟鏇存柊鏈�鍚庝娇鐢ㄦ椂闂�
+ /// </summary>
+ private void UpdateMaterialLockUsedTime(string materialCode, string batchNo, string supplyCode)
+ {
+ string lockKey = $"MaterialLock_{materialCode}_{batchNo}_{supplyCode}";
+ _lockLastUsed[lockKey] = DateTime.Now;
+ }
+ #endregion
/// <summary>
/// 鍒嗘壒鍒嗛厤搴撳瓨
/// </summary>
@@ -719,37 +927,62 @@
{
try
{
- List<Dt_Task> tasks = new List<Dt_Task>();
- List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
- List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
- List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
- List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
+ // 鍏堣幏鍙栬鍗曟槑缁嗕俊鎭紝纭畾鐗╂枡
+ var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .FirstAsync(x => x.Id == orderDetailId);
- (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = await BatchAllocateStockDataHandle(orderDetailId, batchQuantity, outStation);
+ if (orderDetail == null)
+ return WebResponseContent.Instance.Error("鏈壘鍒拌鍗曟槑缁嗕俊鎭�");
- if (result.Item2 != null && result.Item2.Count > 0)
- {
- stockInfos.AddRange(result.Item2);
- }
- if (result.Item3 != null && result.Item3.Count > 0)
- {
- outboundOrderDetails.AddRange(result.Item3);
- }
- if (result.Item4 != null && result.Item4.Count > 0)
- {
- outStockLockInfos.AddRange(result.Item4);
- }
- if (result.Item5 != null && result.Item5.Count > 0)
- {
- locationInfos.AddRange(result.Item5);
- }
- if (result.Item1 != null && result.Item1.Count > 0)
- {
- tasks.AddRange(result.Item1);
- }
+ // 鑾峰彇鐗╂枡绾у唴瀛橀攣
+ var semaphore = GetMaterialSemaphore(orderDetailId + orderDetail.MaterielCode, orderDetail.BatchNo, orderDetail.SupplyCode);
- WebResponseContent content = await GenerateOutboundTaskDataUpdateAsync(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
- return content;
+ // 绛夊緟鑾峰彇鍐呭瓨閿侊紝鏈�澶氱瓑寰�30绉�
+ bool memoryLockAcquired = await semaphore.WaitAsync(TimeSpan.FromSeconds(30));
+
+ if (!memoryLockAcquired)
+ return WebResponseContent.Instance.Error("绯荤粺绻佸繖锛岃绋嶅悗閲嶈瘯");
+
+ try
+ {
+ List<Dt_Task> tasks = new List<Dt_Task>();
+ List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
+ List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
+ List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
+ List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
+
+ (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = await BatchAllocateStockDataHandle(orderDetailId, batchQuantity, outStation);
+
+ if (result.Item2 != null && result.Item2.Count > 0)
+ {
+ stockInfos.AddRange(result.Item2);
+ }
+ if (result.Item3 != null && result.Item3.Count > 0)
+ {
+ outboundOrderDetails.AddRange(result.Item3);
+ }
+ if (result.Item4 != null && result.Item4.Count > 0)
+ {
+ outStockLockInfos.AddRange(result.Item4);
+ }
+ if (result.Item5 != null && result.Item5.Count > 0)
+ {
+ locationInfos.AddRange(result.Item5);
+ }
+ if (result.Item1 != null && result.Item1.Count > 0)
+ {
+ tasks.AddRange(result.Item1);
+ }
+
+ WebResponseContent content = await GenerateOutboundTaskDataUpdateAsync(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
+ return content;
+ }
+ finally
+ {
+ // 閲婃斁鍐呭瓨閿�
+ semaphore.Release();
+ UpdateMaterialLockUsedTime(orderDetail.MaterielCode, orderDetail.BatchNo, orderDetail.SupplyCode);
+ }
}
catch (Exception ex)
{
@@ -768,7 +1001,7 @@
List<Dt_Task> tasks = new List<Dt_Task>();
// 鑾峰彇璁㈠崟鏄庣粏
- var outboundOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+ var outboundOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().With("UPDLOCK, ROWLOCK")
.FirstAsync(x => x.Id == orderDetailId);
if (outboundOrderDetail == null)
--
Gitblit v1.9.3