From 42cb7e13165395327f2f9de6c1def858a18424b2 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期一, 08 十二月 2025 14:57:51 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundBatchPickingService.cs | 2177 +++++++++++++++++++++++++++++++++++++++++-------
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs | 24
项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm | 0
项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm | 0
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs | 438 ++++++---
5 files changed, 2,139 insertions(+), 500 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/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm" "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/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm"
new file mode 100644
index 0000000..90089a4
--- /dev/null
+++ "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/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm"
Binary files differ
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/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm" "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/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm"
new file mode 100644
index 0000000..05d54c7
--- /dev/null
+++ "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/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm"
Binary files differ
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 81b25b0..458cce5 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"
@@ -245,147 +245,145 @@
public async Task<WebResponseContent> BatchOrderFeedbackToMes(List<string> orderNos, int inout)
{
try
- { // 1. 銆愬唴瀛橀攣鎶㈠崰銆�
- //if (MemoryLockManager.TryAcquireLock(orderNos[0]))
- //{
-
- if (inout == 1)
+ {
+
+ if (inout == 1)
+ {
+ foreach (var orderNo in orderNos)
+ {
+ try
{
- foreach (var orderNo in orderNos)
+ 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())
{
- try
+ 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 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 inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == lists.FirstOrDefault().OrderNo);
+ if (inboundOrder != null)
{
- 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())
+ if (inboundOrder.OrderType == (int)InOrderTypeEnum.AllocatInbound)//璋冩嫧鍏ュ簱
{
- var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().First(x => x.InboundOrderNo == lists.FirstOrDefault().OrderNo);
- if (inboundOrder != null)
+ var allocate = SqlSugarHelper.DbWMS.Queryable<Dt_AllocateOrder>().Where(x => x.OrderNo == inboundOrder.InboundOrderNo).First();
+ var allocatefeedmodel = new AllocateDto
{
- 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>()
+ 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);
- }
-
}
}
- else if (inout == 2)
+ catch (Exception ex)
{
- 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;
- }
- }
-
+ _logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes 鍥炲啓MES澶辫触: " + ex.Message);
+ return WebResponseContent.Instance.Error(ex.Message);
}
-
+
+ }
+ }
+ else if (inout == 2)
+ {
+ 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;
+ }
+ }
+
+ }
+
//}
//else
//{
@@ -394,14 +392,14 @@
// return WebResponseContent.Instance.Error("WMS姝ｅ湪澶勭悊姝ゅ洖浼犱换鍔★紝璇峰嬁閲嶅鎿嶄綔銆�");
//}
}
- catch(Exception ex)
+ catch (Exception ex)
{
- _logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes : " +ex.Message);
+ _logger.LogInformation("InvokeMESService BatchOrderFeedbackToMes : " + ex.Message);
}
finally
{
// 2. 銆愰噴鏀惧唴瀛橀攣銆戞棤璁烘垚鍔熷け璐ワ紝蹇呴』閲婃斁
- // MemoryLockManager.ReleaseLock(orderNos[0]);
+ // MemoryLockManager.ReleaseLock(orderNos[0]);
}
return WebResponseContent.Instance.OK();
}
@@ -913,52 +911,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}");
}
}
}
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/OutboundBatchPickingService.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/OutboundBatchPickingService.cs"
index c0e37a5..bb29ac6 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/OutboundBatchPickingService.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/OutboundBatchPickingService.cs"
@@ -261,7 +261,10 @@
// 楠岃瘉鍒嗘嫞璇锋眰
var validationResult = await ValidatePickingRequest(orderNo, palletCode, barcode);
if (!validationResult.IsValid)
+ {
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(validationResult.ErrorMessage);
+ }
var (lockInfo, orderDetail, stockDetail, batch) = validationResult.Data;
@@ -371,12 +374,13 @@
#region 鍙栬蛋绌虹閫昏緫
-
/// <summary>
- /// 楠岃瘉绌虹鍙栬蛋鏉′欢
+ /// 楠岃瘉绌虹鍙栬蛋鏉′欢
/// </summary>
private async Task<ValidationResult<List<Dt_OutStockLockInfo>>> ValidateEmptyPalletRemoval(string orderNo, string palletCode)
{
+ _logger.LogInformation($"寮�濮嬮獙璇佺┖鎵樼洏鍙栬蛋 - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}");
+
// 鑾峰彇鎵樼洏鐨勬墍鏈夐攣瀹氳褰�
var lockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
.Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
@@ -385,7 +389,33 @@
if (!lockInfos.Any())
return ValidationResult<List<Dt_OutStockLockInfo>>.Error("璇ユ墭鐩樻病鏈夐攣瀹氳褰�");
- // 妫�鏌ユ槸鍚︽湁鏈畬鎴愮殑閿佸畾璁板綍
+ // 鑾峰彇搴撳瓨淇℃伅
+ var stockInfo = await _stockInfoService.Db.Queryable<Dt_StockInfo>()
+ .FirstAsync(x => x.PalletCode == palletCode);
+
+ if (stockInfo == null)
+ {
+ _logger.LogWarning($"鏈壘鍒版墭鐩樼殑搴撳瓨淇℃伅锛屽彲鑳藉凡琚竻鐞�");
+ // 濡傛灉鎵句笉鍒板簱瀛樹俊鎭紝鍙鏌ラ攣瀹氳褰�
+ }
+ else
+ {
+ // 妫�鏌ユ墭鐩樹笂鏄惁杩樻湁搴撳瓨璐х墿
+ var remainingStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockInfo.Id &&
+ x.StockQuantity > 0) // 鍙鏌ユ暟閲忓ぇ浜�0鐨勫簱瀛�
+ .ToListAsync();
+
+ if (remainingStock.Any())
+ {
+ var remainingQty = remainingStock.Sum(x => x.StockQuantity);
+ var barcodes = string.Join(", ", remainingStock.Select(x => x.Barcode).Take(5)); // 鍙樉绀哄墠5涓�
+ return ValidationResult<List<Dt_OutStockLockInfo>>.Error(
+ $"鎵樼洏涓婅繕鏈夊簱瀛樿揣鐗╋紝鏁伴噺{remainingQty}锛屾潯鐮�: {barcodes}锛屼笉鑳藉彇璧扮┖绠�");
+ }
+ }
+
+ // 妫�鏌ユ槸鍚︽湁鏈畬鎴愮殑閿佸畾璁板綍锛堢姸鎬佷负鍑哄簱涓垨鍥炲簱涓級
var unfinishedLocks = lockInfos.Where(x =>
x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓� ||
x.Status == (int)OutLockStockStatusEnum.鍥炲簱涓�).ToList();
@@ -398,35 +428,19 @@
$"鎵樼洏杩樻湁{unfinishedCount}鏉℃湭瀹屾垚璁板綍锛屽墿浣欐暟閲弡unfinishedQty}锛屼笉鑳藉彇璧扮┖绠�");
}
- // 妫�鏌ユ墭鐩樹笂鏄惁杩樻湁搴撳瓨璐х墿
- var stockInfo = await _stockInfoService.Db.Queryable<Dt_StockInfo>()
- .FirstAsync(x => x.PalletCode == palletCode);
-
- if (stockInfo != null)
- {
- var remainingStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .Where(x => x.StockId == stockInfo.Id &&
- x.Status == (int)StockStatusEmun.鍑哄簱閿佸畾 &&
- x.StockQuantity > 0)
- .ToListAsync();
-
- if (remainingStock.Any())
- {
- var remainingQty = remainingStock.Sum(x => x.StockQuantity);
- return ValidationResult<List<Dt_OutStockLockInfo>>.Error(
- $"鎵樼洏涓婅繕鏈夊簱瀛樿揣鐗╋紝鏁伴噺{remainingQty}锛屼笉鑳藉彇璧扮┖绠�");
- }
- }
-
- // 鑾峰彇宸插畬鎴愮殑閿佸畾璁板綍
+ // 鑾峰彇宸插畬鎴愮殑閿佸畾璁板綍锛堢姸鎬佷负鎷ｉ�夊畬鎴愭垨宸插彇璧帮級
var completedLocks = lockInfos.Where(x =>
- x.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�).ToList();
+ x.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴� ||
+ x.Status == (int)OutLockStockStatusEnum.宸插彇璧�).ToList();
if (!completedLocks.Any())
return ValidationResult<List<Dt_OutStockLockInfo>>.Error("璇ユ墭鐩樻病鏈夊凡瀹屾垚鎷ｉ�夌殑璁板綍");
+ _logger.LogInformation($"绌烘墭鐩橀獙璇侀�氳繃 - 鎵惧埌 {completedLocks.Count} 鏉″凡瀹屾垚璁板綍");
+
return ValidationResult<List<Dt_OutStockLockInfo>>.Success(completedLocks);
}
+
/// <summary>
/// 娓呯悊宸插畬鎴愮殑閿佸畾璁板綍
@@ -446,17 +460,64 @@
}
/// <summary>
- /// 娓呯悊搴撳瓨淇℃伅
+ /// 娓呯悊搴撳瓨淇℃伅 - 澧炲己鐗堟湰
/// </summary>
private async Task CleanupStockInfo(Dt_OutStockLockInfo lockInfo)
{
- var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId);
-
- if (stockDetail != null && stockDetail.Status == (int)StockStatusEmun.鍑哄簱瀹屾垚)
+ try
{
- stockDetail.Status = (int)StockStatusEmun.宸叉竻鐞�;
- await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+ // 鏌ユ壘閿佸畾鐨勫簱瀛樻槑缁�
+ var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId);
+
+ if (stockDetail != null)
+ {
+ // 璁板綍娓呯悊鍓嶇殑鐘舵��
+ decimal originalQty = stockDetail.StockQuantity;
+ int originalStatus = stockDetail.Status;
+
+ // 濡傛灉搴撳瓨鏁伴噺澶т簬0锛岄渶瑕佸厛娓呴浂
+ if (stockDetail.StockQuantity > 0)
+ {
+ _logger.LogWarning($"鍙栬蛋绌烘墭鐩樻椂鍙戠幇鏉＄爜 {lockInfo.CurrentBarcode} 杩樻湁搴撳瓨 {stockDetail.StockQuantity}锛岃嚜鍔ㄦ竻闆�");
+ stockDetail.StockQuantity = 0;
+ stockDetail.OutboundQuantity = 0;
+ }
+
+ // 鏍囪涓哄凡娓呯悊鐘舵��
+ stockDetail.Status = (int)StockStatusEmun.宸叉竻鐞�;
+
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+
+ _logger.LogInformation($"娓呯悊搴撳瓨鏄庣粏 - 鏉＄爜: {stockDetail.Barcode}, 鍘熺姸鎬�: {originalStatus} -> 宸叉竻鐞�, 鍘熸暟閲�: {originalQty} -> 0");
+ }
+ else
+ {
+ _logger.LogWarning($"鏈壘鍒版潯鐮佸搴旂殑搴撳瓨鏄庣粏: {lockInfo.CurrentBarcode}");
+ }
+
+ // 鍚屾椂娓呯悊璇ユ墭鐩樹笂鐨勬墍鏈夊簱瀛橈紙閬垮厤閬楁紡锛�
+ var allStockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == lockInfo.StockId && x.StockQuantity > 0)
+ .ToListAsync();
+
+ if (allStockDetails.Any())
+ {
+ foreach (var stock in allStockDetails)
+ {
+ stock.StockQuantity = 0;
+ stock.OutboundQuantity = 0;
+ stock.Status = (int)StockStatusEmun.宸叉竻鐞�;
+
+ await _stockInfoDetailService.Db.Updateable(stock).ExecuteCommandAsync();
+ _logger.LogWarning($"娓呯悊閬楁紡搴撳瓨 - 鏉＄爜: {stock.Barcode}, 鏁伴噺: {stock.StockQuantity} -> 0");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"娓呯悊搴撳瓨淇℃伅澶辫触 - 閿佸畾ID: {lockInfo.Id}, 鏉＄爜: {lockInfo.CurrentBarcode}, Error: {ex.Message}");
+ // 涓嶆姏鍑哄紓甯革紝缁х画澶勭悊鍏朵粬璁板綍
}
}
@@ -677,100 +738,193 @@
}
/// <summary>
- /// 鎵ц鎵嬪姩鎷嗗寘閫昏緫 - 澧炲己鍒嗛厤鏁伴噺鎺у埗
+ /// 鎵ц鎵嬪姩鎷嗗寘閫昏緫 - 瀹屾暣鐗堟湰
/// </summary>
private async Task<List<SplitResult>> ExecuteManualSplitLogic(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail,
decimal splitQuantity, string palletCode)
{
_logger.LogInformation($"寮�濮嬫墽琛屾墜鍔ㄦ媶鍖呴�昏緫 - 鍘熸潯鐮�: {stockDetail.Barcode}, 鎷嗗寘鏁伴噺: {splitQuantity}");
- // 楠岃瘉鎷嗗寘鏁伴噺
- if (lockInfo.AssignQuantity < splitQuantity)
+ try
{
- throw new InvalidOperationException($"鎷嗗寘鏁伴噺瓒呰繃閿佸畾淇℃伅鍒嗛厤鏁伴噺锛屾媶鍖呮暟閲�: {splitQuantity}, 鍒嗛厤鏁伴噺: {lockInfo.AssignQuantity}");
+ // 楠岃瘉搴撳瓨鏁伴噺鏄惁瓒冲
+ decimal availableStock = stockDetail.StockQuantity;
+ if (availableStock < splitQuantity)
+ {
+ throw new InvalidOperationException($"搴撳瓨涓嶈冻锛屽綋鍓嶅簱瀛�: {availableStock}, 闇�瑕佹媶鍖�: {splitQuantity}");
+ }
+
+ // 楠岃瘉鎷嗗寘鏁伴噺涓嶈兘绛変簬鎴栧ぇ浜庡師閿佸畾淇℃伅鍒嗛厤鏁伴噺
+ if (splitQuantity >= lockInfo.AssignQuantity)
+ {
+ throw new InvalidOperationException($"鎷嗗寘鏁伴噺涓嶈兘绛変簬鎴栧ぇ浜庡師閿佸畾淇℃伅鍒嗛厤鏁伴噺锛屾媶鍖呮暟閲�: {splitQuantity}, 鍘熷垎閰嶆暟閲�: {lockInfo.AssignQuantity}");
+ }
+
+ // 璁＄畻鍓╀綑鏁伴噺
+ decimal remainQty = lockInfo.AssignQuantity - splitQuantity;
+
+ // 楠岃瘉鍓╀綑鏁伴噺鏄惁鍚堢悊
+ if (remainQty <= 0)
+ {
+ throw new InvalidOperationException($"鎷嗗寘鍚庡墿浣欐暟閲忓繀椤诲ぇ浜�0锛屽綋鍓嶅墿浣�: {remainQty}");
+ }
+
+ _logger.LogInformation($"鎷嗗寘璁＄畻 - 鍘熷垎閰嶆暟閲�: {lockInfo.AssignQuantity}, 鎷嗗寘鏁伴噺: {splitQuantity}, 鍓╀綑鏁伴噺: {remainQty}");
+ _logger.LogInformation($"鍘熷簱瀛樹俊鎭� - 搴撳瓨鏁伴噺: {stockDetail.StockQuantity}, 鍑哄簱鏁伴噺: {stockDetail.OutboundQuantity}");
+
+ // 鐢熸垚鏂版潯鐮�
+ string newBarcode = await GenerateNewBarcode();
+ _logger.LogInformation($"鐢熸垚鏂版潯鐮�: {newBarcode}");
+
+ // 璁板綍鎷嗗寘鍓嶇殑鍏抽敭鏁版嵁
+ decimal originalLockAssignQty = lockInfo.AssignQuantity;
+ decimal originalLockOrderQty = lockInfo.OrderQuantity;
+ decimal originalStockQty = stockDetail.StockQuantity;
+ decimal originalOutboundQty = stockDetail.OutboundQuantity;
+
+ // 鍒涘缓鏂板簱瀛樻槑缁�
+ var newStockDetail = new Dt_StockInfoDetail
+ {
+ StockId = stockDetail.StockId,
+ MaterielCode = stockDetail.MaterielCode,
+ OrderNo = stockDetail.OrderNo,
+ BatchNo = stockDetail.BatchNo,
+ StockQuantity = splitQuantity,
+ OutboundQuantity = 0,
+ Barcode = newBarcode,
+ Status = (int)StockStatusEmun.鍑哄簱閿佸畾,
+ SupplyCode = stockDetail.SupplyCode,
+ Unit = stockDetail.Unit,
+ BarcodeQty = stockDetail.BarcodeQty,
+ BarcodeUnit = stockDetail.BarcodeUnit,
+ BusinessType = stockDetail.BusinessType,
+ InboundOrderRowNo = stockDetail.InboundOrderRowNo,
+ };
+
+ await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
+ _logger.LogInformation($"鍒涘缓鏂板簱瀛樻槑缁嗘垚鍔� - 鏉＄爜: {newBarcode}, 搴撳瓨鏁伴噺: {splitQuantity}");
+
+ // 淇锛氭洿鏂板師搴撳瓨鏄庣粏 - 纭繚鏁版嵁涓�鑷存��
+ // 鍘熷簱瀛樺噺灏戞媶鍖呮暟閲忥紝浣嗗嚭搴撴暟閲忎繚鎸佷笉鍙橈紙鍥犱负鏄墜鍔ㄦ媶鍖咃紝涓嶆秹鍙婂疄闄呭嚭搴擄級
+ stockDetail.StockQuantity -= splitQuantity;
+
+ // 纭繚涓嶄細涓鸿礋鏁�
+ if (stockDetail.StockQuantity < 0)
+ {
+ _logger.LogWarning($"鍘熷簱瀛樻暟閲忓嚭鐜拌礋鏁帮紝閲嶇疆涓�0");
+ stockDetail.StockQuantity = 0;
+ }
+
+ // 鍑哄簱鏁伴噺淇濇寔涓嶅彉
+ // stockDetail.OutboundQuantity = stockDetail.OutboundQuantity; // 淇濇寔涓嶅彉
+
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+ _logger.LogInformation($"鏇存柊鍘熷簱瀛樻槑缁� - 鏉＄爜: {stockDetail.Barcode}, " +
+ $"搴撳瓨鏁伴噺: {originalStockQty} -> {stockDetail.StockQuantity}, " +
+ $"鍑哄簱鏁伴噺: {originalOutboundQty} -> {stockDetail.OutboundQuantity}");
+
+ // 鍒涘缓鏂伴攣瀹氫俊鎭�
+ var newLockInfo = new Dt_OutStockLockInfo
+ {
+ OrderNo = lockInfo.OrderNo,
+ OrderDetailId = lockInfo.OrderDetailId, // 缁戝畾鍒板悓涓�涓鍗曟槑缁�
+ OutboundBatchNo = lockInfo.OutboundBatchNo,
+ MaterielCode = lockInfo.MaterielCode,
+ MaterielName = lockInfo.MaterielName,
+ StockId = lockInfo.StockId,
+ OrderQuantity = splitQuantity,
+ AssignQuantity = splitQuantity,
+ PickedQty = 0,
+ LocationCode = lockInfo.LocationCode,
+ PalletCode = lockInfo.PalletCode,
+ TaskNum = lockInfo.TaskNum,
+ Status = (int)OutLockStockStatusEnum.鍑哄簱涓�,
+ Unit = lockInfo.Unit,
+ SupplyCode = lockInfo.SupplyCode,
+ OrderType = lockInfo.OrderType,
+ CurrentBarcode = newBarcode,
+ IsSplitted = 1,
+ ParentLockId = lockInfo.Id,
+ Operator = App.User.UserName,
+ FactoryArea = lockInfo.FactoryArea,
+ lineNo = lockInfo.lineNo,
+ WarehouseCode = lockInfo.WarehouseCode,
+ BarcodeQty = lockInfo.BarcodeQty,
+ BarcodeUnit = lockInfo.BarcodeUnit,
+ };
+
+ await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();
+ _logger.LogInformation($"鍒涘缓鏂伴攣瀹氫俊鎭垚鍔� - 鏉＄爜: {newBarcode}, 鍒嗛厤鏁伴噺: {splitQuantity}");
+
+ // 鏇存柊鍘熼攣瀹氫俊鎭�
+ lockInfo.AssignQuantity = remainQty;
+ lockInfo.OrderQuantity = remainQty;
+
+ await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
+ _logger.LogInformation($"鏇存柊鍘熼攣瀹氫俊鎭� - 鍒嗛厤鏁伴噺: {originalLockAssignQty} -> {lockInfo.AssignQuantity}, " +
+ $"璁㈠崟鏁伴噺: {originalLockOrderQty} -> {lockInfo.OrderQuantity}");
+
+ // 閲嶈锛氭墜鍔ㄦ媶鍖呬笉鏀瑰彉璁㈠崟鏄庣粏鐨勬�诲垎閰嶆暟閲�
+ // 楠岃瘉璁㈠崟鏄庣粏鐨勬�诲垎閰嶆暟閲忔槸鍚︿繚鎸佷笉鍙�
+ await ValidateOrderDetailAllocationAfterSplit(lockInfo.OrderDetailId, originalLockAssignQty);
+
+ // 璁板綍鎷嗗寘鍘嗗彶
+ await RecordSplitHistory(lockInfo, stockDetail, splitQuantity, newBarcode, false, originalStockQty);
+
+ // 鍒涘缓鎷嗗寘缁撴灉鍒楄〃
+ var splitResults = CreateSplitResults(lockInfo, splitQuantity, remainQty, newBarcode, stockDetail.Barcode);
+
+ // 楠岃瘉鎷嗗寘鍚庢暟鎹竴鑷存��
+ await ValidateDataConsistencyAfterSplit(lockInfo.OrderDetailId, originalLockAssignQty, originalLockOrderQty);
+
+ _logger.LogInformation($"鎵嬪姩鎷嗗寘閫昏緫鎵ц瀹屾垚 - 鍘熸潯鐮�: {stockDetail.Barcode}, 鏂版潯鐮�: {newBarcode}, 鎷嗗寘鏁伴噺: {splitQuantity}");
+
+ return splitResults;
}
-
- // 鐢熸垚鏂版潯鐮�
- string newBarcode = await GenerateNewBarcode();
-
- // 璁＄畻鍓╀綑鏁伴噺
- decimal remainQty = lockInfo.AssignQuantity - splitQuantity;
-
- // 鍒涘缓鏂板簱瀛樻槑缁�
- var newStockDetail = new Dt_StockInfoDetail
+ catch (Exception ex)
{
- StockId = stockDetail.StockId,
- MaterielCode = stockDetail.MaterielCode,
- OrderNo = stockDetail.OrderNo,
- BatchNo = stockDetail.BatchNo,
- StockQuantity = splitQuantity,
- OutboundQuantity = 0,
- Barcode = newBarcode,
- Status = (int)StockStatusEmun.鍑哄簱閿佸畾,
- SupplyCode = stockDetail.SupplyCode,
- Unit = stockDetail.Unit,
- BarcodeQty = stockDetail.BarcodeQty,
- BarcodeUnit = stockDetail.BarcodeUnit,
- BusinessType = stockDetail.BusinessType,
- InboundOrderRowNo = stockDetail.InboundOrderRowNo,
- };
- await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
-
- // 鏇存柊鍘熷簱瀛樻槑缁�
- stockDetail.StockQuantity -= splitQuantity;
- if (stockDetail.StockQuantity < 0) stockDetail.StockQuantity = 0;
- await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
-
- // 鍒涘缓鏂伴攣瀹氫俊鎭�
- var newLockInfo = new Dt_OutStockLockInfo
+ _logger.LogError($"鎵嬪姩鎷嗗寘閫昏緫鎵ц澶辫触 - 鍘熸潯鐮�: {stockDetail.Barcode}, 鎷嗗寘鏁伴噺: {splitQuantity}, Error: {ex.Message}");
+ throw;
+ }
+ }
+ /// <summary>
+ /// 楠岃瘉鎷嗗寘鍚庤鍗曟槑缁嗙殑鍒嗛厤鏁伴噺鏄惁淇濇寔涓嶅彉
+ /// </summary>
+ private async Task ValidateOrderDetailAllocationAfterSplit(long orderDetailId, decimal originalTotalAssignQty)
+ {
+ try
{
- OrderNo = lockInfo.OrderNo,
- OrderDetailId = lockInfo.OrderDetailId, // 缁戝畾鍒板悓涓�涓鍗曟槑缁�
- OutboundBatchNo = lockInfo.OutboundBatchNo,
- MaterielCode = lockInfo.MaterielCode,
- MaterielName = lockInfo.MaterielName,
- StockId = lockInfo.StockId,
- OrderQuantity = splitQuantity,
- AssignQuantity = splitQuantity,
- PickedQty = 0,
- LocationCode = lockInfo.LocationCode,
- PalletCode = lockInfo.PalletCode,
- TaskNum = lockInfo.TaskNum,
- Status = (int)OutLockStockStatusEnum.鍑哄簱涓�,
- Unit = lockInfo.Unit,
- SupplyCode = lockInfo.SupplyCode,
- OrderType = lockInfo.OrderType,
- CurrentBarcode = newBarcode,
- IsSplitted = 1,
- ParentLockId = lockInfo.Id,
- Operator = App.User.UserName,
- FactoryArea = lockInfo.FactoryArea,
- lineNo = lockInfo.lineNo,
- WarehouseCode = lockInfo.WarehouseCode,
- BarcodeQty = lockInfo.BarcodeQty,
- BarcodeUnit = lockInfo.BarcodeUnit,
- };
+ // 鑾峰彇璁㈠崟鏄庣粏鐨勬墍鏈夐攣瀹氫俊鎭殑鎬诲垎閰嶆暟閲�
+ var allLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderDetailId == orderDetailId)
+ .ToListAsync();
- await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();
+ decimal totalLockAssignQty = allLocks.Sum(x => x.AssignQuantity);
- // 鏇存柊鍘熼攣瀹氫俊鎭�
- lockInfo.AssignQuantity = remainQty;
- lockInfo.OrderQuantity = remainQty;
- await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
+ _logger.LogInformation($"鎷嗗寘鍚庡垎閰嶆暟閲忛獙璇� - 璁㈠崟鏄庣粏ID: {orderDetailId}");
+ _logger.LogInformation($"鍘熷鎬诲垎閰嶆暟閲�: {originalTotalAssignQty}, 褰撳墠鎬诲垎閰嶆暟閲�: {totalLockAssignQty}");
- // 閲嶈锛氭墜鍔ㄦ媶鍖呬笉鏀瑰彉璁㈠崟鏄庣粏鐨勬�诲垎閰嶆暟閲�
- // 鍥犱负鍒嗛厤鏁伴噺鍙槸浠庝竴涓攣瀹氫俊鎭浆绉诲埌鍙︿竴涓攣瀹氫俊鎭�
- _logger.LogInformation($"鎵嬪姩鎷嗗寘 - 璁㈠崟鏄庣粏鎬诲垎閰嶆暟閲忎繚鎸佷笉鍙�");
+ // 鎵嬪姩鎷嗗寘鍚庢�诲垎閰嶆暟閲忓簲璇ヤ繚鎸佷笉鍙�
+ if (Math.Abs(originalTotalAssignQty - totalLockAssignQty) > 0.01m)
+ {
+ _logger.LogWarning($"鎷嗗寘鍚庢�诲垎閰嶆暟閲忓彂鐢熷彉鍖� - 鏈熸湜: {originalTotalAssignQty}, 瀹為檯: {totalLockAssignQty}");
- // 璁板綍鎷嗗寘鍘嗗彶
- await RecordSplitHistory(lockInfo, stockDetail, splitQuantity, newBarcode, false);
-
- // 鍒涘缓鎷嗗寘缁撴灉鍒楄〃
- var splitResults = CreateSplitResults(lockInfo, splitQuantity, remainQty, newBarcode, stockDetail.Barcode);
-
- _logger.LogInformation($"鎵嬪姩鎷嗗寘閫昏緫鎵ц瀹屾垚");
-
- return splitResults;
+ // 濡傛灉鍙樺寲寰堝皬锛屽彲鑳芥槸绮惧害闂锛岃褰曚絾涓嶆姏鍑哄紓甯�
+ if (Math.Abs(originalTotalAssignQty - totalLockAssignQty) > 1.0m)
+ {
+ throw new InvalidOperationException($"鎷嗗寘鍚庢�诲垎閰嶆暟閲忓紓甯稿彉鍖栵紝鏈熸湜: {originalTotalAssignQty}, 瀹為檯: {totalLockAssignQty}");
+ }
+ }
+ else
+ {
+ _logger.LogInformation($"鎷嗗寘鍚庡垎閰嶆暟閲忛獙璇侀�氳繃 - 鎬诲垎閰嶆暟閲忎繚鎸佷笉鍙�");
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"楠岃瘉鎷嗗寘鍚庡垎閰嶆暟閲忓け璐� - OrderDetailId: {orderDetailId}, Error: {ex.Message}");
+ throw;
+ }
}
/// <summary>
/// 楠岃瘉鎷嗗寘鍚庢暟鎹竴鑷存��
@@ -870,6 +1024,45 @@
{
_logger.LogInformation($"寮�濮嬫墽琛屽彇娑堟媶鍖呴�昏緫 - 鍘熸潯鐮�: {splitRecord.OriginalBarcode}, 鏂版潯鐮�: {splitRecord.NewBarcode}, 鎷嗗寘鏁伴噺: {splitRecord.SplitQty}");
+ try
+ {
+ // 鏍规嵁鎷嗗寘绫诲瀷璋冪敤涓嶅悓鐨勫鐞嗘柟娉�
+ if (splitRecord.IsAutoSplit)
+ {
+ await HandleAutoSplitCancel(splitRecord, originalLockInfo, newLockInfo, newStockDetail);
+ }
+ else
+ {
+ await HandleManualSplitCancel(splitRecord, originalLockInfo, newLockInfo, newStockDetail);
+ }
+
+ // 楠岃瘉鍙栨秷鎷嗗寘鍚庢暟鎹竴鑷存��
+ await ValidateDataConsistencyAfterCancelSplit(originalLockInfo.OrderDetailId,
+ originalLockInfo.AssignQuantity, originalLockInfo.OrderQuantity,
+ splitRecord.IsAutoSplit, splitRecord.SplitQty);
+
+ // 妫�鏌ュ苟鏇存柊鎵规鍜岃鍗曠姸鎬�
+ await CheckAndUpdateBatchStatus(originalLockInfo.BatchNo);
+ await CheckAndUpdateOrderStatus(originalLockInfo.OrderNo);
+
+ _logger.LogInformation($"鍙栨秷鎷嗗寘閫昏緫鎵ц瀹屾垚");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"鍙栨秷鎷嗗寘閫昏緫鎵ц澶辫触: {ex.Message}");
+ throw;
+ }
+ }
+
+ /// <summary>
+ /// 澶勭悊鑷姩鎷嗗寘鍙栨秷
+ /// </summary>
+ private async Task HandleAutoSplitCancel(Dt_SplitPackageRecord splitRecord,
+ Dt_OutStockLockInfo originalLockInfo, Dt_OutStockLockInfo newLockInfo,
+ Dt_StockInfoDetail newStockDetail)
+ {
+ _logger.LogInformation($"澶勭悊鑷姩鎷嗗寘鍙栨秷 - 鍘熸潯鐮�: {splitRecord.OriginalBarcode}, 鏂版潯鐮�: {splitRecord.NewBarcode}");
+
// 鑾峰彇璁㈠崟鏄庣粏
var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
.FirstAsync(x => x.Id == originalLockInfo.OrderDetailId);
@@ -877,124 +1070,113 @@
if (orderDetail == null)
throw new InvalidOperationException("鏈壘鍒拌鍗曟槑缁�");
- // 璁板綍鍙栨秷鎷嗗寘鍓嶇殑鍏抽敭鏁版嵁
- decimal originalOrderDetailAllocatedQty = orderDetail.AllocatedQuantity;
- decimal originalOrderDetailLockQty = orderDetail.LockQuantity;
+ // 1. 鎭㈠璁㈠崟鏄庣粏鐨勫垎閰嶆暟閲忥紙鑷姩鎷嗗寘浼氬鍔犲垎閰嶆暟閲忥級
+ decimal originalAllocatedQty = orderDetail.AllocatedQuantity;
+ decimal originalLockQty = orderDetail.LockQuantity;
- _logger.LogInformation($"鍙栨秷鎷嗗寘鍓嶆暟鎹� - 璁㈠崟鏄庣粏鍒嗛厤鏁伴噺: {originalOrderDetailAllocatedQty}, 閿佸畾鏁伴噺: {originalOrderDetailLockQty}");
+ orderDetail.AllocatedQuantity -= splitRecord.SplitQty;
+ orderDetail.LockQuantity -= splitRecord.SplitQty;
- // 鎭㈠鍘熼攣瀹氫俊鎭�
- decimal originalAssignQtyBefore = originalLockInfo.AssignQuantity;
- decimal originalOrderQtyBefore = originalLockInfo.OrderQuantity;
+ // 杈圭晫妫�鏌�
+ if (orderDetail.AllocatedQuantity < 0) orderDetail.AllocatedQuantity = 0;
+ if (orderDetail.LockQuantity < 0) orderDetail.LockQuantity = 0;
- // 鏍规嵁鎷嗗寘绫诲瀷鍐冲畾濡備綍鎭㈠
- if (splitRecord.IsAutoSplit)
- {
- // 鑷姩鎷嗗寘锛氬師閿佸畾淇℃伅淇濇寔涓嶅彉锛屽彧闇�瑕佸垹闄ゆ柊閿佸畾淇℃伅
- _logger.LogInformation($"鍙栨秷鑷姩鎷嗗寘 - 鍘熼攣瀹氫俊鎭繚鎸佷笉鍙�");
- }
- else
- {
- // 鎵嬪姩鎷嗗寘锛氭仮澶嶅師閿佸畾淇℃伅鐨勫垎閰嶆暟閲�
- originalLockInfo.AssignQuantity += splitRecord.SplitQty;
- originalLockInfo.OrderQuantity += splitRecord.SplitQty;
+ await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();
+ _logger.LogInformation($"鑷姩鎷嗗寘鍙栨秷鎭㈠璁㈠崟鏄庣粏 - 鍒嗛厤鏁伴噺: {originalAllocatedQty} -> {orderDetail.AllocatedQuantity}");
- _logger.LogInformation($"鍙栨秷鎵嬪姩鎷嗗寘 - 鎭㈠鍘熼攣瀹氫俊鎭垎閰嶆暟閲忎粠 {originalAssignQtyBefore} 澧炲姞鍒� {originalLockInfo.AssignQuantity}");
- }
-
- // 濡傛灉鍘熼攣瀹氫俊鎭殑鐘舵�佹槸鎷ｉ�夊畬鎴愶紝闇�瑕侀噸鏂拌缃负鍑哄簱涓�
- if (originalLockInfo.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�)
- {
- originalLockInfo.Status = (int)OutLockStockStatusEnum.鍑哄簱涓�;
- _logger.LogInformation($"鍘熼攣瀹氫俊鎭姸鎬佷粠鎷ｉ�夊畬鎴愭仮澶嶄负鍑哄簱涓�");
- }
-
- await _outStockLockInfoService.Db.Updateable(originalLockInfo).ExecuteCommandAsync();
-
- // 鎭㈠鍘熷簱瀛樻槑缁�
+ // 2. 鎭㈠鍘熷簱瀛橈紙灏嗘媶鍖呯殑鏁伴噺鍔犲洖鍘熷簱瀛橈級
var originalStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
.FirstAsync(x => x.Barcode == splitRecord.OriginalBarcode && x.StockId == splitRecord.StockId);
if (originalStock != null)
{
- if (splitRecord.IsAutoSplit)
+ decimal originalStockQty = originalStock.StockQuantity;
+ originalStock.StockQuantity += splitRecord.SplitQty;
+
+ // 濡傛灉鍘熷簱瀛樼姸鎬佹槸鍑哄簱瀹屾垚锛屾仮澶嶄负鍑哄簱閿佸畾
+ if (originalStock.Status == (int)StockStatusEmun.鍑哄簱瀹屾垚)
{
- // 鑷姩鎷嗗寘锛氬師搴撳瓨鏄庣粏淇濇寔涓嶅彉
- _logger.LogInformation($"鍙栨秷鑷姩鎷嗗寘 - 鍘熷簱瀛樻槑缁嗕繚鎸佷笉鍙�");
+ originalStock.Status = (int)StockStatusEmun.鍑哄簱閿佸畾;
}
- else
- {
- // 鎵嬪姩鎷嗗寘锛氭仮澶嶅師搴撳瓨鏁伴噺
- decimal originalStockQtyBefore = originalStock.StockQuantity;
- originalStock.StockQuantity += splitRecord.SplitQty;
- _logger.LogInformation($"鍙栨秷鎵嬪姩鎷嗗寘 - 鎭㈠鍘熷簱瀛樻槑缁嗘暟閲忎粠 {originalStockQtyBefore} 澧炲姞鍒� {originalStock.StockQuantity}");
-
- // 濡傛灉鍘熷簱瀛樼姸鎬佹槸鍑哄簱瀹屾垚锛岄渶瑕侀噸鏂拌缃负鍑哄簱閿佸畾
- if (originalStock.Status == (int)StockStatusEmun.鍑哄簱瀹屾垚)
- {
- originalStock.Status = (int)StockStatusEmun.鍑哄簱閿佸畾;
- _logger.LogInformation($"鍘熷簱瀛樼姸鎬佷粠鍑哄簱瀹屾垚鎭㈠涓哄嚭搴撻攣瀹�");
- }
-
- await _stockInfoDetailService.Db.Updateable(originalStock).ExecuteCommandAsync();
- }
+ await _stockInfoDetailService.Db.Updateable(originalStock).ExecuteCommandAsync();
+ _logger.LogInformation($"鑷姩鎷嗗寘鍙栨秷鎭㈠鍘熷簱瀛� - 鏉＄爜: {originalStock.Barcode}, 鏁伴噺: {originalStockQty} -> {originalStock.StockQuantity}");
}
+ // 3. 鍒犻櫎鏂伴攣瀹氫俊鎭拰搴撳瓨鏄庣粏
+ await DeleteNewSplitRecords(newLockInfo, newStockDetail);
+ }
+
+ /// <summary>
+ /// 澶勭悊鎵嬪姩鎷嗗寘鍙栨秷
+ /// </summary>
+ private async Task HandleManualSplitCancel(Dt_SplitPackageRecord splitRecord,
+ Dt_OutStockLockInfo originalLockInfo, Dt_OutStockLockInfo newLockInfo,
+ Dt_StockInfoDetail newStockDetail)
+ {
+ _logger.LogInformation($"澶勭悊鎵嬪姩鎷嗗寘鍙栨秷 - 鍘熸潯鐮�: {splitRecord.OriginalBarcode}, 鏂版潯鐮�: {splitRecord.NewBarcode}");
+
+ // 1. 鎭㈠鍘熼攣瀹氫俊鎭殑鍒嗛厤鏁伴噺
+ decimal originalAssignQty = originalLockInfo.AssignQuantity;
+ decimal originalOrderQty = originalLockInfo.OrderQuantity;
+
+ originalLockInfo.AssignQuantity += splitRecord.SplitQty;
+ originalLockInfo.OrderQuantity += splitRecord.SplitQty;
+
+ // 鎭㈠鐘舵��
+ if (originalLockInfo.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�)
+ {
+ originalLockInfo.Status = (int)OutLockStockStatusEnum.鍑哄簱涓�;
+ }
+
+ await _outStockLockInfoService.Db.Updateable(originalLockInfo).ExecuteCommandAsync();
+ _logger.LogInformation($"鎵嬪姩鎷嗗寘鍙栨秷鎭㈠鍘熼攣瀹氫俊鎭� - 鍒嗛厤鏁伴噺: {originalAssignQty} -> {originalLockInfo.AssignQuantity}");
+
+ // 2. 鎭㈠鍘熷簱瀛樻槑缁�
+ var originalStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == splitRecord.OriginalBarcode && x.StockId == splitRecord.StockId);
+
+ if (originalStock != null)
+ {
+ decimal originalStockQty = originalStock.StockQuantity;
+ originalStock.StockQuantity += splitRecord.SplitQty;
+
+ // 鎭㈠搴撳瓨鐘舵��
+ if (originalStock.Status == (int)StockStatusEmun.鍑哄簱瀹屾垚)
+ {
+ originalStock.Status = (int)StockStatusEmun.鍑哄簱閿佸畾;
+ }
+
+ await _stockInfoDetailService.Db.Updateable(originalStock).ExecuteCommandAsync();
+ _logger.LogInformation($"鎵嬪姩鎷嗗寘鍙栨秷鎭㈠鍘熷簱瀛� - 鏉＄爜: {originalStock.Barcode}, 鏁伴噺: {originalStockQty} -> {originalStock.StockQuantity}");
+ }
+
+ // 3. 鍒犻櫎鏂伴攣瀹氫俊鎭拰搴撳瓨鏄庣粏
+ await DeleteNewSplitRecords(newLockInfo, newStockDetail);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鏂版媶鍖呰褰曠浉鍏崇殑鏁版嵁
+ /// </summary>
+ private async Task DeleteNewSplitRecords(Dt_OutStockLockInfo newLockInfo, Dt_StockInfoDetail newStockDetail)
+ {
// 鍒犻櫎鏂伴攣瀹氫俊鎭�
- _logger.LogInformation($"鍒犻櫎鏂伴攣瀹氫俊鎭� - 鏉＄爜: {newLockInfo.CurrentBarcode}, 鍒嗛厤鏁伴噺: {newLockInfo.AssignQuantity}");
- await _outStockLockInfoService.Db.Deleteable<Dt_OutStockLockInfo>()
- .Where(x => x.Id == newLockInfo.Id)
- .ExecuteCommandAsync();
+ if (newLockInfo != null)
+ {
+ _logger.LogInformation($"鍒犻櫎鏂伴攣瀹氫俊鎭� - 鏉＄爜: {newLockInfo.CurrentBarcode}, 鍒嗛厤鏁伴噺: {newLockInfo.AssignQuantity}");
+ await _outStockLockInfoService.Db.Deleteable<Dt_OutStockLockInfo>()
+ .Where(x => x.Id == newLockInfo.Id)
+ .ExecuteCommandAsync();
+ }
// 鍒犻櫎鏂板簱瀛樻槑缁�
- _logger.LogInformation($"鍒犻櫎鏂板簱瀛樻槑缁� - 鏉＄爜: {newStockDetail.Barcode}, 搴撳瓨鏁伴噺: {newStockDetail.StockQuantity}");
- await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
- .Where(x => x.Barcode == newLockInfo.CurrentBarcode)
- .ExecuteCommandAsync();
-
- // 濡傛灉鏄嚜鍔ㄦ媶鍖咃紝闇�瑕佸噺灏戣鍗曟槑缁嗙殑鍒嗛厤鏁伴噺鍜岄攣瀹氭暟閲�
- if (splitRecord.IsAutoSplit)
+ if (newStockDetail != null)
{
- decimal originalAllocatedBefore = orderDetail.AllocatedQuantity;
- decimal originalLockBefore = orderDetail.LockQuantity;
-
- orderDetail.AllocatedQuantity -= splitRecord.SplitQty;
- orderDetail.LockQuantity -= splitRecord.SplitQty;
-
- // 杈圭晫妫�鏌ワ細纭繚鏁伴噺涓嶄細涓鸿礋鏁�
- if (orderDetail.AllocatedQuantity < 0)
- {
- _logger.LogWarning($"鍒嗛厤鏁伴噺鍑虹幇璐熸暟锛岄噸缃负0銆傚師鍊�: {orderDetail.AllocatedQuantity + splitRecord.SplitQty}, 鍑忓皯: {splitRecord.SplitQty}");
- orderDetail.AllocatedQuantity = 0;
- }
- if (orderDetail.LockQuantity < 0)
- {
- _logger.LogWarning($"閿佸畾鏁伴噺鍑虹幇璐熸暟锛岄噸缃负0銆傚師鍊�: {orderDetail.LockQuantity + splitRecord.SplitQty}, 鍑忓皯: {splitRecord.SplitQty}");
- orderDetail.LockQuantity = 0;
- }
-
- await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();
-
- _logger.LogInformation($"鍙栨秷鑷姩鎷嗗寘鍑忓皯璁㈠崟鏄庣粏鏁伴噺 - 鍒嗛厤鏁伴噺浠� {originalAllocatedBefore} 鍑忓皯鍒� {orderDetail.AllocatedQuantity}");
- _logger.LogInformation($"鍙栨秷鑷姩鎷嗗寘鍑忓皯璁㈠崟鏄庣粏鏁伴噺 - 閿佸畾鏁伴噺浠� {originalLockBefore} 鍑忓皯鍒� {orderDetail.LockQuantity}");
+ _logger.LogInformation($"鍒犻櫎鏂板簱瀛樻槑缁� - 鏉＄爜: {newStockDetail.Barcode}, 搴撳瓨鏁伴噺: {newStockDetail.StockQuantity}");
+ await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
+ .Where(x => x.Barcode == newStockDetail.Barcode)
+ .ExecuteCommandAsync();
}
-
- // 鏍囪鎷嗗寘璁板綍涓哄凡鎾ら攢
- splitRecord.IsReverted = true;
- splitRecord.RevertTime = DateTime.Now;
- splitRecord.RevertOperator = App.User.UserName;
- await _splitPackageService.Db.Updateable(splitRecord).ExecuteCommandAsync();
- _logger.LogInformation($"鏍囪鎷嗗寘璁板綍涓哄凡鎾ら攢");
-
- // 楠岃瘉鍙栨秷鎷嗗寘鍚庢暟鎹竴鑷存��
- await ValidateDataConsistencyAfterCancelSplit(orderDetail.Id, originalOrderDetailAllocatedQty, originalOrderDetailLockQty, splitRecord.IsAutoSplit, splitRecord.SplitQty);
-
- // 妫�鏌ュ苟鏇存柊鎵规鍜岃鍗曠姸鎬�
- await CheckAndUpdateBatchStatus(originalLockInfo.BatchNo);
- await CheckAndUpdateOrderStatus(originalLockInfo.OrderNo);
-
- _logger.LogInformation($"鍙栨秷鎷嗗寘閫昏緫鎵ц瀹屾垚");
}
/// <summary>
/// 楠岃瘉鍙栨秷鎷嗗寘鍚庢暟鎹竴鑷存�� - 鏈�鏂扮増鏈�
@@ -1686,41 +1868,218 @@
/// <summary>
/// 缁熶竴鍥炲簱鏂规硶 - 澶勭悊鎵樼洏涓婃墍鏈夊墿浣欒揣鐗�
/// </summary>
+ //public async Task<WebResponseContent> ExecutePalletReturn(string orderNo, string palletCode, string returnReason = "鍒嗘壒鍥炲簱")
+ //{
+ // try
+ // {
+ // int stockId = 0;
+ // Dt_StockInfo stockInfo = null;
+ // PalletStatusAnalysis statusAnalysis = null;
+ // _unitOfWorkManage.BeginTran();
+
+ // if (string.IsNullOrEmpty(orderNo) || string.IsNullOrEmpty(palletCode))
+ // return WebResponseContent.Instance.Error("璁㈠崟鍙峰拰鎵樼洏鐮佷笉鑳戒负绌�");
+
+ // // 鑾峰彇搴撳瓨淇℃伅
+ // stockInfo = await _stockInfoService.Db.Queryable<Dt_StockInfo>()
+ // .FirstAsync(x => x.PalletCode == palletCode);
+ // if (stockInfo == null)
+ // return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩� {palletCode} 瀵瑰簲鐨勫簱瀛樹俊鎭�");
+
+ // stockId = stockInfo.Id;
+
+ // var beforeValidationResult = await ValidateReturnData(orderNo, palletCode, stockId, true);
+ // if (!beforeValidationResult)
+ // {
+ // _logger.LogWarning("鍥炲簱鍓嶆暟鎹獙璇佸彂鐜伴棶棰橈紝浣嗙户缁墽琛屽洖搴撴搷浣�");
+ // }
+ // _logger.LogInformation($"姝ラ4瀹屾垚: 鍥炲簱鍓嶆暟鎹獙璇亄(beforeValidationResult ? "閫氳繃" : "鍙戠幇闂")}");
+
+
+ // // 鍒嗘瀽鎵樼洏鐘舵��
+ // statusAnalysis = await AnalyzePalletStatusForReturn(orderNo, palletCode, stockInfo.Id);
+ // _logger.LogInformation($"銆愭楠�6銆戞墭鐩樼姸鎬佸垎鏋愬畬鎴�");
+ // _logger.LogInformation($" - 鏄惁鏈夊洖搴撶墿鍝�: {statusAnalysis.HasItemsToReturn}");
+ // _logger.LogInformation($" - 鏄惁绌烘墭鐩�: {statusAnalysis.IsEmptyPallet}");
+ // _logger.LogInformation($" - 鎬诲洖搴撴暟閲�: {statusAnalysis.TotalReturnQty}");
+ // _logger.LogInformation($" - 鏉＄爜鏁伴噺: {statusAnalysis.AllBarcodes.Count}");
+
+ // if (!statusAnalysis.HasItemsToReturn)
+ // {
+ // _logger.LogInformation($"銆愭楠�7銆戞棤鍥炲簱鐗╁搧锛屽鐞嗙┖鎵樼洏");
+ // var result = await HandleEmptyPalletReturn(orderNo, palletCode, stockInfo);
+ // if (result.Status)
+ // {
+ // _unitOfWorkManage.CommitTran();
+ // _logger.LogInformation($"銆愮┖鎵樼洏鍥炲簱鎴愬姛銆戣鍗�: {orderNo}, 鎵樼洏: {palletCode}");
+ // }
+ // else
+ // {
+ // _unitOfWorkManage.RollbackTran();
+ // _logger.LogError($"銆愮┖鎵樼洏鍥炲簱澶辫触銆戝師鍥�: {result.Message}");
+ // }
+ // return result;
+ // }
+
+ // _logger.LogInformation($"寮�濮嬪洖搴撴搷浣� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, 鍥炲簱鏁伴噺: {statusAnalysis.TotalReturnQty}");
+
+ // try
+ // {
+ // // 鎵ц鍥炲簱鏁版嵁鎿嶄綔
+ // await ExecuteReturnDataOperations(statusAnalysis);
+ // }
+ // catch (Exception ex)
+ // {
+ // _logger.LogError($"鍥炲簱鏁版嵁鎿嶄綔澶辫触: {ex.Message}");
+ // try
+ // {
+ // await ExecuteSimpleReturnDataOperations(statusAnalysis);
+ // _logger.LogInformation($"绠�鍖栧洖搴撴暟鎹搷浣滄垚鍔�");
+ // }
+ // catch (Exception simpleEx)
+ // {
+ // _logger.LogError($"绠�鍖栧洖搴撴暟鎹搷浣滀篃澶辫触 - {simpleEx.Message}");
+ // throw new InvalidOperationException($"鍥炲簱鏁版嵁鎿嶄綔澶辫触锛屼富鏂规硶: {ex.Message}, 绠�鍖栨柟娉�: {simpleEx.Message}", ex);
+ // }
+ // }
+
+ // // 鏇存柊璁㈠崟鐘舵��
+ // await UpdateOrderStatusAfterReturn(orderNo);
+
+ // _unitOfWorkManage.CommitTran();
+
+ // _logger.LogInformation($"姝ラ10: 寮�濮嬪洖搴撳悗鏁版嵁楠岃瘉");
+ // var afterValidationResult = await ValidateReturnData(orderNo, palletCode, stockId, false);
+ // if (!afterValidationResult)
+ // {
+ // _logger.LogWarning("鍥炲簱鍚庢暟鎹獙璇佸彂鐜伴棶棰橈紝寤鸿妫�鏌ユ暟鎹竴鑷存��");
+ // }
+ // _logger.LogInformation($"姝ラ10瀹屾垚: 鍥炲簱鍚庢暟鎹獙璇亄(afterValidationResult ? "閫氳繃" : "鍙戠幇闂")}");
+
+ // try
+ // {
+ // await CreateReturnTask(orderNo, palletCode, stockInfo);
+ // _logger.LogInformation($"姝ラ11鎴愬姛: 鍥炲簱浠诲姟鍒涘缓鎴愬姛");
+ // }
+ // catch (Exception taskEx)
+ // {
+ // // 浠诲姟鍒涘缓澶辫触涓嶅奖鍝嶅洖搴撴暟鎹搷浣滅殑鎴愬姛锛屽彧璁板綍閿欒
+ // _logger.LogError($"姝ラ11璀﹀憡: 鍥炲簱浠诲姟鍒涘缓澶辫触 - {taskEx.Message}");
+ // _logger.LogError($"鍥炲簱鏁版嵁鎿嶄綔宸叉垚鍔燂紝浣嗕换鍔″垱寤哄け璐ワ紝鍙兘闇�瑕佹墜鍔ㄥ鐞�");
+ // }
+
+ // _logger.LogInformation($"銆愬洖搴撴垚鍔熴�戣鍗�: {orderNo}, 鎵樼洏: {palletCode}, 鍥炲簱鏁伴噺: {statusAnalysis.TotalReturnQty}");
+
+ // return WebResponseContent.Instance.OK($"鍥炲簱鎿嶄綔鎴愬姛锛屽叡鍥炲簱鏁伴噺锛歿statusAnalysis.TotalReturnQty}", new
+ // {
+ // ReturnQuantity = statusAnalysis.TotalReturnQty,
+ // ReturnBarcodes = statusAnalysis.AllBarcodes,
+ // Reason = returnReason,
+ // PalletCode = palletCode,
+ // OrderNo = orderNo
+ // });
+ // }
+ // catch (Exception ex)
+ // {
+ // _unitOfWorkManage.RollbackTran();
+ // _logger.LogError($"銆愬洖搴撳け璐ャ�戣鍗�: {orderNo}, 鎵樼洏: {palletCode}, 閿欒绫诲瀷: {ex.GetType().Name}");
+ // _logger.LogError($"銆愰敊璇俊鎭�憑ex.Message}");
+ // _logger.LogError($"銆愬爢鏍堜俊鎭�憑ex.StackTrace}");
+
+ // if (ex.InnerException != null)
+ // {
+ // _logger.LogError($"銆愬唴閮ㄩ敊璇�憑ex.InnerException.Message}");
+ // }
+ // return WebResponseContent.Instance.Error($"鍥炲簱鎿嶄綔澶辫触: {ex.Message}");
+ // }
+ //}
+
+ /// <summary>
+ /// 缁熶竴鍥炲簱鏂规硶
+ /// </summary>
public async Task<WebResponseContent> ExecutePalletReturn(string orderNo, string palletCode, string returnReason = "鍒嗘壒鍥炲簱")
{
try
{
+ _logger.LogInformation($"銆愬寮哄洖搴撳紑濮嬨�戣鍗�: {orderNo}, 鎵樼洏: {palletCode}");
+
_unitOfWorkManage.BeginTran();
+ // 1. 鍩虹楠岃瘉
if (string.IsNullOrEmpty(orderNo) || string.IsNullOrEmpty(palletCode))
return WebResponseContent.Instance.Error("璁㈠崟鍙峰拰鎵樼洏鐮佷笉鑳戒负绌�");
- // 鑾峰彇搴撳瓨淇℃伅
+ // 2. 鑾峰彇搴撳瓨淇℃伅
var stockInfo = await _stockInfoService.Db.Queryable<Dt_StockInfo>()
.FirstAsync(x => x.PalletCode == palletCode);
+
if (stockInfo == null)
return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩� {palletCode} 瀵瑰簲鐨勫簱瀛樹俊鎭�");
- // 鍒嗘瀽鎵樼洏鐘舵��
+ int stockId = stockInfo.Id;
+
+ // 3. 鎵ц鍥炲簱鍓嶆暟鎹獙璇�
+ var validationResult = await ValidateDataBeforeReturn(orderNo, palletCode, stockId);
+ if (!validationResult.IsValid)
+ {
+ _logger.LogWarning($"鍥炲簱鍓嶆暟鎹獙璇佸け璐�: {validationResult.ErrorMessage}");
+ // 鍙互鏍规嵁瀹為檯鎯呭喌鍐冲畾鏄惁缁х画
+ }
+
+ // 4. 鍒嗘瀽鎵樼洏鐘舵��
var statusAnalysis = await AnalyzePalletStatusForReturn(orderNo, palletCode, stockInfo.Id);
if (!statusAnalysis.HasItemsToReturn)
- return await HandleEmptyPalletReturn(orderNo, palletCode, stockInfo);
+ {
+ try
+ {
+ _logger.LogInformation($"銆愭棤鍥炲簱鐗╁搧銆戝鐞嗙┖鎵樼洏");
+ var result = await HandleEmptyPalletReturn(orderNo, palletCode, stockInfo);
+ _unitOfWorkManage.CommitTran();
+ return result;
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ _logger.LogError($"绌虹鍥炲簱澶辫触: {ex.Message}");
+ return WebResponseContent.Instance.Error($"绌虹鍥炲簱澶辫触锛歿ex.Message}");
+ }
+ }
- _logger.LogInformation($"寮�濮嬪洖搴撴搷浣� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, 鍥炲簱鏁伴噺: {statusAnalysis.TotalReturnQty}");
+ _logger.LogInformation($"銆愬紑濮嬪洖搴撱�戞�诲洖搴撴暟閲�: {statusAnalysis.TotalReturnQty}, 鏉＄爜鏁�: {statusAnalysis.AllBarcodes.Count}");
- // 鎵ц鍥炲簱鏁版嵁鎿嶄綔
- await ExecuteReturnDataOperations(statusAnalysis);
+ // 5. 鎵ц鍥炲簱鎿嶄綔
+ try
+ {
+ await ExecuteEnhancedReturnOperations(statusAnalysis);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"涓诲洖搴撴柟娉曞け璐�: {ex.Message}");
+ // 灏濊瘯绠�鍖栨柟娉�
+ await ExecuteSimpleReturnDataOperations(statusAnalysis);
+ }
- // 鏇存柊璁㈠崟鐘舵��
+ // 6. 鏇存柊璁㈠崟鐘舵��
await UpdateOrderStatusAfterReturn(orderNo);
_unitOfWorkManage.CommitTran();
- // 鍒涘缓鍥炲簱浠诲姟锛圓GV锛�
- await CreateReturnTask(orderNo, palletCode, stockInfo);
+ // 7. 鍒涘缓鍥炲簱浠诲姟
+ try
+ {
+ await CreateReturnTask(orderNo, palletCode, stockInfo);
+ }
+ catch (Exception taskEx)
+ {
+ _logger.LogError($"鍥炲簱浠诲姟鍒涘缓澶辫触: {taskEx.Message}");
+ // 浠诲姟鍒涘缓澶辫触涓嶅奖鍝嶆暟鎹洖搴�
+ }
+ _unitOfWorkManage.CommitTran();
+ // 8. 鍥炲簱鍚庨獙璇�
+ await ValidateDataAfterReturn(orderNo, palletCode, stockId);
- return WebResponseContent.Instance.OK($"鍥炲簱鎿嶄綔鎴愬姛锛屽叡鍥炲簱鏁伴噺锛歿statusAnalysis.TotalReturnQty}", new
+ return WebResponseContent.Instance.OK($"鍥炲簱鎴愬姛锛屽洖搴撴暟閲忥細{statusAnalysis.TotalReturnQty}", new
{
ReturnQuantity = statusAnalysis.TotalReturnQty,
ReturnBarcodes = statusAnalysis.AllBarcodes,
@@ -1732,13 +2091,306 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- _logger.LogError($"鍥炲簱鎿嶄綔澶辫触 - OrderNo: {orderNo}, PalletCode: {palletCode}, Error: {ex.Message}");
- return WebResponseContent.Instance.Error($"鍥炲簱鎿嶄綔澶辫触: {ex.Message}");
+ _logger.LogError($"鍥炲簱澶辫触: {ex.Message}");
+ return WebResponseContent.Instance.Error($"鍥炲簱澶辫触锛歿ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 澧炲己鐨勫洖搴撳墠鏁版嵁楠岃瘉
+ /// </summary>
+ private async Task<ValidationResult<bool>> ValidateDataBeforeReturn(string orderNo, string palletCode, int stockId)
+ {
+ var errors = new List<string>();
+
+ try
+ {
+ // 1. 楠岃瘉搴撳瓨鏁版嵁
+ var stockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockId)
+ .ToListAsync();
+
+ // 妫�鏌ュ簱瀛樻暟閲忔槸鍚︿负璐熸暟
+ var negativeStocks = stockDetails.Where(x => x.StockQuantity < 0).ToList();
+ if (negativeStocks.Any())
+ {
+ errors.Add($"鍙戠幇璐熸暟搴撳瓨: {string.Join(", ", negativeStocks.Select(x => $"{x.Barcode}:{x.StockQuantity}"))}");
+ }
+
+ // 2. 楠岃瘉閿佸畾璁板綍
+ var lockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
+ .ToListAsync();
+
+ // 妫�鏌ュ凡鎷ｉ�夋暟閲忔槸鍚﹀ぇ浜庡垎閰嶆暟閲�
+ var invalidLocks = lockInfos.Where(x => x.PickedQty > x.AssignQuantity).ToList();
+ if (invalidLocks.Any())
+ {
+ errors.Add($"鍙戠幇宸叉嫞閫夋暟閲忓ぇ浜庡垎閰嶆暟閲忕殑閿佸畾璁板綍");
+ }
+
+ // 3. 楠岃瘉鎷嗗寘璁板綍
+ var splitRecords = await _splitPackageService.Db.Queryable<Dt_SplitPackageRecord>()
+ .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
+ .ToListAsync();
+
+ // 妫�鏌ュ惊鐜媶鍖�
+ var barcodeMap = new Dictionary<string, string>();
+ foreach (var record in splitRecords.Where(x => !x.IsReverted))
+ {
+ if (!barcodeMap.ContainsKey(record.OriginalBarcode))
+ barcodeMap[record.OriginalBarcode] = record.NewBarcode;
+ }
+
+ // 妫�鏌ュ惊鐜紩鐢�
+ foreach (var record in splitRecords)
+ {
+ var current = record.OriginalBarcode;
+ var visited = new HashSet<string>();
+
+ while (barcodeMap.ContainsKey(current))
+ {
+ if (visited.Contains(current))
+ {
+ errors.Add($"鍙戠幇寰幆鎷嗗寘寮曠敤: {record.OriginalBarcode}");
+ break;
+ }
+ visited.Add(current);
+ current = barcodeMap[current];
+ }
+ }
+
+ if (errors.Any())
+ {
+ return ValidationResult<bool>.Error($"鍥炲簱鍓嶆暟鎹獙璇佸彂鐜伴棶棰�: {string.Join("; ", errors)}");
+ }
+
+ return ValidationResult<bool>.Success(true);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"鏁版嵁楠岃瘉澶辫触: {ex.Message}");
+ return ValidationResult<bool>.Error($"鏁版嵁楠岃瘉寮傚父: {ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 鎵ц澧炲己鐨勫洖搴撴搷浣�
+ /// </summary>
+ private async Task ExecuteEnhancedReturnOperations(PalletStatusAnalysis statusAnalysis)
+ {
+ _logger.LogInformation($"鎵ц澧炲己鍥炲簱鎿嶄綔 - 璁㈠崟: {statusAnalysis.OrderNo}, 鎵樼洏: {statusAnalysis.PalletCode}");
+
+ // 澶勭悊宸插垎閰嶇殑閿佸畾璁板綍
+ if (statusAnalysis.HasRemainingLocks)
+ {
+ await HandleAllocatedLocksReturn(statusAnalysis.RemainingLocks);
+ }
+
+ // 澶勭悊鏈垎閰嶇殑閿佸畾璁板綍
+ if (statusAnalysis.HasUnallocatedLocks)
+ {
+ await HandleUnallocatedLocksReturn(statusAnalysis.UnallocatedLocks);
+ }
+
+ // 澶勭悊鏈垎閰嶇殑搴撳瓨璐х墿
+ if (statusAnalysis.HasPalletStockGoods)
+ {
+ await HandleUnallocatedStockReturn(statusAnalysis.PalletStockGoods);
+ }
+
+ // 澶勭悊鎷嗗寘璁板綍
+ if (statusAnalysis.HasSplitRecords)
+ {
+ await HandleSplitRecordsReturn(statusAnalysis.SplitRecords, statusAnalysis.StockId);
+ }
+ }
+
+ /// <summary>
+ /// 鍥炲簱鍚庢暟鎹獙璇�
+ /// </summary>
+ private async Task ValidateDataAfterReturn(string orderNo, string palletCode, int stockId)
+ {
+ try
+ {
+ _logger.LogInformation($"寮�濮嬪洖搴撳悗鏁版嵁楠岃瘉");
+
+ // 1. 楠岃瘉搴撳瓨鐘舵��
+ var stockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockId)
+ .ToListAsync();
+
+ var stillOutboundLocked = stockDetails.Where(x =>
+ x.Status == (int)StockStatusEmun.鍑哄簱閿佸畾 && x.StockQuantity > 0).ToList();
+
+ if (stillOutboundLocked.Any())
+ {
+ _logger.LogWarning($"鍥炲簱鍚庝粛鏈夊嚭搴撻攣瀹氱姸鎬佺殑搴撳瓨: {stillOutboundLocked.Count}涓�");
+ }
+
+ // 2. 楠岃瘉閿佸畾璁板綍鐘舵��
+ var lockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
+ .ToListAsync();
+
+ var notReturnedLocks = lockInfos.Where(x =>
+ x.Status != (int)OutLockStockStatusEnum.宸插洖搴� &&
+ x.Status != (int)OutLockStockStatusEnum.宸插彇璧�).ToList();
+
+ if (notReturnedLocks.Any())
+ {
+ _logger.LogWarning($"鍥炲簱鍚庝粛鏈夋湭鍥炲簱鐘舵�佺殑閿佸畾璁板綍: {notReturnedLocks.Count}鏉�");
+ }
+
+ // 3. 鏁版嵁涓�鑷存�ч獙璇�
+ decimal totalStock = stockDetails.Sum(x => x.StockQuantity);
+ _logger.LogInformation($"鍥炲簱鍚庡簱瀛樻�婚噺: {totalStock}");
+
+ _logger.LogInformation($"鍥炲簱鍚庢暟鎹獙璇佸畬鎴�");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"鍥炲簱鍚庨獙璇佸け璐�: {ex.Message}");
+ }
+ }
+
+
+ /// <summary>
+ /// 楠岃瘉鍥炲簱鍓嶅悗鏁版嵁涓�鑷存��
+ /// </summary>
+ private async Task<bool> ValidateReturnData(string orderNo, string palletCode, int stockId, bool isBefore = true)
+ {
+ string phase = isBefore ? "鍥炲簱鍓�" : "鍥炲簱鍚�";
+ try
+ {
+
+ _logger.LogInformation($"銆恵phase}鏁版嵁楠岃瘉銆戝紑濮� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}");
+
+ // 1. 妫�鏌ュ簱瀛樻槑缁�
+ var stockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockId)
+ .ToListAsync();
+
+ decimal totalStockQty = stockDetails.Sum(x => x.StockQuantity);
+ _logger.LogInformation($"{phase}搴撳瓨鎬婚噺: {totalStockQty}");
+
+ // 2. 妫�鏌ラ攣瀹氳褰�
+ var lockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
+ .ToListAsync();
+
+ // 妫�鏌ラ攣瀹氳褰曠姸鎬佸垎甯�
+ var statusGroups = lockInfos.GroupBy(x => x.Status)
+ .Select(g => new { Status = g.Key, Count = g.Count() })
+ .ToList();
+
+ foreach (var group in statusGroups)
+ {
+ _logger.LogInformation($"{phase}閿佸畾鐘舵�� {GetLockStatusName(group.Status)}: {group.Count} 鏉�");
+ }
+
+ // 3. 鍩烘湰楠岃瘉
+ bool isValid = true;
+
+ // 楠岃瘉1: 濡傛灉閿佸畾璁板綍鐘舵�佷负"鎷ｉ�夊畬鎴�"锛屽搴斿簱瀛樺簲璇ヤ负0
+ var completedLocks = lockInfos.Where(x => x.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�).ToList();
+ foreach (var lockInfo in completedLocks)
+ {
+ if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode))
+ {
+ var stock = stockDetails.FirstOrDefault(x => x.Barcode == lockInfo.CurrentBarcode);
+ if (stock != null && stock.StockQuantity > 0)
+ {
+ _logger.LogWarning($"{phase}楠岃瘉璀﹀憡 - 閿佸畾ID {lockInfo.Id} 鎷ｉ�夊畬鎴愪絾搴撳瓨涓嶄负0: {stock.StockQuantity}");
+ }
+ }
+ }
+
+ // 楠岃瘉2: 搴撳瓨鐘舵�佷竴鑷存��
+ foreach (var stock in stockDetails)
+ {
+ if (stock.Status == (int)StockStatusEmun.鍑哄簱閿佸畾 && stock.StockQuantity == 0)
+ {
+ _logger.LogWarning($"{phase}楠岃瘉璀﹀憡 - 鏉＄爜 {stock.Barcode} 鐘舵�佷负鍑哄簱閿佸畾浣嗗簱瀛樹负0");
+ }
+ }
+
+ _logger.LogInformation($"銆恵phase}鏁版嵁楠岃瘉銆戝畬鎴� - 鐘舵��: {(isValid ? "閫氳繃" : "鏈夎鍛�")}");
+ return isValid;
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"{phase} 鏁版嵁楠岃瘉澶辫触: {ex.Message}");
+ return false;
+ }
+ }
+
+ private string GetLockStatusName(int status)
+ {
+ return status switch
+ {
+ 1 => "鍑哄簱涓�",
+ 2 => "鎷ｉ�夊畬鎴�",
+ 3 => "宸插洖搴�",
+ 4 => "宸插彇璧�",
+ _ => $"鏈煡({status})"
+ };
+ }
+ /// <summary>
+ /// 绠�鍖栧洖搴撴暟鎹搷浣滐紙褰撲富鏂规硶澶辫触鏃朵娇鐢級
+ /// </summary>
+ private async Task ExecuteSimpleReturnDataOperations(PalletStatusAnalysis statusAnalysis)
+ {
+ _logger.LogInformation($"銆愮畝鍖栧洖搴撱�戝紑濮嬫墽琛岀畝鍖栧洖搴撴搷浣�");
+
+ try
+ {
+ // 鑾峰彇璇ユ墭鐩樼殑鎵�鏈夋潯鐮�
+ var allStockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == statusAnalysis.StockId && x.StockQuantity > 0)
+ .ToListAsync();
+
+ _logger.LogInformation($"鎵惧埌 {allStockDetails.Count} 涓湁搴撳瓨鐨勬潯鐮�");
+
+ foreach (var stockDetail in allStockDetails)
+ {
+ // 鎭㈠鎵�鏈夊簱瀛樼姸鎬佷负鍏ュ簱瀹屾垚
+ if (stockDetail.Status == (int)StockStatusEmun.鍑哄簱閿佸畾)
+ {
+ stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+ _logger.LogInformation($"绠�鍖栧洖搴� - 鏉＄爜: {stockDetail.Barcode}, 鏁伴噺: {stockDetail.StockQuantity}");
+ }
+ }
+
+ // 鏇存柊鎵�鏈夐攣瀹氳褰曚负宸插洖搴�
+ var allLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderNo == statusAnalysis.OrderNo &&
+ x.PalletCode == statusAnalysis.PalletCode &&
+ (x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓� ||
+ x.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�))
+ .ToListAsync();
+
+ foreach (var lockInfo in allLocks)
+ {
+ lockInfo.Status = (int)OutLockStockStatusEnum.宸插洖搴�;
+ lockInfo.Operator = App.User.UserName;
+
+ await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
+ _logger.LogInformation($"绠�鍖栧洖搴� - 閿佸畾璁板綍: {lockInfo.Id}");
+ }
+
+ _logger.LogInformation($"銆愮畝鍖栧洖搴撱�戝畬鎴� - 澶勭悊 {allStockDetails.Count} 涓潯鐮�, {allLocks.Count} 鏉￠攣瀹氳褰�");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"绠�鍖栧洖搴撳け璐�: {ex.Message}");
+ throw;
}
}
/// <summary>
- /// 鎵ц鍥炲簱鏁版嵁鎿嶄綔
- /// 纭繚涓嶄細灏嗙敓鎴愮殑鏉＄爜鏁伴噺閿欒缁戝畾鍒伴攣瀹氭暟閲�
+ /// 鎵ц鍥炲簱鏁版嵁鎿嶄綔 - 绠�鍖栫増鏈�
/// </summary>
private async Task ExecuteReturnDataOperations(PalletStatusAnalysis statusAnalysis)
{
@@ -1746,28 +2398,142 @@
try
{
+ // 浣跨敤 HashSet 閬垮厤閲嶅澶勭悊鏉＄爜
+ var processedBarcodes = new HashSet<string>();
+ decimal totalReturnedQty = 0;
+
// 1. 澶勭悊宸插垎閰嶇殑鏈垎鎷ｉ攣瀹氳褰�
if (statusAnalysis.HasRemainingLocks)
{
_logger.LogInformation($"澶勭悊 {statusAnalysis.RemainingLocks.Count} 鏉″凡鍒嗛厤鏈垎鎷ｉ攣瀹氳褰�");
- await HandleAllocatedLocksReturn(statusAnalysis.RemainingLocks);
+
+ foreach (var lockInfo in statusAnalysis.RemainingLocks)
+ {
+ if (string.IsNullOrEmpty(lockInfo.CurrentBarcode) || processedBarcodes.Contains(lockInfo.CurrentBarcode))
+ {
+ _logger.LogInformation($"璺宠繃閲嶅鎴栫┖鏉＄爜鐨勯攣瀹氳褰� - ID: {lockInfo.Id}");
+ continue;
+ }
+
+ // 璁＄畻鍥炲簱鏁伴噺锛堟湭鎷ｉ�夌殑閮ㄥ垎锛�
+ decimal returnQty = lockInfo.AssignQuantity - lockInfo.PickedQty;
+
+ if (returnQty > 0)
+ {
+ _logger.LogInformation($"澶勭悊閿佸畾璁板綍鍥炲簱 - ID: {lockInfo.Id}, 鏉＄爜: {lockInfo.CurrentBarcode}, 鍥炲簱鏁伴噺: {returnQty}");
+
+ // 澶勭悊搴撳瓨
+ await ProcessStockForReturn(lockInfo.CurrentBarcode, statusAnalysis.StockId, returnQty);
+
+ // 鏍囪涓哄凡鍥炲簱
+ lockInfo.Status = (int)OutLockStockStatusEnum.宸插洖搴�;
+ lockInfo.Operator = App.User.UserName;
+
+
+ await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
+
+ // 鍑忓皯璁㈠崟鏄庣粏鐨勫垎閰嶆暟閲�
+ if (lockInfo.OrderDetailId > 0)
+ {
+ var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().FirstAsync(x => x.Id == lockInfo.OrderDetailId);
+ await ReduceOrderDetailAllocation(orderDetail, returnQty);
+ }
+
+ processedBarcodes.Add(lockInfo.CurrentBarcode);
+ totalReturnedQty += returnQty;
+
+ _logger.LogInformation($"閿佸畾璁板綍鍥炲簱瀹屾垚 - ID: {lockInfo.Id}, 鍥炲簱鏁伴噺: {returnQty}");
+ }
+ else
+ {
+ _logger.LogInformation($"閿佸畾璁板綍鏃犻渶鍥炲簱 - ID: {lockInfo.Id}, 宸叉嫞閫夊畬鎴�");
+ }
+ }
}
- // 2. 澶勭悊鏈垎閰嶇殑閿佸畾璁板綍锛堝鑷姩鎷嗗寘浜х敓鐨勶級
- if (statusAnalysis.HasUnallocatedLocks)
- {
- _logger.LogInformation($"澶勭悊 {statusAnalysis.UnallocatedLocks.Count} 鏉℃湭鍒嗛厤閿佸畾璁板綍");
- await HandleUnallocatedLocksReturn(statusAnalysis.UnallocatedLocks);
- }
-
- // 3. 澶勭悊鏈垎閰嶇殑搴撳瓨璐х墿
+ // 2. 澶勭悊鏈垎閰嶇殑搴撳瓨璐х墿
if (statusAnalysis.HasPalletStockGoods)
{
_logger.LogInformation($"澶勭悊 {statusAnalysis.PalletStockGoods.Count} 涓湭鍒嗛厤搴撳瓨璐х墿");
- await HandleUnallocatedStockReturn(statusAnalysis.PalletStockGoods);
+
+ foreach (var stockDetail in statusAnalysis.PalletStockGoods)
+ {
+ if (string.IsNullOrEmpty(stockDetail.Barcode) || processedBarcodes.Contains(stockDetail.Barcode))
+ {
+ _logger.LogInformation($"璺宠繃閲嶅鎴栫┖鏉＄爜鐨勫簱瀛� - 搴撳瓨ID: {stockDetail.Id}");
+ continue;
+ }
+
+ if (stockDetail.StockQuantity > 0)
+ {
+ decimal returnQty = stockDetail.StockQuantity;
+ _logger.LogInformation($"澶勭悊鏈垎閰嶅簱瀛樺洖搴� - 鏉＄爜: {stockDetail.Barcode}, 鍥炲簱鏁伴噺: {returnQty}");
+
+ // 鐩存帴鎭㈠搴撳瓨鐘舵��
+ stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+
+ processedBarcodes.Add(stockDetail.Barcode);
+ totalReturnedQty += returnQty;
+
+ _logger.LogInformation($"鏈垎閰嶅簱瀛樺洖搴撳畬鎴� - 鏉＄爜: {stockDetail.Barcode}, 鏁伴噺: {returnQty}");
+ }
+ }
}
- _logger.LogInformation($"鍥炲簱鏁版嵁鎿嶄綔瀹屾垚 - 鎬诲洖搴撴暟閲�: {statusAnalysis.TotalReturnQty}");
+ // 3. 澶勭悊鎷嗗寘璁板綍鐩稿叧鐨勬潯鐮�
+ if (statusAnalysis.HasSplitRecords)
+ {
+ _logger.LogInformation($"澶勭悊 {statusAnalysis.SplitRecords.Count} 鏉℃媶鍖呰褰�");
+
+ // 鏀堕泦鎷嗗寘鐩稿叧鐨勬墍鏈夋潯鐮�
+ var splitBarcodes = new List<string>();
+ foreach (var splitRecord in statusAnalysis.SplitRecords)
+ {
+ if (!string.IsNullOrEmpty(splitRecord.OriginalBarcode))
+ splitBarcodes.Add(splitRecord.OriginalBarcode);
+ if (!string.IsNullOrEmpty(splitRecord.NewBarcode))
+ splitBarcodes.Add(splitRecord.NewBarcode);
+ }
+
+ // 鍘婚噸
+ splitBarcodes = splitBarcodes.Distinct().ToList();
+
+ foreach (var barcode in splitBarcodes)
+ {
+ if (processedBarcodes.Contains(barcode))
+ {
+ _logger.LogInformation($"鎷嗗寘鏉＄爜宸插鐞�: {barcode}");
+ continue;
+ }
+
+ // 鏌ユ壘搴撳瓨
+ var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == barcode && x.StockId == statusAnalysis.StockId);
+
+ if (stockDetail != null && stockDetail.StockQuantity > 0)
+ {
+ decimal returnQty = stockDetail.StockQuantity;
+ _logger.LogInformation($"澶勭悊鎷嗗寘鐩稿叧搴撳瓨鍥炲簱 - 鏉＄爜: {barcode}, 鍥炲簱鏁伴噺: {returnQty}");
+
+ // 鎭㈠搴撳瓨鐘舵��
+ if (stockDetail.Status == (int)StockStatusEmun.鍑哄簱閿佸畾)
+ {
+ stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+
+ processedBarcodes.Add(barcode);
+ totalReturnedQty += returnQty;
+
+ _logger.LogInformation($"鎷嗗寘搴撳瓨鍥炲簱瀹屾垚 - 鏉＄爜: {barcode}, 鏁伴噺: {returnQty}");
+ }
+ }
+ }
+ }
+
+ _logger.LogInformation($"鍥炲簱鏁版嵁鎿嶄綔瀹屾垚 - 鎬诲洖搴撴暟閲�: {totalReturnedQty}, 澶勭悊鏉＄爜鏁�: {processedBarcodes.Count}");
}
catch (Exception ex)
{
@@ -1775,7 +2541,103 @@
throw;
}
}
- // <summary>
+ /// <summary>
+ /// 澶勭悊搴撳瓨鍥炲簱 - 绠�鍖栭�昏緫
+ /// </summary>
+ private async Task ProcessStockForReturn(string barcode, int stockId, decimal returnQty)
+ {
+ try
+ {
+ var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == barcode && x.StockId == stockId);
+
+ if (stockDetail == null)
+ {
+ _logger.LogWarning($"鏈壘鍒板簱瀛樻槑缁� - 鏉＄爜: {barcode}");
+ return;
+ }
+
+ // 璁板綍鍘熷鍊�
+ decimal originalStockQty = stockDetail.StockQuantity;
+ decimal originalOutboundQty = stockDetail.OutboundQuantity;
+ int originalStatus = stockDetail.Status;
+
+ // 绠�鍖栧鐞嗭細濡傛灉搴撳瓨鏁伴噺澶т簬0锛屾仮澶嶄负鍏ュ簱瀹屾垚鐘舵��
+ if (stockDetail.StockQuantity > 0)
+ {
+ stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+ }
+
+ // 璋冩暣鍑哄簱鏁伴噺锛堥伩鍏嶅嚭鐜拌礋鏁帮級
+ if (stockDetail.OutboundQuantity > 0)
+ {
+ stockDetail.OutboundQuantity = Math.Max(0, stockDetail.OutboundQuantity - returnQty);
+ }
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+
+ _logger.LogInformation($"搴撳瓨鍥炲簱澶勭悊 - 鏉＄爜: {barcode}, 鐘舵��: {originalStatus} -> {stockDetail.Status}, " +
+ $"搴撳瓨: {originalStockQty} -> {stockDetail.StockQuantity}, " +
+ $"鍑哄簱: {originalOutboundQty} -> {stockDetail.OutboundQuantity}");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"澶勭悊搴撳瓨鍥炲簱澶辫触 - 鏉＄爜: {barcode}, Error: {ex.Message}");
+ throw;
+ }
+ }
+ /// <summary>
+ /// 涓洪攣瀹氳褰曞噺灏戣鍗曟槑缁嗙殑鍒嗛厤鏁伴噺
+ /// </summary>
+ private async Task ReduceOrderDetailAllocationForLock(long orderDetailId, decimal reduceQty)
+ {
+ if (orderDetailId <= 0)
+ return;
+
+ var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .FirstAsync(x => x.Id == orderDetailId);
+
+ if (orderDetail == null)
+ return;
+
+ decimal originalAllocated = orderDetail.AllocatedQuantity;
+ decimal originalLock = orderDetail.LockQuantity;
+
+ // 楠岃瘉鍑忓皯鏁伴噺涓嶄細瀵艰嚧璐熸暟
+ if (orderDetail.AllocatedQuantity < reduceQty)
+ {
+ _logger.LogWarning($"鍒嗛厤鏁伴噺涓嶈冻锛岃皟鏁村噺灏戞暟閲� - 鍘熻鍒掑噺灏�: {reduceQty}, 瀹為檯鍙敤: {orderDetail.AllocatedQuantity}");
+ reduceQty = orderDetail.AllocatedQuantity;
+ }
+
+ // 鍑忓皯鍒嗛厤鏁伴噺鍜岄攣瀹氭暟閲�
+ orderDetail.AllocatedQuantity -= reduceQty;
+ orderDetail.LockQuantity -= reduceQty;
+
+ // 纭繚鏁伴噺涓嶄細涓鸿礋鏁�
+ if (orderDetail.AllocatedQuantity < 0)
+ {
+ _logger.LogWarning($"鍒嗛厤鏁伴噺鍑虹幇璐熸暟锛岄噸缃负0銆傚師鍊�: {orderDetail.AllocatedQuantity + reduceQty}, 鍑忓皯: {reduceQty}");
+ orderDetail.AllocatedQuantity = 0;
+ }
+
+ if (orderDetail.LockQuantity < 0)
+ {
+ _logger.LogWarning($"閿佸畾鏁伴噺鍑虹幇璐熸暟锛岄噸缃负0銆傚師鍊�: {orderDetail.LockQuantity + reduceQty}, 鍑忓皯: {reduceQty}");
+ orderDetail.LockQuantity = 0;
+ }
+
+ // 鏇存柊鎵规鍒嗛厤鐘舵��
+ await UpdateBatchAllocateStatus(orderDetail);
+
+ await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();
+
+ _logger.LogInformation($"鍑忓皯璁㈠崟鏄庣粏鍒嗛厤 - OrderDetailId: {orderDetail.Id}, " +
+ $"鍒嗛厤鏁伴噺: {originalAllocated} -> {orderDetail.AllocatedQuantity}, " +
+ $"閿佸畾鏁伴噺: {originalLock} -> {orderDetail.LockQuantity}, " +
+ $"鍑忓皯鏁伴噺: {reduceQty}");
+ }
+
+ /// <summary>
/// 澶勭悊鏈垎閰嶇殑閿佸畾璁板綍鍥炲簱
/// 涓嶉渶瑕佸噺灏戣鍗曟槑缁嗙殑鍒嗛厤鏁伴噺
/// </summary>
@@ -1797,7 +2659,28 @@
_logger.LogInformation($"澶勭悊鏈垎閰嶉攣瀹氳褰曞洖搴� - 閿佸畾ID: {lockInfo.Id}, 鏉＄爜: {lockInfo.CurrentBarcode}, 鍥炲簱鏁伴噺: {returnQty}");
// 鎭㈠搴撳瓨鐘舵��
- await RestoreStockForLockInfo(lockInfo, returnQty);
+ var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId);
+
+ if (stockDetail != null)
+ {
+ // 鎭㈠搴撳瓨鏁伴噺
+ decimal originalStockQty = stockDetail.StockQuantity;
+ stockDetail.StockQuantity += returnQty;
+
+ // 鎭㈠搴撳瓨鐘舵��
+ if (stockDetail.Status == (int)StockStatusEmun.鍑哄簱瀹屾垚)
+ {
+ stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+ }
+ else if (stockDetail.Status == (int)StockStatusEmun.鍑哄簱閿佸畾)
+ {
+ stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+ }
+
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+ _logger.LogInformation($"鎭㈠搴撳瓨 - 鏉＄爜: {stockDetail.Barcode}, 搴撳瓨鏁伴噺: {originalStockQty} -> {stockDetail.StockQuantity}");
+ }
// 鏇存柊閿佸畾璁板綍鐘舵�佷负宸插洖搴�
lockInfo.Status = (int)OutLockStockStatusEnum.宸插洖搴�;
@@ -1806,13 +2689,11 @@
await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
_logger.LogInformation($"鏇存柊鏈垎閰嶉攣瀹氱姸鎬� - 閿佸畾ID: {lockInfo.Id}, 鐘舵��: 鍑哄簱涓� -> 宸插洖搴�");
-
- // 閲嶈锛氭湭鍒嗛厤閿佸畾璁板綍涓嶉渶瑕佸噺灏戣鍗曟槑缁嗙殑鍒嗛厤鏁伴噺
- _logger.LogInformation($"鏈垎閰嶉攣瀹氳褰曞洖搴撳畬鎴� - 閿佸畾ID: {lockInfo.Id}, 鍥炲簱鏁伴噺: {returnQty}, 鏃犻渶鏇存柊璁㈠崟鏄庣粏");
}
_logger.LogInformation($"鏈垎閰嶉攣瀹氳褰曞洖搴撳鐞嗗畬鎴� - 鍏卞鐞� {unallocatedLocks.Count} 鏉¤褰�");
}
+
private async Task HandleAllocatedLocksReturn(List<Dt_OutStockLockInfo> allocatedLocks)
{
_logger.LogInformation($"寮�濮嬪鐞嗗凡鍒嗛厤閿佸畾璁板綍鍥炲簱 - 鍏� {allocatedLocks.Count} 鏉¤褰�");
@@ -1953,7 +2834,7 @@
try
{
await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();
-
+
_logger.LogInformation($"CreateReturnTaskAndHandleESS 鍒嗘壒鍒犻櫎鍘嗗彶浠诲姟: {orderNo} 锛� {currentTask.TaskNum}");
// 鍒犻櫎鍘熷鍑哄簱浠诲姟
//_taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.鑷姩瀹屾垚);
@@ -1971,7 +2852,7 @@
{
_logger.LogInformation($"鍒涘缓鍥炲簱浠诲姟澶辫触 - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}");
throw new Exception($"鍒涘缓鍥炲簱浠诲姟澶辫触 - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}");
-
+
}
// 鍙戦�丒SS鍛戒护
await SendESSCommands(palletCode, targetAddress, returnTask);
@@ -2044,114 +2925,324 @@
/// 鍒嗘瀽鎵樼洏鐘舵�佺敤浜庡洖搴�
/// 纭繚涓嶄細閿欒璇嗗埆闇�瑕佸洖搴撶殑鐗╁搧
/// </summary>
+
+ /// <summary>
+ /// 鍒嗘瀽鎵樼洏鐘舵�佺敤浜庡洖搴� - 瀹屾暣鐗堟湰
+ /// 纭繚涓嶄細閿欒璇嗗埆闇�瑕佸洖搴撶殑鐗╁搧锛岄伩鍏嶉噸澶嶈绠�
+ /// </summary>
private async Task<PalletStatusAnalysis> AnalyzePalletStatusForReturn(string orderNo, string palletCode, int stockId)
{
var result = new PalletStatusAnalysis
{
OrderNo = orderNo,
PalletCode = palletCode,
- StockId = stockId
+ StockId = stockId,
+ AllBarcodes = new List<string>(),
+ RemainingLocks = new List<Dt_OutStockLockInfo>(),
+ UnallocatedLocks = new List<Dt_OutStockLockInfo>(),
+ PalletStockGoods = new List<Dt_StockInfoDetail>(),
+ SplitRecords = new List<Dt_SplitPackageRecord>()
};
- // 1. 鍒嗘瀽鏈垎鎷ｇ殑閿佸畾璁板綍锛堢姸鎬佷负鍑哄簱涓級
- var unfinishedLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.OrderNo == orderNo &&
- x.PalletCode == palletCode &&
- x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
- .ToListAsync();
+ _logger.LogInformation($"寮�濮嬪垎鏋愭墭鐩樼姸鎬佺敤浜庡洖搴� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, StockId: {stockId}");
- if (unfinishedLocks.Any())
+ try
{
- // 鍖哄垎宸插垎閰嶅拰鏈垎閰嶇殑閿佸畾璁板綍
- var allocatedLocks = unfinishedLocks.Where(x => x.IsUnallocated != 1 && x.OrderDetailId > 0).ToList();
- var unallocatedLocks = unfinishedLocks.Where(x => x.IsUnallocated == 1 || x.OrderDetailId == 0).ToList();
-
- // 澶勭悊宸插垎閰嶇殑閿佸畾璁板綍
- if (allocatedLocks.Any())
- {
- result.HasRemainingLocks = true;
- result.RemainingLocks = allocatedLocks;
- result.RemainingLocksReturnQty = allocatedLocks.Sum(x => x.AssignQuantity - x.PickedQty);
-
- foreach (var lockInfo in allocatedLocks)
- {
- if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode))
- {
- result.AllBarcodes.Add(lockInfo.CurrentBarcode);
- }
- }
-
- _logger.LogInformation($"鍙戠幇{allocatedLocks.Count}鏉″凡鍒嗛厤鏈垎鎷ｉ攣瀹氳褰曪紝鎬绘暟閲�: {result.RemainingLocksReturnQty}");
- }
-
- // 澶勭悊鏈垎閰嶇殑閿佸畾璁板綍锛堝鑷姩鎷嗗寘浜х敓鐨勶級
- if (unallocatedLocks.Any())
- {
- result.HasUnallocatedLocks = true;
- result.UnallocatedLocks = unallocatedLocks;
- result.UnallocatedLocksReturnQty = unallocatedLocks.Sum(x => x.AssignQuantity - x.PickedQty);
-
- foreach (var lockInfo in unallocatedLocks)
- {
- if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode))
- {
- result.AllBarcodes.Add(lockInfo.CurrentBarcode);
- }
- }
-
- _logger.LogInformation($"鍙戠幇{unallocatedLocks.Count}鏉℃湭鍒嗛厤閿佸畾璁板綍锛屾�绘暟閲�: {result.UnallocatedLocksReturnQty}");
- }
- }
-
- // 2. 鍒嗘瀽鎵樼洏涓婄殑鍓╀綑搴撳瓨璐х墿锛堢姸鎬佷负鍑哄簱閿佸畾浣嗘湭鍒嗛厤锛�
- var palletStockGoods = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .Where(x => x.StockId == stockId &&
- x.Status == (int)StockStatusEmun.鍑哄簱閿佸畾 &&
- x.StockQuantity > 0)
- .ToListAsync();
-
- // 杩囨护鎺夊凡缁忚閿佸畾璁板綍鍗犵敤鐨勫簱瀛�
- var lockedBarcodes = unfinishedLocks.Select(x => x.CurrentBarcode).ToList();
- var unlockedStockGoods = palletStockGoods.Where(x => !lockedBarcodes.Contains(x.Barcode)).ToList();
-
- // 杩涗竴姝ヨ繃婊わ細妫�鏌ヨ繖浜涘簱瀛樻槸鍚︽湁鍏宠仈鐨勯攣瀹氳褰�
- var trulyUnallocatedGoods = new List<Dt_StockInfoDetail>();
- foreach (var stock in unlockedStockGoods)
- {
- var hasLock = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.CurrentBarcode == stock.Barcode &&
+ // 1. 鍒嗘瀽鎵�鏈夐攣瀹氳褰曪紙鐘舵�佷负鍑哄簱涓級
+ var allUnfinishedLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderNo == orderNo &&
+ x.PalletCode == palletCode &&
x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
- .AnyAsync();
+ .ToListAsync();
- if (!hasLock)
+ if (allUnfinishedLocks.Any())
{
- trulyUnallocatedGoods.Add(stock);
- }
- }
+ _logger.LogInformation($"鎵惧埌 {allUnfinishedLocks.Count} 鏉″嚭搴撲腑鐘舵�佺殑閿佸畾璁板綍");
- if (trulyUnallocatedGoods.Any())
+ // 鍖哄垎宸插垎閰嶅拰鏈垎閰嶇殑閿佸畾璁板綍
+ var allocatedLocks = allUnfinishedLocks
+ .Where(x => x.IsUnallocated != 1 && x.OrderDetailId > 0)
+ .ToList();
+
+ var unallocatedLocks = allUnfinishedLocks
+ .Where(x => x.IsUnallocated == 1 || x.OrderDetailId == 0)
+ .ToList();
+
+ // 澶勭悊宸插垎閰嶇殑閿佸畾璁板綍
+ if (allocatedLocks.Any())
+ {
+ result.HasRemainingLocks = true;
+ result.RemainingLocks = allocatedLocks;
+ result.RemainingLocksReturnQty = allocatedLocks.Sum(x => x.AssignQuantity - x.PickedQty);
+
+ foreach (var lockInfo in allocatedLocks)
+ {
+ if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode))
+ {
+ result.AllBarcodes.Add(lockInfo.CurrentBarcode);
+ }
+ }
+
+ _logger.LogInformation($"鍙戠幇{allocatedLocks.Count}鏉″凡鍒嗛厤鏈垎鎷ｉ攣瀹氳褰曪紝鎬绘暟閲�: {result.RemainingLocksReturnQty}");
+ }
+
+ // 澶勭悊鏈垎閰嶇殑閿佸畾璁板綍锛堝鑷姩鎷嗗寘浜х敓鐨勶級
+ if (unallocatedLocks.Any())
+ {
+ result.HasUnallocatedLocks = true;
+ result.UnallocatedLocks = unallocatedLocks;
+ result.UnallocatedLocksReturnQty = unallocatedLocks.Sum(x => x.AssignQuantity - x.PickedQty);
+
+ foreach (var lockInfo in unallocatedLocks)
+ {
+ if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode))
+ {
+ result.AllBarcodes.Add(lockInfo.CurrentBarcode);
+ }
+ }
+
+ _logger.LogInformation($"鍙戠幇{unallocatedLocks.Count}鏉℃湭鍒嗛厤閿佸畾璁板綍锛屾�绘暟閲�: {result.UnallocatedLocksReturnQty}");
+ }
+ }
+ else
+ {
+ _logger.LogInformation($"鏈壘鍒板嚭搴撲腑鐘舵�佺殑閿佸畾璁板綍");
+ }
+
+ // 2. 鍒嗘瀽鎵樼洏涓婄殑鍓╀綑搴撳瓨璐х墿锛堢姸鎬佷负鍑哄簱閿佸畾浣嗘湭鍒嗛厤锛�
+ var allStockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockId &&
+ x.Status == (int)StockStatusEmun.鍑哄簱閿佸畾 &&
+ x.StockQuantity > 0)
+ .ToListAsync();
+
+ if (allStockDetails.Any())
+ {
+ _logger.LogInformation($"鎵惧埌 {allStockDetails.Count} 涓嚭搴撻攣瀹氱姸鎬佺殑搴撳瓨璐х墿");
+
+ // 杩囨护鎺夊凡缁忚閿佸畾璁板綍鍗犵敤鐨勫簱瀛�
+ var lockedBarcodes = allUnfinishedLocks.Select(x => x.CurrentBarcode).Where(b => !string.IsNullOrEmpty(b)).ToList();
+ var unlockedStockGoods = allStockDetails
+ .Where(x => !lockedBarcodes.Contains(x.Barcode))
+ .ToList();
+
+ _logger.LogInformation($"杩囨护鍚庡墿浣� {unlockedStockGoods.Count} 涓湭琚攣瀹氱殑搴撳瓨璐х墿");
+
+ // 杩涗竴姝ヨ繃婊わ細妫�鏌ヨ繖浜涘簱瀛樻槸鍚︽湁鍏宠仈鐨勯攣瀹氳褰曪紙鍖呮嫭鐘舵�佷笉鏄嚭搴撲腑鐨勶級
+ var trulyUnallocatedGoods = new List<Dt_StockInfoDetail>();
+ foreach (var stock in unlockedStockGoods)
+ {
+ var hasActiveLock = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.CurrentBarcode == stock.Barcode &&
+ (x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓� ||
+ x.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�))
+ .AnyAsync();
+
+ if (!hasActiveLock)
+ {
+ trulyUnallocatedGoods.Add(stock);
+ }
+ else
+ {
+ _logger.LogInformation($"鏉＄爜 {stock.Barcode} 鏈夋椿璺冪殑閿佸畾璁板綍锛岃烦杩囦綔涓烘湭鍒嗛厤搴撳瓨");
+ }
+ }
+
+ if (trulyUnallocatedGoods.Any())
+ {
+ result.HasPalletStockGoods = true;
+ result.PalletStockGoods = trulyUnallocatedGoods;
+ result.PalletStockReturnQty = trulyUnallocatedGoods.Sum(x => x.StockQuantity);
+
+ foreach (var stock in trulyUnallocatedGoods)
+ {
+ result.AllBarcodes.Add(stock.Barcode);
+ }
+
+ _logger.LogInformation($"鍙戠幇{trulyUnallocatedGoods.Count}涓湡姝ｆ湭鍒嗛厤搴撳瓨璐х墿锛屾�绘暟閲�: {result.PalletStockReturnQty}");
+
+ // 璁板綍姣忎釜璐х墿鐨勮缁嗕俊鎭�
+ foreach (var stock in trulyUnallocatedGoods)
+ {
+ _logger.LogInformation($"鏈垎閰嶅簱瀛� - 鏉＄爜: {stock.Barcode}, 鐗╂枡: {stock.MaterielCode}, 鏁伴噺: {stock.StockQuantity}");
+ }
+ }
+ }
+ else
+ {
+ _logger.LogInformation($"鏈壘鍒板嚭搴撻攣瀹氱姸鎬佺殑搴撳瓨璐х墿");
+ }
+
+ // 3. 鍒嗘瀽鎷嗗寘璁板綍锛堢姸鎬佷笉鏄凡鎷ｉ�夊拰宸插洖搴撶殑锛�
+ var splitRecords = await _splitPackageService.Db.Queryable<Dt_SplitPackageRecord>()
+ .Where(x => x.OrderNo == orderNo &&
+ x.PalletCode == palletCode &&
+ !x.IsReverted &&
+ x.Status != (int)SplitPackageStatusEnum.宸叉嫞閫� &&
+ x.Status != (int)SplitPackageStatusEnum.宸插洖搴�)
+ .ToListAsync();
+
+ if (splitRecords.Any())
+ {
+ result.HasSplitRecords = true;
+ result.SplitRecords = splitRecords;
+
+ // 璁＄畻鎷嗗寘璁板綍鐩稿叧鐨勫洖搴撴暟閲忥紙閬垮厤閲嶅璁＄畻锛�
+ var splitBarcodes = new HashSet<string>();
+ decimal splitReturnQty = 0;
+
+ foreach (var splitRecord in splitRecords)
+ {
+ // 鍘熸潯鐮�
+ if (!string.IsNullOrEmpty(splitRecord.OriginalBarcode) && !splitBarcodes.Contains(splitRecord.OriginalBarcode))
+ {
+ var originalStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == splitRecord.OriginalBarcode && x.StockId == stockId);
+
+ if (originalStock != null && originalStock.StockQuantity > 0)
+ {
+ splitReturnQty += originalStock.StockQuantity;
+
+ // 娣诲姞鍒版墍鏈夋潯鐮佸垪琛紙濡傛灉娌℃湁閲嶅锛�
+ if (!result.AllBarcodes.Contains(splitRecord.OriginalBarcode))
+ {
+ result.AllBarcodes.Add(splitRecord.OriginalBarcode);
+ }
+
+ splitBarcodes.Add(splitRecord.OriginalBarcode);
+ _logger.LogInformation($"鎷嗗寘璁板綍 - 鍘熸潯鐮�: {splitRecord.OriginalBarcode}, 鏁伴噺: {originalStock.StockQuantity}");
+ }
+ }
+
+ // 鏂版潯鐮�
+ if (!string.IsNullOrEmpty(splitRecord.NewBarcode) && !splitBarcodes.Contains(splitRecord.NewBarcode))
+ {
+ var newStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == splitRecord.NewBarcode && x.StockId == stockId);
+
+ if (newStock != null && newStock.StockQuantity > 0)
+ {
+ splitReturnQty += newStock.StockQuantity;
+
+ // 娣诲姞鍒版墍鏈夋潯鐮佸垪琛紙濡傛灉娌℃湁閲嶅锛�
+ if (!result.AllBarcodes.Contains(splitRecord.NewBarcode))
+ {
+ result.AllBarcodes.Add(splitRecord.NewBarcode);
+ }
+
+ splitBarcodes.Add(splitRecord.NewBarcode);
+ _logger.LogInformation($"鎷嗗寘璁板綍 - 鏂版潯鐮�: {splitRecord.NewBarcode}, 鏁伴噺: {newStock.StockQuantity}");
+ }
+ }
+
+ // 璁板綍鎷嗗寘淇℃伅
+ _logger.LogInformation($"鎷嗗寘璁板綍 - ID: {splitRecord.Id}, 鍘熸潯鐮�: {splitRecord.OriginalBarcode}, " +
+ $"鏂版潯鐮�: {splitRecord.NewBarcode}, 鎷嗗寘鏁伴噺: {splitRecord.SplitQty}, " +
+ $"鏄惁鑷姩: {splitRecord.IsAutoSplit}, 鏄惁鎾ら攢: {splitRecord.IsReverted}");
+ }
+
+ result.SplitReturnQty = splitReturnQty;
+ _logger.LogInformation($"鍙戠幇{splitRecords.Count}鏉℃媶鍖呰褰曪紝鍏宠仈 {splitBarcodes.Count} 涓潯鐮侊紝鎬绘暟閲�: {splitReturnQty}");
+ }
+ else
+ {
+ _logger.LogInformation($"鏈壘鍒伴渶瑕佸洖搴撶殑鎷嗗寘璁板綍");
+ }
+
+ // 4. 璁＄畻鎬诲洖搴撴暟閲忓拰绌烘墭鐩樼姸鎬�
+ result.TotalReturnQty = result.RemainingLocksReturnQty +
+ result.UnallocatedLocksReturnQty +
+ result.PalletStockReturnQty +
+ result.SplitReturnQty;
+
+ result.HasItemsToReturn = result.TotalReturnQty > 0;
+ result.IsEmptyPallet = !result.HasItemsToReturn;
+
+ // 鍘婚噸鎵�鏈夋潯鐮�
+ result.AllBarcodes = result.AllBarcodes.Distinct().ToList();
+
+ _logger.LogInformation($"鎵樼洏鐘舵�佸垎鏋愬畬鎴� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}");
+ _logger.LogInformation($"姹囨�讳俊鎭�:");
+ _logger.LogInformation($" - 宸插垎閰嶉攣瀹氳褰�: {result.RemainingLocks.Count} 鏉�, 鏁伴噺: {result.RemainingLocksReturnQty}");
+ _logger.LogInformation($" - 鏈垎閰嶉攣瀹氳褰�: {result.UnallocatedLocks.Count} 鏉�, 鏁伴噺: {result.UnallocatedLocksReturnQty}");
+ _logger.LogInformation($" - 鏈垎閰嶅簱瀛樿揣鐗�: {result.PalletStockGoods.Count} 涓�, 鏁伴噺: {result.PalletStockReturnQty}");
+ _logger.LogInformation($" - 鎷嗗寘璁板綍: {result.SplitRecords.Count} 鏉�, 鏁伴噺: {result.SplitReturnQty}");
+ _logger.LogInformation($" - 鎬诲洖搴撴暟閲�: {result.TotalReturnQty}");
+ _logger.LogInformation($" - 鏄惁绌烘墭鐩�: {result.IsEmptyPallet}");
+ _logger.LogInformation($" - 娑夊強鏉＄爜: {string.Join(", ", result.AllBarcodes)}");
+
+ // 5. 棰濆鐨勬暟鎹獙璇�
+ await ValidateAnalysisResults(result, stockId);
+
+ return result;
+ }
+ catch (Exception ex)
{
- result.HasPalletStockGoods = true;
- result.PalletStockGoods = trulyUnallocatedGoods;
- result.PalletStockReturnQty = trulyUnallocatedGoods.Sum(x => x.StockQuantity);
+ _logger.LogError($"鎵樼洏鐘舵�佸垎鏋愬け璐� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, Error: {ex.Message}");
+ throw;
+ }
+ }
- foreach (var stock in trulyUnallocatedGoods)
+ /// <summary>
+ /// 楠岃瘉鍒嗘瀽缁撴灉锛岀‘淇濇暟鎹竴鑷存��
+ /// </summary>
+ private async Task ValidateAnalysisResults(PalletStatusAnalysis analysis, int stockId)
+ {
+ _logger.LogInformation($"寮�濮嬮獙璇佸垎鏋愮粨鏋� - 璁㈠崟: {analysis.OrderNo}, 鎵樼洏: {analysis.PalletCode}");
+
+ try
+ {
+ // 1. 楠岃瘉閿佸畾璁板綍鍜屽簱瀛樻槑缁嗙殑鍖归厤
+ foreach (var lockInfo in analysis.RemainingLocks.Concat(analysis.UnallocatedLocks))
{
- result.AllBarcodes.Add(stock.Barcode);
+ if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode))
+ {
+ var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId);
+
+ if (stockDetail == null)
+ {
+ _logger.LogWarning($"閿佸畾璁板綍 {lockInfo.Id} 鐨勬潯鐮� {lockInfo.CurrentBarcode} 鍦ㄥ簱瀛樻槑缁嗕腑涓嶅瓨鍦�");
+ }
+ else if (stockDetail.StockQuantity <= 0)
+ {
+ _logger.LogWarning($"閿佸畾璁板綍 {lockInfo.Id} 鐨勬潯鐮� {lockInfo.CurrentBarcode} 搴撳瓨鏁伴噺涓�0鎴栬礋鏁�");
+ }
+ }
}
- _logger.LogInformation($"鍙戠幇{trulyUnallocatedGoods.Count}涓湡姝ｆ湭鍒嗛厤搴撳瓨璐х墿锛屾�绘暟閲�: {result.PalletStockReturnQty}");
+ // 2. 楠岃瘉鎬诲洖搴撴暟閲忕殑鍚堢悊鎬�
+ // 鑾峰彇鎵樼洏涓婄殑鎬诲簱瀛樻暟閲�
+ var totalStockOnPallet = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockId)
+ .SumAsync(x => x.StockQuantity);
+
+ if (analysis.TotalReturnQty > totalStockOnPallet)
+ {
+ _logger.LogWarning($"鎬诲洖搴撴暟閲� {analysis.TotalReturnQty} 澶т簬鎵樼洏鎬诲簱瀛� {totalStockOnPallet}锛屽彲鑳藉瓨鍦ㄨ绠楅敊璇�");
+ }
+
+ // 3. 楠岃瘉鏉＄爜鐨勫敮涓�鎬�
+ var duplicateBarcodes = analysis.AllBarcodes
+ .GroupBy(x => x)
+ .Where(g => g.Count() > 1)
+ .Select(g => g.Key)
+ .ToList();
+
+ if (duplicateBarcodes.Any())
+ {
+ _logger.LogWarning($"鍙戠幇閲嶅鐨勬潯鐮�: {string.Join(", ", duplicateBarcodes)}");
+ }
+
+ _logger.LogInformation($"鍒嗘瀽缁撴灉楠岃瘉瀹屾垚");
}
-
- // 3. 璁＄畻鎬诲洖搴撴暟閲�
- result.TotalReturnQty = result.RemainingLocksReturnQty + result.UnallocatedLocksReturnQty + result.PalletStockReturnQty;
- result.HasItemsToReturn = result.TotalReturnQty > 0;
- result.IsEmptyPallet = !result.HasItemsToReturn;
-
- _logger.LogInformation($"鎵樼洏鐘舵�佸垎鏋愬畬鎴� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, 鎬诲洖搴撴暟閲�: {result.TotalReturnQty}");
-
- return result;
+ catch (Exception ex)
+ {
+ _logger.LogError($"鍒嗘瀽缁撴灉楠岃瘉澶辫触 - Error: {ex.Message}");
+ // 涓嶆姏鍑哄紓甯革紝鍙褰曢敊璇�
+ }
}
+
/// <summary>
/// 澶勭悊鏈垎鎷ｇ殑閿佸畾璁板綍鍥炲簱
/// 纭繚涓嶄細閿欒缁戝畾鏉＄爜鏁伴噺鍒伴攣瀹氭暟閲�
@@ -2408,44 +3499,73 @@
}
/// <summary>
- /// 鍙栬蛋绌虹 - 鍏堟墽琛屽洖搴撳啀娓呯悊 - 澧炲己鐗堟湰
+ /// 鍙栬蛋绌虹 - 鍏堟墽琛屽洖搴撳啀娓呯悊
/// </summary>
public async Task<WebResponseContent> RemoveEmptyPallet(string orderNo, string palletCode)
{
try
{
+ _logger.LogInformation($"銆愬彇璧扮┖绠卞紑濮嬨�戣鍗�: {orderNo}, 鎵樼洏: {palletCode}");
+
_unitOfWorkManage.BeginTran();
- _logger.LogInformation($"寮�濮嬪彇璧扮┖绠� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}");
+ // 1. 鍏堝皾璇曟墽琛屽洖搴撴搷浣滐紝纭繚鎵�鏈夌墿鍝侀兘鍥炲簱
+ _logger.LogInformation($"姝ラ1: 鍏堟墽琛屽洖搴撴搷浣�");
+ var returnResult = await ExecutePalletReturn(orderNo, palletCode, "鍙栬蛋绌虹鍓嶅洖搴�");
+ if (!returnResult.Status)
+ {
+ // 鍥炲簱澶辫触锛屽彲鑳芥槸绌烘墭鐩樻垨鑰呮湁鍏朵粬闂
+ _logger.LogWarning($"鍥炲簱鎿嶄綔澶辫触: {returnResult.Message}");
- // 1. 楠岃瘉绌虹鍙栬蛋鏉′欢锛堝繀椤诲叏閮ㄥ畬鎴愭嫞閫夛級
+ // 缁х画楠岃瘉绌虹鍙栬蛋鏉′欢
+ }
+
+ // 2. 楠岃瘉绌虹鍙栬蛋鏉′欢锛堝繀椤诲叏閮ㄥ畬鎴愭嫞閫夛級
+ _logger.LogInformation($"姝ラ2: 楠岃瘉绌虹鍙栬蛋鏉′欢");
var validationResult = await ValidateEmptyPalletRemoval(orderNo, palletCode);
if (!validationResult.IsValid)
{
_unitOfWorkManage.RollbackTran();
+ _logger.LogError($"绌虹楠岃瘉澶辫触: {validationResult.ErrorMessage}");
return WebResponseContent.Instance.Error(validationResult.ErrorMessage);
}
var completedLocks = validationResult.Data;
+ _logger.LogInformation($"楠岃瘉閫氳繃锛屾壘鍒� {completedLocks.Count} 鏉″凡瀹屾垚璁板綍");
- // 2. 娓呯悊宸插畬鎴愮殑閿佸畾璁板綍锛堟爣璁颁负宸插彇璧帮級
- await CleanupCompletedLocks(completedLocks);
+ // 3. 娓呯悊宸插畬鎴愮殑閿佸畾璁板綍锛堟爣璁颁负宸插彇璧帮級
+ _logger.LogInformation($"姝ラ3: 娓呯悊閿佸畾璁板綍");
+ foreach (var lockInfo in completedLocks)
+ {
+ // 鍙鐞嗙姸鎬佷负鎷ｉ�夊畬鎴愮殑璁板綍锛堝凡鍙栬蛋鐨勮烦杩囷級
+ if (lockInfo.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�)
+ {
+ // 鏍囪閿佸畾璁板綍涓哄凡鍙栬蛋
+ lockInfo.Status = (int)OutLockStockStatusEnum.宸插彇璧�;
+ lockInfo.Operator = App.User.UserName;
+ await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
+ _logger.LogInformation($"閿佸畾璁板綍鏍囪涓哄凡鍙栬蛋 - ID: {lockInfo.Id}");
+ }
+ }
- // 3. 娓呯悊瀵瑰簲鐨勫簱瀛樿褰曠姸鎬�
+ // 4. 娓呯悊瀵瑰簲鐨勫簱瀛樿褰曠姸鎬�
+ _logger.LogInformation($"姝ラ4: 娓呯悊搴撳瓨璁板綍");
foreach (var lockInfo in completedLocks)
{
await CleanupStockInfo(lockInfo);
}
- // 4. 鏇存柊鐩稿叧璁㈠崟鐘舵��
+ // 5. 鏇存柊鐩稿叧璁㈠崟鐘舵��
+ _logger.LogInformation($"姝ラ5: 鏇存柊璁㈠崟鐘舵��");
await UpdateOrderStatusAfterPalletRemoval(orderNo);
- // 5. 璁板綍鎿嶄綔鍘嗗彶
+ // 6. 璁板綍鎿嶄綔鍘嗗彶
+ _logger.LogInformation($"姝ラ6: 璁板綍鎿嶄綔鍘嗗彶");
await RecordEmptyPalletRemoval(orderNo, palletCode, completedLocks);
_unitOfWorkManage.CommitTran();
- _logger.LogInformation($"鍙栬蛋绌虹鎴愬姛 - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}");
+ _logger.LogInformation($"銆愬彇璧扮┖绠辨垚鍔熴�戣鍗�: {orderNo}, 鎵樼洏: {palletCode}");
return WebResponseContent.Instance.OK("鍙栬蛋绌虹鎴愬姛");
}
@@ -2718,6 +3838,359 @@
}
}
+ /// <summary>
+ /// 鏀堕泦闇�瑕佸洖搴撶殑鏉＄爜锛堥伩鍏嶉噸澶嶏級
+ /// </summary>
+ private async Task<HashSet<string>> CollectBarcodesForReturn(string orderNo, string palletCode, int stockId)
+ {
+ var barcodes = new HashSet<string>();
+
+ try
+ {
+ _logger.LogInformation($"寮�濮嬫敹闆嗗洖搴撴潯鐮� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, StockId: {stockId}");
+
+ // 1. 浠庨攣瀹氳褰曟敹闆�
+ var lockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderNo == orderNo &&
+ x.PalletCode == palletCode &&
+ (x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�
+ // || x.Status == (int)OutLockStockStatusEnum.鍑哄簱閿佸畾)
+ ))
+ .ToListAsync();
+
+ foreach (var lockInfo in lockInfos)
+ {
+ if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode))
+ {
+ barcodes.Add(lockInfo.CurrentBarcode);
+ _logger.LogInformation($"浠庨攣瀹氳褰曟坊鍔犳潯鐮�: {lockInfo.CurrentBarcode}");
+ }
+ }
+
+ // 2. 浠庡簱瀛樻槑缁嗘敹闆嗭紙鐘舵�佷负鍑哄簱閿佸畾鐨勶級
+ var stockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockId &&
+ x.Status == (int)StockStatusEmun.鍑哄簱閿佸畾 &&
+ x.StockQuantity > 0)
+ .ToListAsync();
+
+ foreach (var stockDetail in stockDetails)
+ {
+ if (!barcodes.Contains(stockDetail.Barcode) && !string.IsNullOrEmpty(stockDetail.Barcode))
+ {
+ barcodes.Add(stockDetail.Barcode);
+ _logger.LogInformation($"浠庡簱瀛樻槑缁嗘坊鍔犳潯鐮�: {stockDetail.Barcode}, 鏁伴噺: {stockDetail.StockQuantity}");
+ }
+ }
+
+ // 3. 浠庢媶鍖呰褰曟敹闆�
+ var splitRecords = await _splitPackageService.Db.Queryable<Dt_SplitPackageRecord>()
+ .Where(x => x.OrderNo == orderNo &&
+ x.PalletCode == palletCode &&
+ !x.IsReverted &&
+ x.Status != (int)SplitPackageStatusEnum.宸叉嫞閫�)
+ .ToListAsync();
+
+ foreach (var splitRecord in splitRecords)
+ {
+ // 娣诲姞鍘熸潯鐮�
+ if (!string.IsNullOrEmpty(splitRecord.OriginalBarcode) && !barcodes.Contains(splitRecord.OriginalBarcode))
+ {
+ barcodes.Add(splitRecord.OriginalBarcode);
+ _logger.LogInformation($"浠庢媶鍖呰褰曟坊鍔犲師鏉＄爜: {splitRecord.OriginalBarcode}");
+ }
+
+ // 娣诲姞鏂版潯鐮�
+ if (!string.IsNullOrEmpty(splitRecord.NewBarcode) && !barcodes.Contains(splitRecord.NewBarcode))
+ {
+ barcodes.Add(splitRecord.NewBarcode);
+ _logger.LogInformation($"浠庢媶鍖呰褰曟坊鍔犳柊鏉＄爜: {splitRecord.NewBarcode}");
+ }
+ }
+
+ _logger.LogInformation($"鏉＄爜鏀堕泦瀹屾垚 - 鍏� {barcodes.Count} 涓潯鐮�: {string.Join(", ", barcodes)}");
+
+ return barcodes;
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"鏀堕泦鍥炲簱鏉＄爜澶辫触 - Error: {ex.Message}");
+ return barcodes;
+ }
+ }
+
+ /// <summary>
+ /// 缁熶竴澶勭悊鏉＄爜鍥炲簱锛堥伩鍏嶉噸澶嶅鐞嗭級
+ /// </summary>
+ private async Task ProcessBarcodeReturn(string barcode, int stockId, decimal returnQty, HashSet<string> processedBarcodes)
+ {
+ if (returnQty <= 0)
+ return;
+
+ // 妫�鏌ユ槸鍚﹀凡澶勭悊杩�
+ if (processedBarcodes.Contains(barcode))
+ {
+ _logger.LogInformation($"璺宠繃宸插鐞嗙殑鏉＄爜: {barcode}");
+ return;
+ }
+
+ // 鑾峰彇搴撳瓨鏄庣粏
+ var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == barcode && x.StockId == stockId);
+
+ if (stockDetail == null)
+ {
+ _logger.LogWarning($"鏈壘鍒版潯鐮佸搴旂殑搴撳瓨鏄庣粏: {barcode}");
+ return;
+ }
+
+ // 璁板綍鍘熷鍊�
+ decimal originalStockQty = stockDetail.StockQuantity;
+ decimal originalOutboundQty = stockDetail.OutboundQuantity;
+ int originalStatus = stockDetail.Status;
+
+ _logger.LogInformation($"澶勭悊鏉＄爜鍥炲簱 - {barcode}: 鍘熷搴撳瓨={originalStockQty}, 鍘熷鍑哄簱={originalOutboundQty}, 鐘舵��={originalStatus}");
+
+ // 楠岃瘉鏁版嵁涓�鑷存��
+ if (originalOutboundQty < returnQty)
+ {
+ _logger.LogWarning($"鍑哄簱鏁伴噺灏忎簬鍥炲簱鏁伴噺锛岃皟鏁村洖搴撴暟閲� - 鏉＄爜: {barcode}, 鍑哄簱鏁伴噺: {originalOutboundQty}, 鍥炲簱鏁伴噺: {returnQty}");
+ returnQty = originalOutboundQty;
+ }
+
+ // 鏇存柊搴撳瓨锛氬嚭搴撴暟閲忓噺灏戯紝搴撳瓨鏁伴噺澧炲姞
+ stockDetail.OutboundQuantity -= returnQty;
+ stockDetail.StockQuantity += returnQty;
+
+ // 纭繚涓嶄細鍑虹幇璐熸暟
+ if (stockDetail.OutboundQuantity < 0)
+ {
+ _logger.LogWarning($"鍑哄簱鏁伴噺鍑虹幇璐熸暟锛岄噸缃负0 - 鏉＄爜: {barcode}");
+ stockDetail.OutboundQuantity = 0;
+ }
+
+ // 鏇存柊鐘舵��
+ if (stockDetail.OutboundQuantity <= 0 && stockDetail.StockQuantity > 0)
+ {
+ stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+ _logger.LogInformation($"搴撳瓨鐘舵�佹洿鏂颁负鍏ュ簱瀹屾垚 - 鏉＄爜: {barcode}");
+ }
+ else if (stockDetail.StockQuantity > 0)
+ {
+ stockDetail.Status = (int)StockStatusEmun.鍑哄簱閿佸畾;
+ _logger.LogInformation($"搴撳瓨鐘舵�佷繚鎸佷负鍑哄簱閿佸畾 - 鏉＄爜: {barcode}");
+ }
+
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+
+ // 鏍囪涓哄凡澶勭悊
+ processedBarcodes.Add(barcode);
+
+ _logger.LogInformation($"鏉＄爜鍥炲簱瀹屾垚 - {barcode}: " +
+ $"搴撳瓨 {originalStockQty} -> {stockDetail.StockQuantity}, " +
+ $"鍑哄簱 {originalOutboundQty} -> {stockDetail.OutboundQuantity}, " +
+ $"鐘舵�� {originalStatus} -> {stockDetail.Status}");
+ }
+
+ /// <summary>
+ /// 澶勭悊鎷嗗寘璁板綍鍥炲簱 - 閬垮厤閲嶅
+ /// </summary>
+ private async Task HandleSplitRecordsReturn(List<Dt_SplitPackageRecord> splitRecords, int stockId, HashSet<string> processedBarcodes)
+ {
+ if (!splitRecords.Any())
+ return;
+
+ _logger.LogInformation($"寮�濮嬪鐞嗘媶鍖呰褰曞洖搴� - 鍏� {splitRecords.Count} 鏉¤褰�");
+
+ foreach (var splitRecord in splitRecords)
+ {
+ // 鍙鐞嗘湭鎾ら攢鐨勬媶鍖呰褰�
+ if (splitRecord.IsReverted)
+ {
+ _logger.LogInformation($"璺宠繃宸叉挙閿�鐨勬媶鍖呰褰� - ID: {splitRecord.Id}");
+ continue;
+ }
+
+ // 澶勭悊鏂版潯鐮�
+ if (!string.IsNullOrEmpty(splitRecord.NewBarcode) && !processedBarcodes.Contains(splitRecord.NewBarcode))
+ {
+ var newStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == splitRecord.NewBarcode && x.StockId == stockId);
+
+ if (newStock != null && newStock.StockQuantity > 0)
+ {
+ // 鎷嗗寘鐨勬柊鏉＄爜鍥炲簱鏁伴噺搴旇鏄叾搴撳瓨鏁伴噺
+ await ProcessBarcodeReturn(splitRecord.NewBarcode, stockId, newStock.StockQuantity, processedBarcodes);
+ }
+ }
+
+ // 澶勭悊鍘熸潯鐮�
+ if (!string.IsNullOrEmpty(splitRecord.OriginalBarcode) && !processedBarcodes.Contains(splitRecord.OriginalBarcode))
+ {
+ var originalStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == splitRecord.OriginalBarcode && x.StockId == stockId);
+
+ if (originalStock != null && originalStock.StockQuantity > 0)
+ {
+ // 鍘熸潯鐮佺殑鍥炲簱鏁伴噺搴旇鏄媶鍖呭悗鍓╀綑鐨勬暟閲�
+ await ProcessBarcodeReturn(splitRecord.OriginalBarcode, stockId, originalStock.StockQuantity, processedBarcodes);
+ }
+ }
+
+ // 鏇存柊鎷嗗寘璁板綍鐘舵�佷负宸插洖搴�
+ splitRecord.Status = (int)SplitPackageStatusEnum.宸插洖搴�;
+ await _splitPackageService.Db.Updateable(splitRecord).ExecuteCommandAsync();
+
+ _logger.LogInformation($"鎷嗗寘璁板綍鐘舵�佹洿鏂颁负宸插洖搴� - 璁板綍ID: {splitRecord.Id}");
+ }
+
+ _logger.LogInformation($"鎷嗗寘璁板綍鍥炲簱澶勭悊瀹屾垚");
+ }
+
+ /// <summary>
+ /// 绠�鍖栫増鍥炲簱鏂规硶 - 缁曡繃澶嶆潅楠岃瘉
+ /// </summary>
+ public async Task<WebResponseContent> SimplePalletReturn(string orderNo, string palletCode, string returnReason = "绠�鍖栧洖搴�")
+ {
+ try
+ {
+ _logger.LogInformation($"銆愮畝鍖栧洖搴撳紑濮嬨�戣鍗�: {orderNo}, 鎵樼洏: {palletCode}");
+
+ _unitOfWorkManage.BeginTran();
+
+ // 1. 鑾峰彇搴撳瓨淇℃伅锛堣烦杩囧鏉傞獙璇侊級
+ var stockInfo = await _stockInfoService.Db.Queryable<Dt_StockInfo>()
+ .FirstAsync(x => x.PalletCode == palletCode);
+
+ if (stockInfo == null)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩� {palletCode} 瀵瑰簲鐨勫簱瀛樹俊鎭�");
+ }
+
+ // 2. 鐩存帴鏌ユ壘闇�瑕佸洖搴撶殑鏉＄爜锛堢畝鍖栭�昏緫锛�
+ var barcodesToReturn = await GetBarcodesForSimpleReturn(orderNo, palletCode, stockInfo.Id);
+
+ if (!barcodesToReturn.Any())
+ {
+ try
+ {
+ _logger.LogInformation($"銆愭棤鍥炲簱鐗╁搧銆戝鐞嗙┖鎵樼洏");
+ var result = await HandleEmptyPalletReturn(orderNo, palletCode, stockInfo);
+ _unitOfWorkManage.CommitTran();
+ return result;
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ _logger.LogError($"绌虹鍥炲簱澶辫触: {ex.Message}");
+ return WebResponseContent.Instance.Error($"绌虹鍥炲簱澶辫触锛歿ex.Message}");
+ }
+ }
+
+ // 3. 绠�鍖栧鐞嗘瘡涓潯鐮�
+ foreach (var barcode in barcodesToReturn)
+ {
+ await ProcessSimpleBarcodeReturn(barcode, stockInfo.Id);
+ }
+
+ // 4. 鏇存柊璁㈠崟鐘舵�侊紙绠�鍖栵級
+ await UpdateOrderStatusAfterReturn(orderNo);
+
+
+ // 5. 鍒涘缓鍥炲簱浠诲姟
+ await CreateReturnTask(orderNo, palletCode, stockInfo);
+
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK($"绠�鍖栧洖搴撴垚鍔燂紝澶勭悊 {barcodesToReturn.Count} 涓潯鐮�");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ _logger.LogError($"绠�鍖栧洖搴撳け璐�: {ex.Message}");
+ return WebResponseContent.Instance.Error($"鍥炲簱澶辫触: {ex.Message}");
+ }
+ }
+ /// <summary>
+ /// 绠�鍖栬幏鍙栧洖搴撴潯鐮�
+ /// </summary>
+ private async Task<List<string>> GetBarcodesForSimpleReturn(string orderNo, string palletCode, int stockId)
+ {
+ var barcodes = new List<string>();
+
+ try
+ {
+ // 1. 浠庨攣瀹氳褰曡幏鍙�
+ var lockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
+ .Select(x => x.CurrentBarcode)
+ .ToListAsync();
+
+ barcodes.AddRange(lockInfos.Where(b => !string.IsNullOrEmpty(b)));
+
+ // 2. 浠庡簱瀛樻槑缁嗚幏鍙�
+ var stockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockId && x.StockQuantity > 0)
+ .Select(x => x.Barcode)
+ .ToListAsync();
+
+ barcodes.AddRange(stockDetails.Where(b => !string.IsNullOrEmpty(b)));
+
+ // 鍘婚噸
+ return barcodes.Distinct().ToList();
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"鑾峰彇鍥炲簱鏉＄爜澶辫触: {ex.Message}");
+ return barcodes;
+ }
+ }
+
+ /// <summary>
+ /// 绠�鍖栧鐞嗘潯鐮佸洖搴�
+ /// </summary>
+ private async Task ProcessSimpleBarcodeReturn(string barcode, int stockId)
+ {
+ try
+ {
+ // 1. 鑾峰彇搴撳瓨鏄庣粏
+ var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == barcode && x.StockId == stockId);
+
+ if (stockDetail == null)
+ {
+ _logger.LogWarning($"鏈壘鍒版潯鐮佸搴旂殑搴撳瓨鏄庣粏: {barcode}");
+ return;
+ }
+
+ // 2. 濡傛灉鏄嚭搴撻攣瀹氱姸鎬侊紝鎭㈠涓哄叆搴撳畬鎴�
+ if (stockDetail.Status == (int)StockStatusEmun.鍑哄簱閿佸畾)
+ {
+ stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+ _logger.LogInformation($"鏉＄爜鐘舵�佹仮澶� - {barcode}: 鍑哄簱閿佸畾 -> 鍏ュ簱瀹屾垚");
+ }
+
+ // 3. 鏇存柊鐩稿叧鐨勯攣瀹氳褰�
+ var lockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.CurrentBarcode == barcode &&
+ (x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓� ||
+ x.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�))
+ .ToListAsync();
+
+ foreach (var lockInfo in lockInfos)
+ {
+ lockInfo.Status = (int)OutLockStockStatusEnum.宸插洖搴�;
+ lockInfo.Operator = App.User.UserName;
+ await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
+ _logger.LogInformation($"閿佸畾璁板綍鐘舵�佹洿鏂� - ID: {lockInfo.Id}: 宸插洖搴�");
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"澶勭悊鏉＄爜鍥炲簱澶辫触 - 鏉＄爜: {barcode}, Error: {ex.Message}");
+ }
+ }
#endregion
#region 杈呭姪鏂规硶
@@ -2956,12 +4429,13 @@
return splitResult;
}
+
/// <summary>
/// 鎵ц鑷姩鎷嗗寘閫昏緫
/// 纭繚鑷姩鎷嗗寘涓嶄細褰卞搷鍥炲簱閫昏緫
/// </summary>
private async Task<List<SplitResult>> ExecuteAutoSplitLogic(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail,
- decimal splitQuantity, string palletCode)
+ decimal splitQuantity, string palletCode)
{
_logger.LogInformation($"寮�濮嬫墽琛岃嚜鍔ㄦ媶鍖呴�昏緫 - 鍘熸潯鐮�: {stockDetail.Barcode}, 鎷嗗寘鏁伴噺: {splitQuantity}");
@@ -3001,6 +4475,7 @@
BusinessType = stockDetail.BusinessType,
InboundOrderRowNo = stockDetail.InboundOrderRowNo,
};
+
await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
_logger.LogInformation($"鍒涘缓鏂板簱瀛樻槑缁� - 鏉＄爜: {newBarcode}, 搴撳瓨鏁伴噺: {splitQuantity}");
@@ -3038,8 +4513,24 @@
await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();
_logger.LogInformation($"鍒涘缓鏂伴攣瀹氫俊鎭� - 鏉＄爜: {newBarcode}, 鍒嗛厤鏁伴噺: {splitQuantity}, 鏍囪涓烘湭鍒嗛厤");
- // 鑷姩鎷嗗寘涓嶆敼鍙樿鍗曟槑缁嗙殑鍒嗛厤鏁伴噺
- _logger.LogInformation($"鑷姩鎷嗗寘 - 璁㈠崟鏄庣粏鍒嗛厤鏁伴噺淇濇寔涓嶅彉");
+ // 閲嶈锛氳嚜鍔ㄦ媶鍖呴渶瑕佸鍔犺鍗曟槑缁嗙殑鍒嗛厤鏁伴噺鍜岄攣瀹氭暟閲�
+ var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .FirstAsync(x => x.Id == lockInfo.OrderDetailId);
+
+ if (orderDetail != null)
+ {
+ decimal originalAllocated = orderDetail.AllocatedQuantity;
+ decimal originalLock = orderDetail.LockQuantity;
+
+ orderDetail.AllocatedQuantity += splitQuantity;
+ orderDetail.LockQuantity += splitQuantity;
+
+ await UpdateBatchAllocateStatus(orderDetail);
+ await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();
+
+ _logger.LogInformation($"鑷姩鎷嗗寘澧炲姞璁㈠崟鏄庣粏鍒嗛厤 - 鍒嗛厤鏁伴噺: {originalAllocated} -> {orderDetail.AllocatedQuantity}, " +
+ $"閿佸畾鏁伴噺: {originalLock} -> {orderDetail.LockQuantity}");
+ }
// 璁板綍鎷嗗寘鍘嗗彶
await RecordSplitHistory(lockInfo, stockDetail, splitQuantity, newBarcode, true, stockDetail.StockQuantity);
@@ -3513,7 +5004,7 @@
_logger.LogInformation($"CreateReturnTaskAndHandleESS 鍒嗘壒鍒犻櫎鍘嗗彶浠诲姟: {orderNo} 锛� {originalTask.TaskNum}");
// 鍒犻櫎鍘熷鍑哄簱浠诲姟
//_taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.鑷姩瀹屾垚);
- var result= _task_HtyService.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.浜哄伐鍒犻櫎);
+ var result = _task_HtyService.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.浜哄伐鍒犻櫎);
await _taskRepository.Db.Deleteable(originalTask).ExecuteCommandAsync();
if (!result)
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/OutboundPickingService.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/OutboundPickingService.cs"
index 36a8202..c4ebaba 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/OutboundPickingService.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/OutboundPickingService.cs"
@@ -305,9 +305,25 @@
var statusAnalysis = await AnalyzePalletStatus(orderNo, palletCode, stockInfo.Id);
if (!statusAnalysis.HasItemsToReturn)
{
- var result = await HandleNoReturnItems(orderNo, palletCode, task, stockInfo.Id);
- _unitOfWorkManage.CommitTran();
- return result;
+ try
+ {
+ var result = await HandleNoReturnItems(orderNo, palletCode, task, stockInfo.Id);
+ _unitOfWorkManage.CommitTran();
+ if (result.Status)
+ {
+ task.PalletType = PalletTypeEnum.Empty.ObjToInt();
+ await CreateReturnTaskAndHandleESS(orderNo, palletCode, task, TaskTypeEnum.InEmpty, PalletTypeEnum.Empty.ObjToInt());
+ }
+ return result;
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ _logger.LogError($"ReturnRemaining 鍥炲簱绌虹澶辫触 - OrderNo: {orderNo}, PalletCode: {palletCode}, Error: {ex.Message}");
+ return WebResponseContent.Instance.Error($"鍥炲簱绌虹鎿嶄綔澶辫触: {ex.Message}");
+ }
+
+
}
// 4. 妫�鏌ユ槸鍚︽湁杩涜涓殑浠诲姟
@@ -1317,8 +1333,6 @@
_stockInfoService.AddMaterielGroup(emptystockInfo);
//绌烘墭鐩樺浣曞鐞� 杩樻湁涓�涓嚭搴撲换鍔¤澶勭悊銆�
originalTask.PalletType = PalletTypeEnum.Empty.ObjToInt();
-
- await CreateReturnTaskAndHandleESS(orderNo, palletCode, originalTask, TaskTypeEnum.InEmpty, PalletTypeEnum.Empty.ObjToInt());
}
catch (Exception ex)
--
Gitblit v1.9.3