From a2f948006c6c7e918ba4f2e66d477cc2d5017a75 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 10 十二月 2025 21:49:58 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs | 559 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 391 insertions(+), 168 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 7d8276f..f4a1118 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"
@@ -26,6 +26,7 @@
using WIDESEA_IBasicService;
using WIDESEA_IOutboundService;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Outbound;
namespace WIDESEA_BasicService
{
@@ -40,18 +41,20 @@
private readonly IRepository<Dt_StockInfoDetail> _stockInfoDetailRepository;
private readonly IRepository<Dt_StockInfo> _stockInfoRepository;
private readonly IRepository<Dt_InboundOrder> _inboundOrderRepository;
+ private readonly IRepository<Dt_InboundOrderDetail> _inboundOrderDetailRepository;
private readonly IRepository<Dt_PickingRecord> _pickingRecoreRepository;
private readonly IMaterialUnitService _materialUnitService;
private readonly IOutboundOrderService _outboundOrderService;
private readonly IOutboundOrderDetailService _outboundOrderDetailService;
private readonly IOutStockLockInfoService _outStockLockInfoService;
+ private readonly IRepository<Dt_InterfaceLog> _interfacelogRepository;
// 瀛樺偍璧勬簮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)
+ 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, IRepository<Dt_InterfaceLog> interfacelogRepository, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository)
{
_httpClientFactory = httpClientFactory;
_logger = logger;
@@ -64,6 +67,8 @@
_outStockLockInfoService = outStockLockInfoService;
_materialUnitService = materialUnitService;
_pickingRecoreRepository = pickingRecoreRepository;
+ _interfacelogRepository = interfacelogRepository;
+ _inboundOrderDetailRepository = inboundOrderDetailRepository;
}
/// <summary>
@@ -241,159 +246,197 @@
/// <returns></returns>
public async Task<WebResponseContent> BatchOrderFeedbackToMes(List<string> orderNos, int inout)
{
- // 1. 銆愬唴瀛橀攣鎶㈠崰銆�
- if (MemoryLockManager.TryAcquireLock(orderNos[0]))
+ try
{
- try
+
+ if (inout == 1)
{
- if (inout == 1)
+ foreach (var orderNo in orderNos)
{
- foreach (var orderNo in orderNos)
+ try
{
- try
+ 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())
{
- 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())
+ _inboundOrderRepository.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1, Remark = "" })
+ .Where(it => it.InboundOrderNo == orderNo).ExecuteCommand();
+ var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == orderNo);
+ if (inboundOrder != null)
{
- return WebResponseContent.Instance.Error("娌℃湁闇�瑕佸洖浼犵殑鏁版嵁");
+ _inboundOrderDetailRepository.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
+ .Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
}
- foreach (var item in unreports)
+
+ 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 lists = _stockInfoDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.StockId == item.Id).ToList();
- if (lists.Any())
+ var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == lists.FirstOrDefault().OrderNo);
+ if (inboundOrder != null)
{
- var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == lists.FirstOrDefault().OrderNo);
- if (inboundOrder != null)
+ if (inboundOrder.OrderType == (int)InOrderTypeEnum.AllocatInbound)//璋冩嫧鍏ュ簱
{
- if (inboundOrder.OrderType == (int)InOrderTypeEnum.AllocatInbound)//璋冩嫧鍏ュ簱
+ var allocate = SqlSugarHelper.DbWMS.Queryable<Dt_AllocateOrder>().Where(x => x.OrderNo == inboundOrder.InboundOrderNo).First();
+ var allocatefeedmodel = new AllocateDto
{
- 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>()
+ ReqCode = Guid.NewGuid().ToString(),
+ ReqTime = DateTime.Now.ToString(),
+ BusinessType = "3",
+ 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
+ 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
{
- 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;
+ 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)
+ 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 feedstockinfos = _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 feedstomes = _feedbacktomesRepository.Db.Queryable<Dt_FeedbackToMes>().Where(x => x.OrderNo == orderNo && x.ReportStatus == 1).Select(o => o.PalletCode).ToList();
+ var feedunreports = feedstockinfos.Where(x => !feedstomes.Contains(x.PalletCode)).ToList();
+ if (feedunreports != null && !feedunreports.Any())
{
- _feedbacktomesRepository.Db.Insertable(new Dt_FeedbackToMes { OrderNo = orderNo, PalletCode = item.PalletCode, ReportStatus = 1 }).ExecuteCommand();
+ _inboundOrderRepository.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1, Remark = "" })
+ .Where(it => it.InboundOrderNo == orderNo).ExecuteCommand();
+ var feedinboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == orderNo);
+ if (feedinboundOrder != null)
+ {
+ _inboundOrderDetailRepository.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
+ .Where(it => it.OrderId == feedinboundOrder.Id).ExecuteCommand();
+ }
}
+ return WebResponseContent.Instance.Error("鍥炰紶鎴愬姛锛�");
}
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();
- }
+ _inboundOrderRepository.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 2, Remark = result.message })
+ .Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
+ _inboundOrderDetailRepository.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 2 })
+ .Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
+ return WebResponseContent.Instance.Error("鍥炰紶寮傚父锛�");
}
}
}
}
}
- catch (Exception ex)
- {
- _logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes 鍥炲啓MES澶辫触: " + ex.Message);
- return WebResponseContent.Instance.Error(ex.Message);
- }
-
}
- }
- else if (inout == 2)
- {
- foreach (var orderNo in orderNos)
+ catch (Exception ex)
{
- 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;
- }
+ _logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes 鍥炲啓MES澶辫触: " + ex.Message);
+ return WebResponseContent.Instance.Error(ex.Message);
}
}
}
- finally
+ else if (inout == 2)
{
- // 2. 銆愰噴鏀惧唴瀛橀攣銆戞棤璁烘垚鍔熷け璐ワ紝蹇呴』閲婃斁
- MemoryLockManager.ReleaseLock(orderNos[0]);
- }
- }
- else
- {
- // 鎶㈤攣澶辫触锛氳鏄庢湁鍙︿竴涓嚎绋嬶紙WCS鍥炶皟鎴栦汉宸ユ搷浣滐級姝ｅ湪澶勭悊
+ 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;
+ }
+ }
- return WebResponseContent.Instance.OK("WMS姝ｅ湪澶勭悊姝ゅ洖浼犱换鍔★紝璇峰嬁閲嶅鎿嶄綔銆�");
+ }
+
+ //}
+ //else
+ //{
+ // // 鎶㈤攣澶辫触锛氳鏄庢湁鍙︿竴涓嚎绋嬶紙WCS鍥炶皟鎴栦汉宸ユ搷浣滐級姝ｅ湪澶勭悊
+
+ // return WebResponseContent.Instance.Error("WMS姝ｅ湪澶勭悊姝ゅ洖浼犱换鍔★紝璇峰嬁閲嶅鎿嶄綔銆�");
+ //}
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes : " + ex.Message);
+ }
+ finally
+ {
+ // 2. 銆愰噴鏀惧唴瀛橀攣銆戞棤璁烘垚鍔熷け璐ワ紝蹇呴』閲婃斁
+ // MemoryLockManager.ReleaseLock(orderNos[0]);
}
return WebResponseContent.Instance.OK();
}
@@ -406,10 +449,10 @@
try
{
// 鏍￠獙锛氬凡鍥炰紶鐩存帴杩斿洖閿欒
- if (outboundOrder.ReturnToMESStatus == 1)
- {
- return WebResponseContent.Instance.Error("璇ュ崟宸茬粡鍥炰紶锛�");
- }
+ //if (outboundOrder.ReturnToMESStatus == 1)
+ //{
+ // return WebResponseContent.Instance.Error("璇ュ崟宸茬粡鍥炰紶锛�");
+ //}
// 鏌ヨ璁㈠崟鏄庣粏锛堜粎鏌ヨ鏈洖浼犳垚鍔熺殑锛�
var orderDetails = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
@@ -433,29 +476,49 @@
var groups = pickingRecords.GroupBy(x => x.FeedBackMesDocumentNo).ToList();
foreach (var group in groups)
{
-
+
List<Dt_PickingRecord> records = group.ToList(); // 璇ュ垎缁勪笅鐨勬墍鏈夎褰�
if (string.IsNullOrEmpty(group.Key))
{
var emptydocumentNo = UniqueValueGenerator.Generate();
records.ForEach(x => { x.FeedBackMesDocumentNo = emptydocumentNo; });
- var result= await _pickingRecoreRepository.Db.Insertable(records).ExecuteCommandAsync();
+ var result = await _pickingRecoreRepository.Db.Updateable(records).ExecuteCommandAsync();
+
+ var interfacelog = new Dt_InterfaceLog
+ {
+ Content = JsonConvert.SerializeObject(records),
+ DocumentNo = emptydocumentNo,
+ OrderNo = orderNo,
+ OrderType = "2",
+ };
+ _interfacelogRepository.AddData(interfacelog);
+
if (result > 0)
{
(bool _flowControl, WebResponseContent _value) = await FeedBackBatchToMes(outboundOrder, orderNo, orderDetails, pickingRecords, emptydocumentNo);
- if (!_flowControl)
- {
- return _value;
- }
+
+ return _value;
+
}
}
else
{
- (bool _flowControl, WebResponseContent _value) = await FeedBackBatchToMes(outboundOrder, orderNo, orderDetails, pickingRecords, group.Key);
- if (!_flowControl)
+ var ilog = _interfacelogRepository.QueryFirst(x => x.DocumentNo == group.Key);
+ if (ilog == null)
{
- return _value;
+ var interfacelog = new Dt_InterfaceLog
+ {
+ Content = JsonConvert.SerializeObject(records),
+ DocumentNo = group.Key,
+ OrderNo = orderNo,
+ OrderType = "2",
+ };
+ _interfacelogRepository.AddData(interfacelog);
}
+ (bool _flowControl, WebResponseContent _value) = await FeedBackBatchToMes(outboundOrder, orderNo, orderDetails, pickingRecords, group.Key);
+
+ return _value;
+
}
}
@@ -594,7 +657,7 @@
// 鏇存柊璁㈠崟鐘舵��
int newStatus = allCompleted ? (int)OutOrderStatusEnum.鍑哄簱瀹屾垚 : (int)OutOrderStatusEnum.鍑哄簱涓�;
- if (outboundOrder.OrderStatus != newStatus)
+ if (allCompleted && outboundOrder.OrderStatus != newStatus)
{
int updateCount = await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
@@ -614,7 +677,16 @@
var mesResult = await FeedbackOutbound(feedModel);
if (mesResult == null || mesResult.code != 200)
{
+ var messages = mesResult?.message ?? "";
+ await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
+ .SetColumns(x => new Dt_OutboundOrder
+ {
+ ReturnToMESStatus = 2,
+ Remark = messages,
+ })
+ .Where(x => x.OrderNo == orderNo)
+ .ExecuteCommandAsync();
// 鏇存柊鏄庣粏涓哄洖浼犲け璐ワ紙ReturnToMESStatus=2锛�
await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
.SetColumns(it => new Dt_OutboundOrderDetail
@@ -627,16 +699,18 @@
return (flowControl: false, value: WebResponseContent.Instance.Error($"鍥炰紶MES澶辫触"));
}
- foreach (var record in pickingRecords.Where(x => detailIds.Contains(x.OrderDetailId)).ToList())
- {
- record.ReturnToMESStatus = 1;
- }
+
var updates = pickingRecords.Where(x => detailIds.Contains(x.OrderDetailId)).ToList();
updates.ForEach(x =>
{
x.ReturnToMESStatus = 1;
});
await _pickingRecoreRepository.Db.Updateable(updates).ExecuteCommandAsync();
+ await _interfacelogRepository.Db.Updateable<Dt_InterfaceLog>()
+ .SetColumns(x => x.ReturnToMESStatus == 1)
+ .Where(x => x.OrderNo == orderNo)
+ .ExecuteCommandAsync();
+
if (allCompleted)
{
//MES鍥炰紶鎴愬姛锛氭洿鏂版槑缁嗕负鍥炰紶鎴愬姛鐘舵��
@@ -656,6 +730,7 @@
.SetColumns(x => new Dt_OutboundOrder
{
ReturnToMESStatus = 1,
+ Remark = "",
OrderStatus = newStatus
})
.Where(x => x.OrderNo == orderNo)
@@ -686,6 +761,7 @@
.SetColumns(it => new Dt_OutboundOrder
{
ReturnToMESStatus = 1,
+ Remark = "",
OrderStatus = OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt(),
})
.Where(x => x.OrderNo == orderNo)
@@ -693,7 +769,7 @@
}
}
- return (flowControl: true, value: null);
+ return (flowControl: true, value: WebResponseContent.Instance.OK($"鍥炰紶MES鎴愬姛锛屽崟鎹彿锛歿orderNo}"));
}
private async Task<WebResponseContent> HandleOutboundOrderToMESCompletion(Dt_OutboundOrder outboundOrder, string orderNo)
@@ -815,7 +891,7 @@
.ExecuteCommandAsync();
await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
- .SetColumns(x => x.ReturnToMESStatus == 1)
+ .SetColumns(it => new Dt_OutboundOrder { ReturnToMESStatus = 1, Remark = "" })
.Where(x => x.OrderNo == orderNo)
.ExecuteCommandAsync();
@@ -830,6 +906,17 @@
{
var errorMsg = $"OrderNo: {orderNo} 鍥炰紶MES澶辫触锛岄敊璇爜锛歿result.code}锛岄敊璇俊鎭細{result.message ?? "鏃�"}";
_logger.LogError(errorMsg);
+
+ await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
+ .SetColumns(x => x.ReturnToMESStatus == 2)
+ .Where(x => x.OrderId == outboundOrder.Id)
+ .ExecuteCommandAsync();
+
+ await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
+ .SetColumns(it => new Dt_OutboundOrder { ReturnToMESStatus = 2, Remark = result.message })
+ .Where(x => x.OrderNo == orderNo)
+ .ExecuteCommandAsync();
+
return WebResponseContent.Instance.Error(errorMsg);
}
}
@@ -880,52 +967,188 @@
public static class MemoryLockManager
{
- // 瀛樺偍璧勬簮ID鍙婂叾瀵瑰簲鐨勯攣瀵硅薄銆備娇鐢� ConcurrentDictionary 纭繚瀵瑰瓧鍏告搷浣滄湰韬殑绾跨▼瀹夊叏銆�
- private static readonly ConcurrentDictionary<string, object> _resourceLocks = new ConcurrentDictionary<string, object>();
+ // 瀛樺偍璧勬簮閿佺殑鍏冩暟鎹紙閿佸璞°�佹寔鏈夌嚎绋嬨�佸崰鐢ㄦ椂闂淬�佽秴鏃舵椂闂达級
+ private class LockMetadata
+ {
+ public object LockObject { get; } = new object();
+ public int HoldingThreadId { get; set; } = -1; // 鎸佹湁閿佺殑绾跨▼ID
+ public DateTime AcquireTime { get; set; } // 鑾峰彇閿佺殑鏃堕棿
+ public TimeSpan Timeout { get; set; } // 閿佽秴鏃舵椂闂�
+ public bool IsReleased { get; set; } // 鏄惁宸查噴鏀�
+ }
- // 鍏ㄥ眬闈欐�侀攣锛氱敤浜庝繚鎶� _resourceLocks 瀛楀吀涓� GetOrAdd 鎴� TryRemove 鏃剁殑绔炰簤
- private static readonly object _globalLocker = new object();
+ // 璧勬簮ID -> 閿佸厓鏁版嵁
+ private static readonly ConcurrentDictionary<string, LockMetadata> _resourceLocks = new();
+ // 鍏ㄥ眬閿侊紙淇濇姢閿佸厓鏁版嵁鐨勫垱寤�/鍒犻櫎锛�
+ private static readonly object _globalLocker = new();
+ // 闅忔満鏁扮敓鎴愬櫒锛堢敤浜庣敓鎴�3-5绉掗殢鏈鸿秴鏃讹級
+ private static readonly Random _random = new Random();
/// <summary>
- /// 灏濊瘯閿佸畾涓�涓祫婧怚D銆�
+ /// 灏濊瘯閿佸畾璧勬簮锛堝甫瓒呮椂鑷姩閲婃斁锛�
/// </summary>
- /// <param name="resourceId">瑕侀攣瀹氱殑璧勬簮ID锛堜緥濡� InboundRecord ID锛�</param>
+ /// <param name="resourceId">璧勬簮ID</param>
+ /// <param name="timeoutSeconds">瓒呮椂鏃堕棿锛堥粯璁�3-5绉掗殢鏈猴級</param>
/// <returns>鏄惁鎴愬姛鑾峰彇閿�</returns>
- public static bool TryAcquireLock(string resourceId)
+ public static bool TryAcquireLock(string resourceId, int? timeoutSeconds = null)
{
- object lockObject = null;
+ if (string.IsNullOrEmpty(resourceId))
+ throw new ArgumentNullException(nameof(resourceId));
- // 鏍稿績鎬濊矾锛氫负姣忎釜璧勬簮鍒涘缓涓�涓敮涓�鐨勯攣瀵硅薄
+ // 纭畾瓒呮椂鏃堕棿锛�3-5绉掗殢鏈猴級
+ var timeout = TimeSpan.FromSeconds(timeoutSeconds ?? _random.Next(3, 6));
+ var currentThreadId = Thread.CurrentThread.ManagedThreadId;
+
+ LockMetadata lockMeta = null;
lock (_globalLocker)
{
- // 濡傛灉璧勬簮ID涓嶅湪瀛楀吀涓紝鍒欐坊鍔犱竴涓柊鐨勯攣瀵硅薄
- // 鍚﹀垯锛屼娇鐢ㄥ凡瀛樺湪鐨勯攣瀵硅薄
- lockObject = _resourceLocks.GetOrAdd(resourceId, new object());
+ // 鑾峰彇鎴栧垱寤洪攣鍏冩暟鎹�
+ lockMeta = _resourceLocks.GetOrAdd(resourceId, key => new LockMetadata());
+
+ // 闃叉閲嶅鑾峰彇锛堝綋鍓嶇嚎绋嬪凡鎸佹湁閿侊級
+ if (lockMeta.HoldingThreadId == currentThreadId && !lockMeta.IsReleased)
+ return true; // 绾跨▼鍙噸鍏�
}
- // 灏濊瘯鑾峰彇璧勬簮鐗瑰畾鐨勯攣
- // 浣跨敤 Monitor.TryEnter 閬垮厤闃诲锛屽苟瀹炵幇闈為樆濉炵殑鎶㈤攣
- return Monitor.TryEnter(lockObject);
+ // 灏濊瘯鑾峰彇閿侊紙闈為樆濉烇級
+ if (!Monitor.TryEnter(lockMeta.LockObject))
+ return false;
+
+ // 鏍囪閿佹寔鏈夌姸鎬�
+ lockMeta.HoldingThreadId = currentThreadId;
+ lockMeta.AcquireTime = DateTime.Now;
+ lockMeta.Timeout = timeout;
+ lockMeta.IsReleased = false;
+
+ // 鍚姩瓒呮椂鑷姩閲婃斁浠诲姟
+ _ = Task.Delay(timeout).ContinueWith(_ =>
+ {
+ try
+ {
+ ReleaseLock(resourceId, force: true);
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍瓒呮椂閲婃斁寮傚父
+ Console.WriteLine($"璧勬簮[{resourceId}]瓒呮椂鑷姩閲婃斁澶辫触锛歿ex.Message}");
+ }
+ });
+
+ return true;
}
/// <summary>
- /// 閲婃斁璧勬簮ID鐨勯攣瀹氥��
+ /// 閲婃斁璧勬簮閿�
/// </summary>
- /// <param name="resourceId">瑕侀噴鏀剧殑璧勬簮ID</param>
- public static void ReleaseLock(string resourceId)
+ /// <param name="resourceId">璧勬簮ID</param>
+ /// <param name="force">鏄惁寮哄埗閲婃斁锛堣秴鏃惰嚜鍔ㄩ噴鏀炬椂浣跨敤锛�</param>
+ public static void ReleaseLock(string resourceId, bool force = false)
{
- if (_resourceLocks.TryGetValue(resourceId, out object lockObject))
- {
- // 纭繚閲婃斁鐨勬槸褰撳墠绾跨▼鎸佹湁鐨勯攣
- if (Monitor.IsEntered(lockObject))
- {
- Monitor.Exit(lockObject);
+ if (string.IsNullOrEmpty(resourceId))
+ throw new ArgumentNullException(nameof(resourceId));
- // 閲婃斁閿佸悗锛屽皾璇曚粠瀛楀吀涓Щ闄よ繖涓攣瀵硅薄锛屾竻鐞嗗唴瀛樸��
- // 蹇呴』鍦� Monitor.Exit 涔嬪悗鎵ц銆�
+ if (!_resourceLocks.TryGetValue(resourceId, out var lockMeta))
+ return;
+
+ var currentThreadId = Thread.CurrentThread.ManagedThreadId;
+
+ // 鏍￠獙閲婃斁鍚堟硶鎬э細浠呮寔鏈夐攣鐨勭嚎绋嬫垨寮哄埗閲婃斁鍙墽琛�
+ if (!force && lockMeta.HoldingThreadId != currentThreadId)
+ {
+ // 闈炴寔鏈夌嚎绋嬪皾璇曢噴鏀撅紝鎶涘嚭寮傚父鎴栬繑鍥烇紙鏍规嵁涓氬姟閫夋嫨锛�
+ throw new InvalidOperationException($"绾跨▼[{currentThreadId}]鏃犳潈閲婃斁璧勬簮[{resourceId}]鐨勯攣锛堝綋鍓嶆寔鏈夌嚎绋嬶細{lockMeta.HoldingThreadId}锛�");
+ }
+
+ // 鍙岄噸鏍￠獙閿佺姸鎬�
+ lock (_globalLocker)
+ {
+ if (lockMeta.IsReleased)
+ return;
+
+ // 纭繚閿佽褰撳墠绾跨▼鎸佹湁锛堝己鍒堕噴鏀鹃櫎澶栵級
+ if (Monitor.IsEntered(lockMeta.LockObject))
+ {
+ try
+ {
+ Monitor.Exit(lockMeta.LockObject);
+ }
+ catch (SynchronizationLockException)
+ {
+ // 宸茶閲婃斁锛屽拷鐣�
+ return;
+ }
+ }
+
+ // 鏍囪閿佸凡閲婃斁
+ lockMeta.IsReleased = true;
+ lockMeta.HoldingThreadId = -1;
+
+ // 寤惰繜娓呯悊閿佸厓鏁版嵁锛堥伩鍏嶅苟鍙戝垱寤猴級
+ // 绛夊緟1绉掑悗娓呯悊锛岄槻姝㈠垰閲婃斁灏辨湁鏂扮嚎绋嬫姠閿佸鑷撮噸澶嶅垱寤�
+ _ = Task.Delay(1000).ContinueWith(_ =>
+ {
lock (_globalLocker)
{
- _resourceLocks.TryRemove(resourceId, out _);
+ // 浠呭綋閿佹湭琚噸鏂版寔鏈変笖宸查噴鏀炬椂娓呯悊
+ if (_resourceLocks.TryGetValue(resourceId, out var meta)
+ && meta.IsReleased
+ && meta.HoldingThreadId == -1)
+ {
+ _resourceLocks.TryRemove(resourceId, out var _resid);
+ }
+ }
+ });
+ }
+ }
+
+ /// <summary>
+ /// 妫�鏌ヨ祫婧愭槸鍚﹁閿佸畾
+ /// </summary>
+ public static bool IsLocked(string resourceId)
+ {
+ if (!_resourceLocks.TryGetValue(resourceId, out var meta))
+ return false;
+
+ return !meta.IsReleased && meta.HoldingThreadId != -1;
+ }
+
+ public static void TestUsed()
+ {
+ string orderNo = "testt";
+ bool lockAcquired = false;
+ try
+ {
+ // 灏濊瘯鑾峰彇閿侊紙鑷姩3-5绉掕秴鏃讹級
+ lockAcquired = MemoryLockManager.TryAcquireLock(orderNo);
+ if (lockAcquired)
+ {
+ // 鎵ц涓氬姟閫昏緫锛堝澶勭悊璁㈠崟锛�
+ Console.WriteLine($"绾跨▼[{Thread.CurrentThread.ManagedThreadId}]鑾峰彇閿侊細{orderNo}");
+ // 妯℃嫙涓氬姟鑰楁椂锛堟祴璇曡秴鏃堕噴鏀撅級
+ // Thread.Sleep(6000);
+ }
+ else
+ {
+ Console.WriteLine($"璧勬簮[{orderNo}]琚崰鐢紝鑾峰彇閿佸け璐�");
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"涓氬姟澶勭悊寮傚父锛歿ex.Message}");
+ }
+ finally
+ {
+ // 閲婃斁閿侊紙浠呭綋鎴愬姛鑾峰彇鏃讹級
+ if (lockAcquired)
+ {
+ try
+ {
+ MemoryLockManager.ReleaseLock(orderNo);
+ Console.WriteLine($"绾跨▼[{Thread.CurrentThread.ManagedThreadId}]閲婃斁閿侊細{orderNo}");
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"閲婃斁閿佸け璐ワ細{ex.Message}");
}
}
}
--
Gitblit v1.9.3