From e4e304318532574e418bc01b5a45b8836dac3e1a Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期四, 11 十二月 2025 23:26:20 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundBatchPickingService.cs | 4122 +++++++++++++++++++---------------------------------------
1 files changed, 1,374 insertions(+), 2,748 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/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 bb29ac6..a1e6320 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"
@@ -1,6 +1,5 @@
锘縰sing Microsoft.Extensions.Logging;
using SqlSugar;
-using SqlSugar.Extensions;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -15,6 +14,7 @@
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Outbound;
using WIDESEA_IAllocateService;
@@ -249,13 +249,16 @@
#region 鍒嗘壒鍒嗘嫞
+
/// <summary>
- /// 鍒嗘壒鍒嗘嫞纭
+ /// 鍒嗘壒鍒嗘嫞纭 - 淇鐗堬紙鍖呭惈鎷嗗寘鍚庨獙璇侊級
/// </summary>
public async Task<WebResponseContent> ConfirmBatchPicking(string orderNo, string palletCode, string barcode)
{
try
{
+ _logger.LogInformation($"銆愬垎鎷ｅ紑濮嬨�戣鍗�: {orderNo}, 鎵樼洏: {palletCode}, 鏉＄爜: {barcode}");
+
_unitOfWorkManage.BeginTran();
// 楠岃瘉鍒嗘嫞璇锋眰
@@ -268,11 +271,26 @@
var (lockInfo, orderDetail, stockDetail, batch) = validationResult.Data;
+ _logger.LogInformation($"楠岃瘉閫氳繃 - 閿佸畾ID: {lockInfo.Id}, 鍒嗛厤鏁伴噺: {lockInfo.AssignQuantity}, 宸叉嫞閫�: {lockInfo.PickedQty}");
+ _logger.LogInformation($"搴撳瓨淇℃伅 - 鏉＄爜: {stockDetail.Barcode}, 搴撳瓨鏁伴噺: {stockDetail.StockQuantity}, 鍑哄簱鏁伴噺: {stockDetail.OutboundQuantity}");
+
+
+ decimal originalStockQtyBeforeSplit = stockDetail.StockQuantity;
+ decimal originalOutboundQtyBeforeSplit = stockDetail.OutboundQuantity;
+
+ // 璁板綍鎷嗗寘鍓嶇殑鍏抽敭鏁版嵁锛堢敤浜庡悗缁獙璇侊級
+ decimal originalAllocatedQty = orderDetail.AllocatedQuantity;
+ decimal originalLockQty = orderDetail.LockQuantity;
+ decimal originalStockQty = stockDetail.StockQuantity;
+ decimal originalOutboundQty = stockDetail.OutboundQuantity;
+
// 妫�鏌ユ槸鍚﹂渶瑕佽嚜鍔ㄦ媶鍖�
var autoSplitResult = await CheckAndAutoSplitIfNeeded(lockInfo, stockDetail, palletCode);
if (autoSplitResult != null)
{
- // 濡傛灉鎵ц浜嗚嚜鍔ㄦ媶鍖咃紝閲嶆柊鑾峰彇鏈�鏂扮殑閿佸畾淇℃伅鍜屽簱瀛樹俊鎭�
+ _logger.LogInformation($"鎵ц浜嗚嚜鍔ㄦ媶鍖咃紝閲嶆柊鑾峰彇鏁版嵁");
+
+ // 閲嶆柊鑾峰彇鏈�鏂扮殑閿佸畾淇℃伅鍜屽簱瀛樹俊鎭�
var refreshedValidation = await ValidatePickingRequest(orderNo, palletCode, barcode);
if (!refreshedValidation.IsValid)
{
@@ -281,41 +299,47 @@
}
(lockInfo, orderDetail, stockDetail, batch) = refreshedValidation.Data;
+
+ // 璋冪敤鑷姩鎷嗗寘鍚庨獙璇�
+ decimal splitQuantity = autoSplitResult.FirstOrDefault()?.quantityTotal.ObjToDecimal()??0 ;
+ bool autoSplitValid = await ValidateAfterAutoSplit(lockInfo, orderDetail, stockDetail, splitQuantity,originalStockQtyBeforeSplit);
- var actualPickedQty = lockInfo.AssignQuantity;
- var pickingResult = await ExecutePickingLogic(lockInfo, orderDetail, stockDetail, actualPickedQty);
+ if (!autoSplitValid)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error("鑷姩鎷嗗寘鍚庢暟鎹獙璇佸け璐ワ紝璇锋鏌ョ郴缁熸棩蹇�");
+ }
- // 鏇存柊鎵规鍜岃鍗曟暟鎹�
- await UpdateBatchAndOrderData(batch, orderDetail, actualPickedQty, orderNo);
-
- // 璁板綍鎷ｉ�夊巻鍙�
- await RecordPickingHistory(pickingResult, orderNo, palletCode);
-
- _unitOfWorkManage.CommitTran();
-
- return WebResponseContent.Instance.OK("鑷姩鎷嗗寘骞跺垎鎷ｆ垚鍔�", autoSplitResult);
+ _logger.LogInformation($"鑷姩鎷嗗寘楠岃瘉閫氳繃锛岀户缁墽琛屽垎鎷�");
}
- // 姝ｅ父鍒嗘嫞娴佺▼锛堜笉闇�瑕佽嚜鍔ㄦ媶鍖咃級
- var normalPickedQty = lockInfo.AssignQuantity;
- var normalPickingResult = await ExecutePickingLogic(lockInfo, orderDetail, stockDetail, normalPickedQty);
+ // 璁＄畻瀹為檯鎷ｉ�夋暟閲�
+ decimal actualPickedQty = lockInfo.AssignQuantity - lockInfo.PickedQty;
+
+ if (actualPickedQty <= 0)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error("璇ユ潯鐮佸凡鎷ｉ�夊畬鎴愶紝鏃犻渶閲嶅鎷ｉ��");
+ }
+
+ _logger.LogInformation($"寮�濮嬫嫞閫� - 鏁伴噺: {actualPickedQty}");
+
+ // 鎵ц鍒嗘嫞閫昏緫
+ var pickingResult = await ExecutePickingLogic(lockInfo, orderDetail, stockDetail, actualPickedQty);
// 鏇存柊鎵规鍜岃鍗曟暟鎹�
- await UpdateBatchAndOrderData(batch, orderDetail, normalPickedQty, orderNo);
+ await UpdateBatchAndOrderData(batch, orderDetail, actualPickedQty, orderNo);
- // 璁板綍鎷ｉ�夊巻鍙�
- await RecordPickingHistory(normalPickingResult, orderNo, palletCode);
+ //璁板綍鎷ｉ�夊巻鍙�
+ await RecordPickingHistory(pickingResult, orderNo, palletCode);
+
+ // 鎷ｉ�夊悗楠岃瘉
+ await ValidateAfterPicking(orderNo, palletCode, barcode, actualPickedQty);
_unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK("鍒嗘嫞鎴愬姛", new
- {
- PickedQuantity = normalPickedQty,
- Barcode = barcode,
- MaterialCode = lockInfo.MaterielCode,
- AutoSplitted = false
- });
+ return WebResponseContent.Instance.OK("鍒嗘嫞鎴愬姛", autoSplitResult);
}
catch (Exception ex)
{
@@ -324,6 +348,258 @@
return WebResponseContent.Instance.Error($"鍒嗘嫞澶辫触锛歿ex.Message}");
}
}
+
+
+ /// <summary>
+ /// 鑷姩鎷嗗寘鍚庨獙璇佹暟鎹竴鑷存��
+ /// </summary>
+ private async Task<bool> ValidateAfterAutoSplit(Dt_OutStockLockInfo lockInfo, Dt_OutboundOrderDetail orderDetail,
+ Dt_StockInfoDetail originalStockDetail, decimal splitQuantity, decimal originalStockQtyBeforeSplit)
+ {
+ try
+ {
+ _logger.LogInformation($"寮�濮嬭嚜鍔ㄦ媶鍖呭悗楠岃瘉 - 鍘熸潯鐮�: {originalStockDetail.Barcode}, 鎷嗗寘鏁伴噺: {splitQuantity}");
+ _logger.LogInformation($"鎷嗗寘鍓嶅師搴撳瓨鏁伴噺: {originalStockQtyBeforeSplit}, 鍒嗛厤鏁伴噺: {lockInfo.AssignQuantity}");
+
+ bool allValid = true;
+ List<string> validationErrors = new List<string>();
+
+ // 閲嶆柊鑾峰彇鏈�鏂扮殑鏁版嵁锛堟媶鍖呭悗鐨勫綋鍓嶇姸鎬侊級
+ var refreshedOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .FirstAsync(x => x.Id == orderDetail.Id);
+
+ var refreshedLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .FirstAsync(x => x.Id == lockInfo.Id);
+
+ var refreshedStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Id == originalStockDetail.Id);
+
+ // 楠岃瘉鍘熷簱瀛樻槑缁嗘暟鎹�
+ decimal expectedOriginalStockQty = lockInfo.AssignQuantity;
+
+ _logger.LogInformation($"搴撳瓨楠岃瘉鍩哄噯:");
+ _logger.LogInformation($" 鎷嗗寘鍓嶅師搴撳瓨: {originalStockQtyBeforeSplit}");
+ _logger.LogInformation($" 鍒嗛厤鏁伴噺: {lockInfo.AssignQuantity}");
+ _logger.LogInformation($" 鎷嗗寘鏁伴噺: {splitQuantity}");
+ _logger.LogInformation($" 鏈熸湜鍘熷簱瀛�: {expectedOriginalStockQty}");
+ _logger.LogInformation($" 瀹為檯鍘熷簱瀛�: {refreshedStockDetail.StockQuantity}");
+
+ // 鍏佽灏戦噺璇樊鐨勯獙璇�
+ if (Math.Abs(refreshedStockDetail.StockQuantity - expectedOriginalStockQty) > 0.01m)
+ {
+ // 棰濆妫�鏌ワ細濡傛灉鍘熷簱瀛樻暟閲忎笉鍚堢悊锛屽彲鑳芥槸鏁版嵁闂
+ if (refreshedStockDetail.StockQuantity < 0)
+ {
+ string error = $"鍘熷簱瀛樻暟閲忓紓甯革紙璐熸暟锛夛紒瀹為檯: {refreshedStockDetail.StockQuantity}";
+ validationErrors.Add(error);
+ allValid = false;
+ _logger.LogError(error);
+ }
+ else if (refreshedStockDetail.StockQuantity > originalStockQtyBeforeSplit)
+ {
+ string error = $"鍘熷簱瀛樻暟閲忓紓甯革紙澶т簬鎷嗗寘鍓嶏級锛佹媶鍖呭墠: {originalStockQtyBeforeSplit}, 褰撳墠: {refreshedStockDetail.StockQuantity}";
+ validationErrors.Add(error);
+ allValid = false;
+ _logger.LogError(error);
+ }
+ else
+ {
+ // 鍙兘鏄悎鐞嗙殑璇樊锛岃褰曡鍛婁絾涓嶆爣璁颁负澶辫触
+ _logger.LogWarning($"鍘熷簱瀛樻暟閲忎笌鏈熸湜鍊兼湁宸紓锛屾湡鏈�: {expectedOriginalStockQty}, 瀹為檯: {refreshedStockDetail.StockQuantity}");
+ }
+ }
+
+ // 楠岃瘉鍘熷簱瀛樼殑鍑哄簱鏁伴噺鏄惁淇濇寔涓嶅彉
+ if (Math.Abs(refreshedStockDetail.OutboundQuantity - originalStockDetail.OutboundQuantity) > 0.01m)
+ {
+ string error = $"鍘熷簱瀛樺嚭搴撴暟閲忎笉搴斿彉鍖栵紒鎷嗗寘鍓�: {originalStockDetail.OutboundQuantity}, 鎷嗗寘鍚�: {refreshedStockDetail.OutboundQuantity}";
+ validationErrors.Add(error);
+ allValid = false;
+ _logger.LogError(error);
+ }
+
+ // 楠岃瘉鏂板簱瀛樻槑缁嗭紙鎷嗗寘浜х敓鐨勶級
+ // 鏌ユ壘鏂版潯鐮侊紙閫氳繃鎷嗗寘璁板綍锛�
+ var splitRecords = await _splitPackageService.Db.Queryable<Dt_SplitPackageRecord>()
+ .Where(x => x.OutStockLockInfoId == lockInfo.Id &&
+ !x.IsReverted &&
+ x.IsAutoSplit == true)
+ .OrderByDescending(x => x.SplitTime)
+ .ToListAsync();
+
+ if (splitRecords.Any())
+ {
+ var latestSplit = splitRecords.First();
+ if (!string.IsNullOrEmpty(latestSplit.NewBarcode))
+ {
+ var newStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == latestSplit.NewBarcode && x.StockId == originalStockDetail.StockId);
+
+ if (newStockDetail != null)
+ {
+ // 鏂板簱瀛樼殑鏈熸湜鍊� = 鎷嗗寘鏁伴噺
+ decimal expectedNewStockQty = splitQuantity;
+
+ _logger.LogInformation($"鏂板簱瀛橀獙璇�:");
+ _logger.LogInformation($" 鏂版潯鐮�: {newStockDetail.Barcode}");
+ _logger.LogInformation($" 鏈熸湜鏁伴噺: {expectedNewStockQty}");
+ _logger.LogInformation($" 瀹為檯鏁伴噺: {newStockDetail.StockQuantity}");
+ _logger.LogInformation($" 鍑哄簱鏁伴噺: {newStockDetail.OutboundQuantity} (搴斾负0)");
+
+ if (Math.Abs(newStockDetail.StockQuantity - expectedNewStockQty) > 0.01m)
+ {
+ string error = $"鏂板簱瀛樻暟閲忎笉姝ｇ‘锛佹湡鏈�: {expectedNewStockQty}, 瀹為檯: {newStockDetail.StockQuantity}";
+ validationErrors.Add(error);
+ allValid = false;
+ _logger.LogError(error);
+ }
+
+ // 鏂板簱瀛樺嚭搴撴暟閲忓簲涓�0
+ if (Math.Abs(newStockDetail.OutboundQuantity - 0) > 0.01m)
+ {
+ string error = $"鏂板簱瀛樺嚭搴撴暟閲忎笉涓�0锛佸疄闄�: {newStockDetail.OutboundQuantity}";
+ validationErrors.Add(error);
+ allValid = false;
+ _logger.LogError(error);
+ }
+ }
+ }
+ }
+
+ // 4. 楠岃瘉鏈垎閰嶉攣瀹氳褰�
+ var unallocatedLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.ParentLockId == lockInfo.Id &&
+ x.IsUnallocated == 1 &&
+ x.OrderDetailId == 0)
+ .ToListAsync();
+
+ if (!unallocatedLocks.Any())
+ {
+ string error = $"鏈壘鍒拌嚜鍔ㄦ媶鍖呭垱寤虹殑鏈垎閰嶉攣瀹氳褰�";
+ validationErrors.Add(error);
+ allValid = false;
+ _logger.LogError(error);
+ }
+
+ // 楠岃瘉璁㈠崟鏄庣粏鏁版嵁鏈敼鍙�
+ if (Math.Abs(refreshedOrderDetail.AllocatedQuantity - orderDetail.AllocatedQuantity) > 0.01m)
+ {
+ string error = $"璁㈠崟鏄庣粏鍒嗛厤鏁伴噺寮傚父鍙樺寲锛佹媶鍖呭墠: {orderDetail.AllocatedQuantity}, 鎷嗗寘鍚�: {refreshedOrderDetail.AllocatedQuantity}";
+ validationErrors.Add(error);
+ allValid = false;
+ _logger.LogError(error);
+ }
+
+ // 楠岃瘉鍘熼攣瀹氳褰曟暟鎹湭鏀瑰彉锛堝垎閰嶆暟閲忎笉鍙橈級
+ if (Math.Abs(refreshedLockInfo.AssignQuantity - lockInfo.AssignQuantity) > 0.01m)
+ {
+ string error = $"閿佸畾璁板綍鍒嗛厤鏁伴噺寮傚父鍙樺寲锛佹媶鍖呭墠: {lockInfo.AssignQuantity}, 鎷嗗寘鍚�: {refreshedLockInfo.AssignQuantity}";
+ validationErrors.Add(error);
+ allValid = false;
+ _logger.LogError(error);
+ }
+
+ // 鏂板銆戦獙璇佹�诲簱瀛樺畧鎭�
+ // 鎷嗗寘鍓嶆�诲簱瀛� = 鍘熷簱瀛樻暟閲�
+ // 鎷嗗寘鍚庢�诲簱瀛� = 鍘熷簱瀛樼幇鏈夋暟閲� + 鏂板簱瀛樻暟閲�
+ decimal totalStockAfterSplit = refreshedStockDetail.StockQuantity;
+ if (splitRecords.Any() && !string.IsNullOrEmpty(splitRecords.First().NewBarcode))
+ {
+ var newStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == splitRecords.First().NewBarcode);
+ if (newStock != null)
+ {
+ totalStockAfterSplit += newStock.StockQuantity;
+ }
+ }
+
+ _logger.LogInformation($"搴撳瓨瀹堟亽楠岃瘉:");
+ _logger.LogInformation($" 鎷嗗寘鍓嶆�诲簱瀛�: {originalStockQtyBeforeSplit}");
+ _logger.LogInformation($" 鎷嗗寘鍚庢�诲簱瀛�: {totalStockAfterSplit}");
+ _logger.LogInformation($" 宸紓: {originalStockQtyBeforeSplit - totalStockAfterSplit}");
+
+ // 鍏佽寰堝皬鐨勬诞鐐规暟璇樊
+ if (Math.Abs(originalStockQtyBeforeSplit - totalStockAfterSplit) > 0.02m)
+ {
+ string error = $"搴撳瓨涓嶅畧鎭掞紒鎷嗗寘鍓�: {originalStockQtyBeforeSplit}, 鎷嗗寘鍚庢�诲簱瀛�: {totalStockAfterSplit}";
+ validationErrors.Add(error);
+ allValid = false;
+ _logger.LogError(error);
+ }
+
+ // 姹囨�婚獙璇佺粨鏋�
+ if (allValid)
+ {
+ _logger.LogInformation($"鉁� 鑷姩鎷嗗寘鍚庨獙璇佸叏閮ㄩ�氳繃");
+ }
+ else
+ {
+ string errorSummary = $"鑷姩鎷嗗寘鍚庨獙璇佸け璐ワ紝鍙戠幇{validationErrors.Count}涓棶棰橈細" +
+ string.Join("; ", validationErrors.Take(3));
+ _logger.LogError(errorSummary);
+
+ // 璁板綍璇︾粏闂鍒版棩蹇�
+ for (int i = 0; i < validationErrors.Count; i++)
+ {
+ _logger.LogError($"闂{i + 1}: {validationErrors[i]}");
+ }
+ }
+
+ return allValid;
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"鑷姩鎷嗗寘鍚庨獙璇佸紓甯�: {ex.Message}");
+ return false;
+ }
+ }
+
+
+ /// <summary>
+ /// 鎷ｉ�夊悗楠岃瘉
+ /// </summary>
+ private async Task ValidateAfterPicking(string orderNo, string palletCode, string barcode, decimal pickedQty)
+ {
+ try
+ {
+ _logger.LogInformation($"寮�濮嬫嫞閫夊悗楠岃瘉");
+
+ // 楠岃瘉搴撳瓨鏄庣粏
+ var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == barcode);
+
+ // 鏌ユ壘璇ユ潯鐮佺殑鎵�鏈夋嫞閫夎褰�
+ var pickingRecords = await Db.Queryable<Dt_PickingRecord>()
+ .Where(x => x.Barcode == barcode && x.OrderNo == orderNo && !x.IsCancelled)
+ .ToListAsync();
+
+ decimal totalPickedFromRecords = pickingRecords.Sum(x => x.PickQuantity);
+
+ _logger.LogInformation($"鎷ｉ�夐獙璇� - 鏉＄爜: {barcode}");
+ _logger.LogInformation($" 搴撳瓨鍑哄簱鏁伴噺: {stockDetail.OutboundQuantity}");
+ _logger.LogInformation($" 鎷ｉ�夎褰曟�诲拰: {totalPickedFromRecords}");
+
+ if (Math.Abs(stockDetail.OutboundQuantity - totalPickedFromRecords) > 0.01m)
+ {
+ _logger.LogError($"鎷ｉ�夋暟鎹笉涓�鑷达紒搴撳瓨鍑哄簱鏁伴噺({stockDetail.OutboundQuantity}) 鈮� 鎷ｉ�夎褰曟�诲拰({totalPickedFromRecords})");
+
+ // 鑷姩淇锛氫互鎷ｉ�夎褰曟�诲拰涓哄噯
+ decimal originalOutbound = stockDetail.OutboundQuantity;
+ stockDetail.OutboundQuantity = totalPickedFromRecords;
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+
+ _logger.LogWarning($"宸茶嚜鍔ㄤ慨澶嶅嚭搴撴暟閲�: {originalOutbound} -> {totalPickedFromRecords}");
+ }
+
+ _logger.LogInformation($"鎷ｉ�夊悗楠岃瘉瀹屾垚");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"鎷ｉ�夊悗楠岃瘉澶辫触: {ex.Message}");
+ }
+ }
+
+
/// <summary>
/// 鍙栨秷鍒嗘嫞
/// </summary>
@@ -372,100 +648,16 @@
#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)
- .ToListAsync();
-
- 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();
-
- if (unfinishedLocks.Any())
- {
- var unfinishedCount = unfinishedLocks.Count;
- var unfinishedQty = unfinishedLocks.Sum(x => x.AssignQuantity - x.PickedQty);
- return ValidationResult<List<Dt_OutStockLockInfo>>.Error(
- $"鎵樼洏杩樻湁{unfinishedCount}鏉℃湭瀹屾垚璁板綍锛屽墿浣欐暟閲弡unfinishedQty}锛屼笉鑳藉彇璧扮┖绠�");
- }
-
- // 鑾峰彇宸插畬鎴愮殑閿佸畾璁板綍锛堢姸鎬佷负鎷ｉ�夊畬鎴愭垨宸插彇璧帮級
- var completedLocks = lockInfos.Where(x =>
- 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>
- /// 娓呯悊宸插畬鎴愮殑閿佸畾璁板綍
- /// </summary>
- private async Task CleanupCompletedLocks(List<Dt_OutStockLockInfo> completedLocks)
- {
- foreach (var lockInfo in completedLocks)
- {
- // 鏍囪閿佸畾璁板綍涓哄凡鍙栬蛋
- lockInfo.Status = (int)OutLockStockStatusEnum.宸插彇璧�;
- lockInfo.Operator = App.User.UserName;
- await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
-
- // 娓呯悊瀵瑰簲鐨勫簱瀛樿褰曠姸鎬�
- await CleanupStockInfo(lockInfo);
- }
- }
-
- /// <summary>
- /// 娓呯悊搴撳瓨淇℃伅 - 澧炲己鐗堟湰
+ /// <summary>
+ /// 娓呯悊搴撳瓨淇℃伅 - 瀹屾暣淇鐗�
+ /// 纭繚OutboundQuantity姝ｇ‘娓呴浂
/// </summary>
private async Task CleanupStockInfo(Dt_OutStockLockInfo lockInfo)
{
try
{
+ _logger.LogInformation($"娓呯悊搴撳瓨淇℃伅 - 閿佸畾ID: {lockInfo.Id}, 鏉＄爜: {lockInfo.CurrentBarcode}");
+
// 鏌ユ壘閿佸畾鐨勫簱瀛樻槑缁�
var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
.FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId);
@@ -473,44 +665,58 @@
if (stockDetail != null)
{
// 璁板綍娓呯悊鍓嶇殑鐘舵��
- decimal originalQty = stockDetail.StockQuantity;
+ decimal originalStockQty = stockDetail.StockQuantity;
+ decimal originalOutboundQty = stockDetail.OutboundQuantity;
int originalStatus = stockDetail.Status;
- // 濡傛灉搴撳瓨鏁伴噺澶т簬0锛岄渶瑕佸厛娓呴浂
- if (stockDetail.StockQuantity > 0)
+ _logger.LogInformation($"娓呯悊鍓嶇姸鎬� - 搴撳瓨: {originalStockQty}, 鍑哄簱: {originalOutboundQty}, 鐘舵��: {GetStockStatusName(originalStatus)}");
+
+ // 銆愰噸瑕併�戞鏌ュ簱瀛樻暟閲忔槸鍚﹀簲璇ヤ负0
+ if (lockInfo.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�)
{
- _logger.LogWarning($"鍙栬蛋绌烘墭鐩樻椂鍙戠幇鏉＄爜 {lockInfo.CurrentBarcode} 杩樻湁搴撳瓨 {stockDetail.StockQuantity}锛岃嚜鍔ㄦ竻闆�");
- stockDetail.StockQuantity = 0;
- stockDetail.OutboundQuantity = 0;
+ if (stockDetail.StockQuantity > 0)
+ {
+ _logger.LogWarning($"鎷ｉ�夊畬鎴愪絾搴撳瓨涓嶄负0 - 鏉＄爜: {stockDetail.Barcode}, 搴撳瓨: {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");
+ _logger.LogInformation($"娓呯悊搴撳瓨鏄庣粏瀹屾垚");
+ _logger.LogInformation($" 搴撳瓨鏁伴噺: {originalStockQty} -> 0");
+ _logger.LogInformation($" 鍑哄簱鏁伴噺: {originalOutboundQty} -> 0");
+ _logger.LogInformation($" 鐘舵��: {GetStockStatusName(originalStatus)} -> 宸叉竻鐞�");
}
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())
{
+ _logger.LogInformation($"娓呯悊鎵樼洏涓婂叾浠栧簱瀛� - 鍏� {allStockDetails.Count} 鏉¤褰�");
+
foreach (var stock in allStockDetails)
{
+ decimal originalQty = stock.StockQuantity;
+ decimal originalOutbound = stock.OutboundQuantity;
+
stock.StockQuantity = 0;
- stock.OutboundQuantity = 0;
+ stock.OutboundQuantity = 0;
stock.Status = (int)StockStatusEmun.宸叉竻鐞�;
await _stockInfoDetailService.Db.Updateable(stock).ExecuteCommandAsync();
- _logger.LogWarning($"娓呯悊閬楁紡搴撳瓨 - 鏉＄爜: {stock.Barcode}, 鏁伴噺: {stock.StockQuantity} -> 0");
+ _logger.LogInformation($"娓呯悊閬楁紡搴撳瓨 - 鏉＄爜: {stock.Barcode}, 搴撳瓨: {originalQty}->0, 鍑哄簱: {originalOutbound}->0");
}
}
}
@@ -520,7 +726,6 @@
// 涓嶆姏鍑哄紓甯革紝缁х画澶勭悊鍏朵粬璁板綍
}
}
-
/// <summary>
/// 鏇存柊璁㈠崟鐘舵��
@@ -556,17 +761,17 @@
/// </summary>
private async Task RecordEmptyPalletRemoval(string orderNo, string palletCode, List<Dt_OutStockLockInfo> completedLocks)
{
- var removalRecord = new Dt_EmptyPalletRemoval
- {
- OrderNo = orderNo,
- PalletCode = palletCode,
- RemovalTime = DateTime.Now,
- Operator = App.User.UserName,
- CompletedItemsCount = completedLocks.Count,
- TotalPickedQuantity = completedLocks.Sum(x => x.PickedQty)
- };
+ //var removalRecord = new Dt_EmptyPalletRemoval
+ //{
+ // OrderNo = orderNo,
+ // PalletCode = palletCode,
+ // RemovalTime = DateTime.Now,
+ // Operator = App.User.UserName,
+ // CompletedItemsCount = completedLocks.Count,
+ // TotalPickedQuantity = completedLocks.Sum(x => x.PickedQty)
+ //};
- await Db.Insertable(removalRecord).ExecuteCommandAsync();
+ //await Db.Insertable(removalRecord).ExecuteCommandAsync();
}
#endregion
@@ -597,7 +802,6 @@
}
};
}
-
#region 鎵嬪姩鎷嗗寘
@@ -717,7 +921,6 @@
if (orderDetail.AllocatedQuantity != totalLockAssignQuantity)
{
_logger.LogWarning($"璁㈠崟鏄庣粏鍒嗛厤鏁伴噺涓庨攣瀹氫俊鎭笉涓�鑷� - 璁㈠崟鏄庣粏鍒嗛厤鏁伴噺: {orderDetail.AllocatedQuantity}, 閿佸畾淇℃伅鎬诲垎閰嶆暟閲�: {totalLockAssignQuantity}");
- // 杩欓噷涓嶇洿鎺ヨ繑鍥為敊璇紝鍥犱负鎷嗗寘鎿嶄綔鏈韩涓嶄細瀵艰嚧涓嶄竴鑷达紝鍙槸璁板綍璀﹀憡
}
_logger.LogInformation($"鎷嗗寘楠岃瘉閫氳繃 - 鍘熸潯鐮�: {originalBarcode}, 鎷嗗寘鏁伴噺: {splitQuantity}");
@@ -737,8 +940,10 @@
return lockInfos.Sum(x => x.AssignQuantity);
}
+
+
/// <summary>
- /// 鎵ц鎵嬪姩鎷嗗寘閫昏緫 - 瀹屾暣鐗堟湰
+ /// 鎵ц鎵嬪姩鎷嗗寘閫昏緫
/// </summary>
private async Task<List<SplitResult>> ExecuteManualSplitLogic(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail,
decimal splitQuantity, string palletCode)
@@ -782,15 +987,22 @@
decimal originalStockQty = stockDetail.StockQuantity;
decimal originalOutboundQty = stockDetail.OutboundQuantity;
- // 鍒涘缓鏂板簱瀛樻槑缁�
+ // 淇锛氳绠楁柊搴撳瓨鏄庣粏鐨勬纭暟閲�
+ // 鏂版潯鐮佸簲璇ュ彧鏈夋媶鍖呮暟閲忥紝鑰屼笉鏄�2鍊�
+ decimal newStockQuantity = splitQuantity;
+ decimal originalRemainingStockQuantity = originalStockQty - splitQuantity;
+
+ _logger.LogInformation($"鏁伴噺鍒嗛厤 - 鏂版潯鐮佹暟閲�: {newStockQuantity}, 鍘熸潯鐮佸墿浣欐暟閲�: {originalRemainingStockQuantity}");
+
+ // 鍒涘缓鏂板簱瀛樻槑缁� - 淇鏁伴噺闂
var newStockDetail = new Dt_StockInfoDetail
{
StockId = stockDetail.StockId,
MaterielCode = stockDetail.MaterielCode,
OrderNo = stockDetail.OrderNo,
BatchNo = stockDetail.BatchNo,
- StockQuantity = splitQuantity,
- OutboundQuantity = 0,
+ StockQuantity = newStockQuantity,
+ OutboundQuantity = 0,
Barcode = newBarcode,
Status = (int)StockStatusEmun.鍑哄簱閿佸畾,
SupplyCode = stockDetail.SupplyCode,
@@ -799,24 +1011,22 @@
BarcodeUnit = stockDetail.BarcodeUnit,
BusinessType = stockDetail.BusinessType,
InboundOrderRowNo = stockDetail.InboundOrderRowNo,
+ FactoryArea = stockDetail.FactoryArea,
+ WarehouseCode = stockDetail.WarehouseCode,
};
await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
- _logger.LogInformation($"鍒涘缓鏂板簱瀛樻槑缁嗘垚鍔� - 鏉＄爜: {newBarcode}, 搴撳瓨鏁伴噺: {splitQuantity}");
+ _logger.LogInformation($"鍒涘缓鏂板簱瀛樻槑缁嗘垚鍔� - 鏉＄爜: {newBarcode}, 搴撳瓨鏁伴噺: {newStockQuantity}");
- // 淇锛氭洿鏂板師搴撳瓨鏄庣粏 - 纭繚鏁版嵁涓�鑷存��
- // 鍘熷簱瀛樺噺灏戞媶鍖呮暟閲忥紝浣嗗嚭搴撴暟閲忎繚鎸佷笉鍙橈紙鍥犱负鏄墜鍔ㄦ媶鍖咃紝涓嶆秹鍙婂疄闄呭嚭搴擄級
- stockDetail.StockQuantity -= splitQuantity;
+ // 鏇存柊鍘熷簱瀛樻槑缁�
+ stockDetail.StockQuantity = originalRemainingStockQuantity;
// 纭繚涓嶄細涓鸿礋鏁�
if (stockDetail.StockQuantity < 0)
{
_logger.LogWarning($"鍘熷簱瀛樻暟閲忓嚭鐜拌礋鏁帮紝閲嶇疆涓�0");
stockDetail.StockQuantity = 0;
- }
-
- // 鍑哄簱鏁伴噺淇濇寔涓嶅彉
- // stockDetail.OutboundQuantity = stockDetail.OutboundQuantity; // 淇濇寔涓嶅彉
+ }
await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
_logger.LogInformation($"鏇存柊鍘熷簱瀛樻槑缁� - 鏉＄爜: {stockDetail.Barcode}, " +
@@ -827,7 +1037,7 @@
var newLockInfo = new Dt_OutStockLockInfo
{
OrderNo = lockInfo.OrderNo,
- OrderDetailId = lockInfo.OrderDetailId, // 缁戝畾鍒板悓涓�涓鍗曟槑缁�
+ OrderDetailId = lockInfo.OrderDetailId,
OutboundBatchNo = lockInfo.OutboundBatchNo,
MaterielCode = lockInfo.MaterielCode,
MaterielName = lockInfo.MaterielName,
@@ -864,18 +1074,14 @@
_logger.LogInformation($"鏇存柊鍘熼攣瀹氫俊鎭� - 鍒嗛厤鏁伴噺: {originalLockAssignQty} -> {lockInfo.AssignQuantity}, " +
$"璁㈠崟鏁伴噺: {originalLockOrderQty} -> {lockInfo.OrderQuantity}");
- // 閲嶈锛氭墜鍔ㄦ媶鍖呬笉鏀瑰彉璁㈠崟鏄庣粏鐨勬�诲垎閰嶆暟閲�
- // 楠岃瘉璁㈠崟鏄庣粏鐨勬�诲垎閰嶆暟閲忔槸鍚︿繚鎸佷笉鍙�
- await ValidateOrderDetailAllocationAfterSplit(lockInfo.OrderDetailId, originalLockAssignQty);
+ // 楠岃瘉鎷嗗寘鍚庢暟鎹竴鑷存��
+ await ValidateDataConsistencyAfterSplit(lockInfo.OrderDetailId, originalLockAssignQty, originalLockOrderQty);
// 璁板綍鎷嗗寘鍘嗗彶
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}");
@@ -887,46 +1093,8 @@
throw;
}
}
- /// <summary>
- /// 楠岃瘉鎷嗗寘鍚庤鍗曟槑缁嗙殑鍒嗛厤鏁伴噺鏄惁淇濇寔涓嶅彉
- /// </summary>
- private async Task ValidateOrderDetailAllocationAfterSplit(long orderDetailId, decimal originalTotalAssignQty)
- {
- try
- {
- // 鑾峰彇璁㈠崟鏄庣粏鐨勬墍鏈夐攣瀹氫俊鎭殑鎬诲垎閰嶆暟閲�
- var allLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.OrderDetailId == orderDetailId)
- .ToListAsync();
- decimal totalLockAssignQty = allLocks.Sum(x => x.AssignQuantity);
-
- _logger.LogInformation($"鎷嗗寘鍚庡垎閰嶆暟閲忛獙璇� - 璁㈠崟鏄庣粏ID: {orderDetailId}");
- _logger.LogInformation($"鍘熷鎬诲垎閰嶆暟閲�: {originalTotalAssignQty}, 褰撳墠鎬诲垎閰嶆暟閲�: {totalLockAssignQty}");
-
- // 鎵嬪姩鎷嗗寘鍚庢�诲垎閰嶆暟閲忓簲璇ヤ繚鎸佷笉鍙�
- if (Math.Abs(originalTotalAssignQty - totalLockAssignQty) > 0.01m)
- {
- _logger.LogWarning($"鎷嗗寘鍚庢�诲垎閰嶆暟閲忓彂鐢熷彉鍖� - 鏈熸湜: {originalTotalAssignQty}, 瀹為檯: {totalLockAssignQty}");
-
- // 濡傛灉鍙樺寲寰堝皬锛屽彲鑳芥槸绮惧害闂锛岃褰曚絾涓嶆姏鍑哄紓甯�
- 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>
+ /// <summary>
/// 楠岃瘉鎷嗗寘鍚庢暟鎹竴鑷存��
/// </summary>
private async Task ValidateDataConsistencyAfterSplit(long orderDetailId, decimal expectedAllocatedQty, decimal expectedLockQty)
@@ -966,8 +1134,6 @@
}
#endregion
-
-
#region 鍙栨秷鎷嗗寘
/// <summary>
@@ -979,18 +1145,18 @@
{
_unitOfWorkManage.BeginTran();
- // 1. 鏌ユ壘鎷嗗寘璁板綍骞堕獙璇�
+ // 鏌ユ壘鎷嗗寘璁板綍骞堕獙璇�
var validationResult = await ValidateCancelSplitRequest(orderNo, palletCode, newBarcode);
if (!validationResult.IsValid)
return WebResponseContent.Instance.Error(validationResult.ErrorMessage);
var (splitRecord, newLockInfo, newStockDetail) = validationResult.Data;
- // 2. 鏌ユ壘鍘熷閿佸畾淇℃伅
+ // 鏌ユ壘鍘熷閿佸畾淇℃伅
var originalLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
.FirstAsync(x => x.Id == splitRecord.OutStockLockInfoId);
- // 3. 妫�鏌ヨ鏉＄爜鏄惁琚啀娆℃媶鍖�
+ // 妫�鏌ヨ鏉＄爜鏄惁琚啀娆℃媶鍖�
var childSplitRecords = await _splitPackageService.Db.Queryable<Dt_SplitPackageRecord>()
.Where(x => x.OriginalBarcode == newBarcode && !x.IsReverted)
.ToListAsync();
@@ -1000,7 +1166,7 @@
return WebResponseContent.Instance.Error("璇ユ潯鐮佸凡琚啀娆℃媶鍖咃紝璇峰厛鍙栨秷鍚庣画鐨勬媶鍖呮搷浣�");
}
- // 4. 鎵ц鍙栨秷鎷嗗寘閫昏緫
+ // 鎵ц鍙栨秷鎷嗗寘閫昏緫
await ExecuteCancelSplitLogic(splitRecord, originalLockInfo, newLockInfo, newStockDetail);
_unitOfWorkManage.CommitTran();
@@ -1070,7 +1236,7 @@
if (orderDetail == null)
throw new InvalidOperationException("鏈壘鍒拌鍗曟槑缁�");
- // 1. 鎭㈠璁㈠崟鏄庣粏鐨勫垎閰嶆暟閲忥紙鑷姩鎷嗗寘浼氬鍔犲垎閰嶆暟閲忥級
+ // 鎭㈠璁㈠崟鏄庣粏鐨勫垎閰嶆暟閲�
decimal originalAllocatedQty = orderDetail.AllocatedQuantity;
decimal originalLockQty = orderDetail.LockQuantity;
@@ -1084,7 +1250,7 @@
await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();
_logger.LogInformation($"鑷姩鎷嗗寘鍙栨秷鎭㈠璁㈠崟鏄庣粏 - 鍒嗛厤鏁伴噺: {originalAllocatedQty} -> {orderDetail.AllocatedQuantity}");
- // 2. 鎭㈠鍘熷簱瀛橈紙灏嗘媶鍖呯殑鏁伴噺鍔犲洖鍘熷簱瀛橈級
+ // 鎭㈠鍘熷簱瀛�
var originalStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
.FirstAsync(x => x.Barcode == splitRecord.OriginalBarcode && x.StockId == splitRecord.StockId);
@@ -1103,7 +1269,7 @@
_logger.LogInformation($"鑷姩鎷嗗寘鍙栨秷鎭㈠鍘熷簱瀛� - 鏉＄爜: {originalStock.Barcode}, 鏁伴噺: {originalStockQty} -> {originalStock.StockQuantity}");
}
- // 3. 鍒犻櫎鏂伴攣瀹氫俊鎭拰搴撳瓨鏄庣粏
+ // 鍒犻櫎鏂伴攣瀹氫俊鎭拰搴撳瓨鏄庣粏
await DeleteNewSplitRecords(newLockInfo, newStockDetail);
}
@@ -1116,7 +1282,7 @@
{
_logger.LogInformation($"澶勭悊鎵嬪姩鎷嗗寘鍙栨秷 - 鍘熸潯鐮�: {splitRecord.OriginalBarcode}, 鏂版潯鐮�: {splitRecord.NewBarcode}");
- // 1. 鎭㈠鍘熼攣瀹氫俊鎭殑鍒嗛厤鏁伴噺
+ // 鎭㈠鍘熼攣瀹氫俊鎭殑鍒嗛厤鏁伴噺
decimal originalAssignQty = originalLockInfo.AssignQuantity;
decimal originalOrderQty = originalLockInfo.OrderQuantity;
@@ -1132,7 +1298,7 @@
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);
@@ -1151,7 +1317,7 @@
_logger.LogInformation($"鎵嬪姩鎷嗗寘鍙栨秷鎭㈠鍘熷簱瀛� - 鏉＄爜: {originalStock.Barcode}, 鏁伴噺: {originalStockQty} -> {originalStock.StockQuantity}");
}
- // 3. 鍒犻櫎鏂伴攣瀹氫俊鎭拰搴撳瓨鏄庣粏
+ // 鍒犻櫎鏂伴攣瀹氫俊鎭拰搴撳瓨鏄庣粏
await DeleteNewSplitRecords(newLockInfo, newStockDetail);
}
@@ -1178,6 +1344,7 @@
.ExecuteCommandAsync();
}
}
+
/// <summary>
/// 楠岃瘉鍙栨秷鎷嗗寘鍚庢暟鎹竴鑷存�� - 鏈�鏂扮増鏈�
/// </summary>
@@ -1356,7 +1523,7 @@
{
_unitOfWorkManage.BeginTran();
- // 1. 鏌ユ壘鎵�鏈夌浉鍏崇殑鎷嗗寘璁板綍锛堝舰鎴愭媶鍖呴摼锛�
+ // 鏌ユ壘鎵�鏈夌浉鍏崇殑鎷嗗寘璁板綍锛堝舰鎴愭媶鍖呴摼锛�
var splitChain = await GetSplitPackageChain(orderNo, startBarcode);
if (!splitChain.Any())
@@ -1364,11 +1531,11 @@
_logger.LogInformation($"鎵惧埌鎷嗗寘閾撅紝鍏� {splitChain.Count} 鏉¤褰�");
- // 2. 鏀堕泦鎷嗗寘閾句腑娑夊強鐨勬墍鏈夋潯鐮侊紙鍖呮嫭鍘熸潯鐮佸拰鏂版潯鐮侊級
+ // 鏀堕泦鎷嗗寘閾句腑娑夊強鐨勬墍鏈夋潯鐮侊紙鍖呮嫭鍘熸潯鐮佸拰鏂版潯鐮侊級
var allBarcodesInChain = new List<string> { startBarcode };
allBarcodesInChain.AddRange(splitChain.Select(x => x.NewBarcode));
- // 3. 妫�鏌ユ媶鍖呴摼涓槸鍚︽湁宸茶鍒嗘嫞鐨勬潯鐮�
+ // 妫�鏌ユ媶鍖呴摼涓槸鍚︽湁宸茶鍒嗘嫞鐨勬潯鐮�
var pickedBarcodesInfo = await GetPickedBarcodesInfo(orderNo, allBarcodesInChain);
if (pickedBarcodesInfo.Any())
@@ -1378,7 +1545,7 @@
$"浠ヤ笅鏉＄爜宸茶鍒嗘嫞锛岃鍏堝彇娑堝垎鎷ｏ細{pickedBarcodes}");
}
- // 4. 鎸夋媶鍖呴『搴忓�掑簭鍙栨秷锛堜粠鏈�鏂扮殑寮�濮嬪彇娑堬級
+ // 鎸夋媶鍖呴『搴忓�掑簭鍙栨秷锛堜粠鏈�鏂扮殑寮�濮嬪彇娑堬級
var reversedChain = splitChain.OrderByDescending(x => x.SplitTime).ToList();
foreach (var splitRecord in reversedChain)
@@ -1399,106 +1566,7 @@
}
}
- /// <summary>
- /// 鑾峰彇鏉＄爜鐨勬媶鍖呭拰鎷ｉ�夌姸鎬�
- /// </summary>
- public async Task<WebResponseContent> GetBarcodeSplitAndPickStatus(string orderNo, string barcode)
- {
- try
- {
- // 1. 鑾峰彇鎷嗗寘淇℃伅
- var splitChain = await GetSplitPackageChain(orderNo, barcode);
- var isOriginalBarcode = !splitChain.Any(x => x.NewBarcode == barcode);
-
- // 2. 鑾峰彇鎷ｉ�変俊鎭�
- var pickingRecords = await Db.Queryable<Dt_PickingRecord>()
- .Where(x => x.Barcode == barcode && x.OrderNo == orderNo && !x.IsCancelled)
- .ToListAsync();
-
- var totalPickedQty = pickingRecords.Sum(x => x.PickQuantity);
-
- // 3. 鑾峰彇閿佸畾淇℃伅
- var lockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.CurrentBarcode == barcode && x.OrderNo == orderNo)
- .FirstAsync();
-
- // 4. 鑾峰彇搴撳瓨淇℃伅
- var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .Where(x => x.Barcode == barcode)
- .FirstAsync();
-
- var statusInfo = new BarcodeStatusInfoDto
- {
- Barcode = barcode,
- OrderNo = orderNo,
- IsOriginalBarcode = isOriginalBarcode,
- SplitChainCount = splitChain.Count,
- HasBeenPicked = pickingRecords.Any(),
- TotalPickedQuantity = totalPickedQty,
- PickRecordCount = pickingRecords.Count,
- LockInfoStatus = lockInfo?.Status ?? 0,
- LockInfoPickedQty = lockInfo?.PickedQty ?? 0,
- LockInfoAssignQty = lockInfo?.AssignQuantity ?? 0,
- StockQuantity = stockDetail?.StockQuantity ?? 0,
- StockStatus = stockDetail?.Status ?? 0,
- CanCancelSplit = !pickingRecords.Any(), // 鏈鍒嗘嫞鎵嶈兘鍙栨秷鎷嗗寘
- NeedCancelPickFirst = pickingRecords.Any() // 闇�瑕佸厛鍙栨秷鍒嗘嫞
- };
-
- // 5. 鑾峰彇鎿嶄綔寤鸿
- statusInfo.OperationSuggestions = GetOperationSuggestions(statusInfo);
-
- return WebResponseContent.Instance.OK("鑾峰彇鐘舵�佹垚鍔�", statusInfo);
- }
- catch (Exception ex)
- {
- _logger.LogError($"鑾峰彇鏉＄爜鐘舵�佸け璐� - OrderNo: {orderNo}, Barcode: {barcode}, Error: {ex.Message}");
- return WebResponseContent.Instance.Error("鑾峰彇鏉＄爜鐘舵�佸け璐�");
- }
- }
- /// <summary>
- /// 鑾峰彇鎿嶄綔寤鸿
- /// </summary>
- private List<string> GetOperationSuggestions(BarcodeStatusInfoDto statusInfo)
- {
- var suggestions = new List<string>();
-
- if (statusInfo.HasBeenPicked)
- {
- suggestions.Add($"璇ユ潯鐮佸凡琚垎鎷ｏ紙鏁伴噺锛歿statusInfo.TotalPickedQuantity}锛夛紝濡傞渶鍙栨秷鎷嗗寘锛岃鍏堝彇娑堝垎鎷�");
-
- if (statusInfo.IsOriginalBarcode)
- {
- suggestions.Add("杩欐槸鍘熸潯鐮侊紝鍙栨秷鍒嗘嫞鍚庡皢鎭㈠涓哄彲鍒嗘嫞鐘舵��");
- }
- else
- {
- suggestions.Add("杩欐槸鎷嗗寘鐢熸垚鐨勬柊鏉＄爜锛屽彇娑堝垎鎷ｅ悗鎵嶈兘鍙栨秷鎷嗗寘");
- }
- }
- else
- {
- if (statusInfo.IsOriginalBarcode && statusInfo.SplitChainCount > 0)
- {
- suggestions.Add("杩欐槸鍘熸潯鐮侊紝鍙互鍙栨秷鎷嗗寘閾�");
- }
- else if (!statusInfo.IsOriginalBarcode)
- {
- suggestions.Add("杩欐槸鎷嗗寘鐢熸垚鐨勬柊鏉＄爜锛屽彲浠ュ崟鐙彇娑堟媶鍖�");
- }
- }
-
- if (statusInfo.LockInfoStatus == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�)
- {
- suggestions.Add("閿佸畾鐘舵�侊細鎷ｉ�夊畬鎴�");
- }
- else if (statusInfo.LockInfoStatus == (int)OutLockStockStatusEnum.鍑哄簱涓�)
- {
- suggestions.Add("閿佸畾鐘舵�侊細鍑哄簱涓�");
- }
-
- return suggestions;
- }
+
/// <summary>
/// 鑾峰彇宸茶鍒嗘嫞鐨勬潯鐮佷俊鎭�
/// </summary>
@@ -1723,310 +1791,39 @@
#endregion
#region 缁熶竴鍥炲簱閫昏緫
- private async Task<Dt_Task> GetCurrentTask(string orderNo, string palletCode)
- {
- // 鍏堝皾璇曢�氳繃璁㈠崟鍙峰拰鎵樼洏鍙锋煡鎵句换鍔�
- var task = await _taskRepository.Db.Queryable<Dt_Task>()
- .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
- .FirstAsync();
-
- if (task == null)
- {
- // 濡傛灉鎵句笉鍒帮紝鍐嶉�氳繃鎵樼洏鍙锋煡鎵�
- task = await _taskRepository.Db.Queryable<Dt_Task>()
- .Where(x => x.PalletCode == palletCode)
- .FirstAsync();
- }
-
- return task;
- }
- private async Task<PalletStatusAnalysis> AnalyzePalletStatus(string orderNo, string palletCode, int stockId)
- {
- var result = new PalletStatusAnalysis
- {
- OrderNo = orderNo,
- PalletCode = palletCode,
- StockId = stockId
- };
-
- // 鍒嗘瀽鏈垎鎷ｇ殑鍑哄簱閿佸畾璁板綍
- var remainingLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(it => it.OrderNo == orderNo &&
- it.PalletCode == palletCode &&
- it.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
- .ToListAsync();
-
- if (remainingLocks.Any())
- {
- result.HasRemainingLocks = true;
- result.RemainingLocks = remainingLocks;
- result.RemainingLocksReturnQty = remainingLocks.Sum(x => x.AssignQuantity - x.PickedQty);
- _logger.LogInformation($"鍙戠幇{remainingLocks.Count}鏉℃湭鍒嗘嫞閿佸畾璁板綍锛屾�绘暟閲�: {result.RemainingLocksReturnQty}");
- }
-
- // 鍒嗘瀽鎵樼洏涓婄殑搴撳瓨璐х墿
- var palletStockGoods = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .Where(it => it.StockId == stockId &&
- (it.Status == StockStatusEmun.鍏ュ簱纭.ObjToInt() ||
- it.Status == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() ||
- it.Status == StockStatusEmun.鍑哄簱閿佸畾.ObjToInt()))
- .Where(it => it.StockQuantity > 0)
- .ToListAsync();
-
- if (palletStockGoods.Any())
- {
- result.HasPalletStockGoods = true;
- result.PalletStockGoods = palletStockGoods;
- result.PalletStockReturnQty = palletStockGoods.Sum(x => x.StockQuantity);
- _logger.LogInformation($"鍙戠幇{palletStockGoods.Count}涓簱瀛樿揣鐗╋紝鎬绘暟閲�: {result.PalletStockReturnQty}");
-
- // 璁板綍璇︾粏鐘舵�佸垎甯�
- var statusGroups = palletStockGoods.GroupBy(x => x.Status);
- foreach (var group in statusGroups)
- {
- _logger.LogInformation($"搴撳瓨鐘舵�亄group.Key}: {group.Count()}涓揣鐗╋紝鏁伴噺: {group.Sum(x => x.StockQuantity)}");
- }
- }
-
- //鍒嗘瀽鎷嗗寘璁板綍
- var splitRecords = await _splitPackageService.Db.Queryable<Dt_SplitPackageRecord>()
- .Where(it => it.OrderNo == orderNo &&
- it.PalletCode == palletCode &&
- !it.IsReverted && it.Status != (int)SplitPackageStatusEnum.宸叉嫞閫� &&
- it.Status != (int)SplitPackageStatusEnum.宸插洖搴�)
- .ToListAsync();
-
- if (splitRecords.Any())
- {
- result.HasSplitRecords = true;
- result.SplitRecords = splitRecords;
- result.SplitReturnQty = await CalculateSplitReturnQuantity(splitRecords, stockId);
-
- _logger.LogInformation($"鍙戠幇{splitRecords.Count}鏉℃湭鎷ｉ�夋媶鍖呰褰曪紝鎬绘暟閲�: {result.SplitReturnQty}");
- }
-
- // 4. 璁＄畻鎬诲洖搴撴暟閲忓拰绌烘墭鐩樼姸鎬�
- result.TotalReturnQty = result.RemainingLocksReturnQty + result.PalletStockReturnQty + result.SplitReturnQty;
- result.HasItemsToReturn = result.TotalReturnQty > 0;
- result.IsEmptyPallet = !result.HasItemsToReturn;
-
- // 5. 妫�鏌ユ槸鍚︽湁杩涜涓殑浠诲姟
- result.HasActiveTasks = await _taskRepository.Db.Queryable<Dt_Task>()
- .Where(x => x.OrderNo == orderNo && x.TaskType == TaskTypeEnum.InPick.ObjToInt() &&
- x.PalletCode == palletCode &&
- x.TaskStatus == (int)TaskStatusEnum.New)
- .AnyAsync();
-
- _logger.LogInformation($"鎵樼洏鐘舵�佸垎鏋愬畬鎴� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, " +
- $"鎬诲洖搴撴暟閲�: {result.TotalReturnQty}, 鏄惁绌烘墭鐩�: {result.IsEmptyPallet}, " +
- $"鏈夎繘琛屼腑浠诲姟: {result.HasActiveTasks}");
-
- return result;
- }
- private async Task<decimal> CalculateSplitReturnQuantity(List<Dt_SplitPackageRecord> splitRecords, int stockId)
- {
- decimal totalQty = 0;
- var processedBarcodes = new HashSet<string>();
-
- foreach (var splitRecord in splitRecords)
- {
- if (splitRecord.Status != (int)SplitPackageStatusEnum.宸叉挙閿�)
- continue;
- // 妫�鏌ュ師鏉＄爜
- if (!processedBarcodes.Contains(splitRecord.OriginalBarcode))
- {
- var originalStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .Where(it => it.Barcode == splitRecord.OriginalBarcode && it.StockId == stockId &&
- it.Status != StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt())
- .FirstAsync();
-
- if (originalStock != null && originalStock.StockQuantity > 0)
- {
- totalQty += originalStock.StockQuantity;
- processedBarcodes.Add(splitRecord.OriginalBarcode);
- }
- }
-
- // 妫�鏌ユ柊鏉＄爜
- if (!processedBarcodes.Contains(splitRecord.NewBarcode))
- {
- var newStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .Where(it => it.Barcode == splitRecord.NewBarcode && it.StockId == stockId && it.Status != StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt())
- .FirstAsync();
-
- if (newStock != null && newStock.StockQuantity > 0)
- {
- totalQty += newStock.StockQuantity;
- processedBarcodes.Add(splitRecord.NewBarcode);
- }
- }
- }
-
- return totalQty;
- }
-
- /// <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 = "鍒嗘壒鍥炲簱")
{
+ ReturnTaskInfo returnTaskInfo = null;
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);
+ // 鑾峰彇搴撳瓨淇℃伅
+ 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}");
- // 鍙互鏍规嵁瀹為檯鎯呭喌鍐冲畾鏄惁缁х画
+ _logger.LogWarning($"鍥炲簱鍓嶆暟鎹獙璇佸け璐�: {validationResult.ErrorMessage}");
}
- // 4. 鍒嗘瀽鎵樼洏鐘舵��
+ // 鍒嗘瀽鎵樼洏鐘舵��
var statusAnalysis = await AnalyzePalletStatusForReturn(orderNo, palletCode, stockInfo.Id);
if (!statusAnalysis.HasItemsToReturn)
@@ -2036,19 +1833,25 @@
_logger.LogInformation($"銆愭棤鍥炲簱鐗╁搧銆戝鐞嗙┖鎵樼洏");
var result = await HandleEmptyPalletReturn(orderNo, palletCode, stockInfo);
_unitOfWorkManage.CommitTran();
+
+ // 鍦ㄤ簨鍔℃彁浜ゅ悗澶勭悊ESS鍛戒护
+ if (result.Status && result.Data is ReturnTaskInfo taskInfo)
+ {
+ await ProcessESSAfterTransaction(palletCode, taskInfo);
+ }
return result;
}
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- _logger.LogError($"绌虹鍥炲簱澶辫触: {ex.Message}");
- return WebResponseContent.Instance.Error($"绌虹鍥炲簱澶辫触锛歿ex.Message}");
+ _logger.LogError($"绌虹鍥炲簱ExecutePalletReturn澶辫触: {ex.Message}");
+ return WebResponseContent.Instance.Error($"绌虹鍥炲簱ExecutePalletReturn澶辫触锛歿ex.Message}");
}
}
_logger.LogInformation($"銆愬紑濮嬪洖搴撱�戞�诲洖搴撴暟閲�: {statusAnalysis.TotalReturnQty}, 鏉＄爜鏁�: {statusAnalysis.AllBarcodes.Count}");
- // 5. 鎵ц鍥炲簱鎿嶄綔
+ // 鎵ц鍥炲簱鎿嶄綔
try
{
await ExecuteEnhancedReturnOperations(statusAnalysis);
@@ -2060,23 +1863,29 @@
await ExecuteSimpleReturnDataOperations(statusAnalysis);
}
- // 6. 鏇存柊璁㈠崟鐘舵��
+ // 鏇存柊璁㈠崟鐘舵��
await UpdateOrderStatusAfterReturn(orderNo);
-
- _unitOfWorkManage.CommitTran();
-
- // 7. 鍒涘缓鍥炲簱浠诲姟
+
+ // 鍒涘缓鍥炲簱浠诲姟
try
{
- await CreateReturnTask(orderNo, palletCode, stockInfo);
+ // 鍒涘缓鍥炲簱浠诲姟锛屼絾涓嶅彂閫丒SS鍛戒护
+ returnTaskInfo = await CreateReturnTaskWithoutESS(orderNo, palletCode, stockInfo);
+
}
catch (Exception taskEx)
{
- _logger.LogError($"鍥炲簱浠诲姟鍒涘缓澶辫触: {taskEx.Message}");
+ _logger.LogError($"鍥炲簱浠诲姟CreateReturnTaskWithoutESS鍒涘缓澶辫触: {taskEx.Message}");
// 浠诲姟鍒涘缓澶辫触涓嶅奖鍝嶆暟鎹洖搴�
}
_unitOfWorkManage.CommitTran();
- // 8. 鍥炲簱鍚庨獙璇�
+
+ // 鍦ㄤ簨鍔℃彁浜ゅ悗澶勭悊ESS鍛戒护
+ if (returnTaskInfo != null && returnTaskInfo.ShouldSendESS)
+ {
+ await ProcessESSAfterTransaction(palletCode, returnTaskInfo);
+ }
+ // 鍥炲簱鍚庨獙璇�
await ValidateDataAfterReturn(orderNo, palletCode, stockId);
return WebResponseContent.Instance.OK($"鍥炲簱鎴愬姛锛屽洖搴撴暟閲忥細{statusAnalysis.TotalReturnQty}", new
@@ -2091,11 +1900,112 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- _logger.LogError($"鍥炲簱澶辫触: {ex.Message}");
- return WebResponseContent.Instance.Error($"鍥炲簱澶辫触锛歿ex.Message}");
+ _logger.LogError($"ExecutePalletReturn 鍥炲簱澶辫触: {ex.Message}");
+ return WebResponseContent.Instance.Error($"ExecutePalletReturn 鍥炲簱澶辫触锛歿ex.Message}");
}
}
+ /// <summary>
+ /// 浜嬪姟鎻愪氦鍚庡鐞咵SS鍛戒护 - 鐙珛鏂规硶锛岄伩鍏嶄簨鍔￠攣
+ /// </summary>
+ private async Task ProcessESSAfterTransaction(string palletCode, ReturnTaskInfo taskInfo)
+ {
+ try
+ {
+ _logger.LogInformation($"寮�濮嬪鐞咵SS鍛戒护 - 鎵樼洏: {palletCode}");
+
+ if (taskInfo == null || !taskInfo.ShouldSendESS || taskInfo.ReturnTask == null)
+ {
+ _logger.LogWarning($"鏃犻渶鍙戦�丒SS鍛戒护鎴栦换鍔′俊鎭笉瀹屾暣");
+ return;
+ }
+
+ // 鍙戦�丒SS鍛戒护
+ await SendESSCommands(palletCode, taskInfo.OriginalTaskTargetAddress, taskInfo.ReturnTask);
+
+ _logger.LogInformation($"ESS鍛戒护澶勭悊瀹屾垚 - 鎵樼洏: {palletCode}, 浠诲姟鍙�: {taskInfo.ReturnTask.TaskNum}");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"澶勭悊ESS鍛戒护澶辫触 - 鎵樼洏: {palletCode}, Error: {ex.Message}");
+ // 杩欓噷涓嶆姏鍑哄紓甯革紝鍥犱负鏁版嵁鍥炲簱宸茬粡鎴愬姛锛孍SS鍛戒护鍙戦�佸け璐ュ彲浠ョ◢鍚庨噸璇�
+ }
+ }
+ /// <summary>
+ /// 鍒涘缓鍥炲簱浠诲姟锛堜笉鍙戦�丒SS鍛戒护锛�- 鐢ㄤ簬浜嬪姟鍐呭鐞�
+ /// </summary>
+ private async Task<ReturnTaskInfo> CreateReturnTaskWithoutESS(string orderNo, string palletCode, Dt_StockInfo stockInfo)
+ {
+ try
+ {
+ // 鑾峰彇褰撳墠浠诲姟淇℃伅
+ var currentTask = await _taskRepository.Db.Queryable<Dt_Task>()
+ .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
+ .FirstAsync();
+
+ if (currentTask == null)
+ {
+ _logger.LogWarning($"鏈壘鍒板綋鍓嶄换鍔� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}");
+ return null;
+ }
+
+ // 鍒嗛厤鏂拌揣浣�
+ var newLocation = _locationInfoService.AssignLocation(stockInfo.LocationType);
+
+ var returnTask = new Dt_Task()
+ {
+ CurrentAddress = stations[currentTask.TargetAddress],
+ Grade = 0,
+ PalletCode = palletCode,
+ NextAddress = "",
+ OrderNo = orderNo,
+ Roadway = newLocation.RoadwayNo,
+ SourceAddress = stations[currentTask.TargetAddress],
+ TargetAddress = newLocation.LocationCode,
+ TaskStatus = TaskStatusEnum.New.ObjToInt(),
+ TaskType = TaskTypeEnum.InPick.ObjToInt(),
+ PalletType = stockInfo.PalletType,
+ WarehouseId = currentTask.WarehouseId
+ };
+
+ try
+ {
+ await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();
+
+ _logger.LogInformation($"鍒涘缓鍥炲簱浠诲姟鎴愬姛: {returnTask.TaskNum}, 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}");
+
+ // 鍒犻櫎鍘熷鍑哄簱浠诲姟
+ _logger.LogInformation($"寮�濮嬪垹闄ゅ巻鍙蹭换鍔�: {orderNo}, {currentTask.TaskNum}");
+ var result = _task_HtyService.DeleteAndMoveIntoHty(currentTask, OperateTypeEnum.浜哄伐鍒犻櫎);
+ await _taskRepository.Db.Deleteable(currentTask).ExecuteCommandAsync();
+
+ if (!result)
+ {
+ await _taskRepository.Db.Deleteable(currentTask).ExecuteCommandAsync();
+ }
+ _logger.LogInformation($"鍒犻櫎鍘嗗彶浠诲姟瀹屾垚: {currentTask.TaskNum}, 褰卞搷琛屾暟: {result}");
+
+ // 杩斿洖浠诲姟淇℃伅锛屼絾涓嶅彂閫丒SS鍛戒护
+ return new ReturnTaskInfo
+ {
+ ShouldSendESS = true,
+ PalletCode = palletCode,
+ OriginalTaskTargetAddress = currentTask.TargetAddress,
+ ReturnTask = returnTask
+ };
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"鍒涘缓鍥炲簱浠诲姟澶辫触 - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, Error: {ex.Message}");
+ throw new Exception($"鍒涘缓鍥炲簱浠诲姟澶辫触 - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}", ex);
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"鍒涘缓鍥炲簱浠诲姟澶辫触 - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, Error: {ex.Message}");
+ return null;
+ }
+ }
/// <summary>
/// 澧炲己鐨勫洖搴撳墠鏁版嵁楠岃瘉
/// </summary>
@@ -2105,7 +2015,7 @@
try
{
- // 1. 楠岃瘉搴撳瓨鏁版嵁
+ // 楠岃瘉搴撳瓨鏁版嵁
var stockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
.Where(x => x.StockId == stockId)
.ToListAsync();
@@ -2117,7 +2027,7 @@
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();
@@ -2129,7 +2039,7 @@
errors.Add($"鍙戠幇宸叉嫞閫夋暟閲忓ぇ浜庡垎閰嶆暟閲忕殑閿佸畾璁板綍");
}
- // 3. 楠岃瘉鎷嗗寘璁板綍
+ // 楠岃瘉鎷嗗寘璁板綍
var splitRecords = await _splitPackageService.Db.Queryable<Dt_SplitPackageRecord>()
.Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
.ToListAsync();
@@ -2174,40 +2084,293 @@
}
}
- /// <summary>
- /// 鎵ц澧炲己鐨勫洖搴撴搷浣�
+ // <summary>
+ /// 鎵ц澧炲己鐨勫洖搴撴搷浣� - 淇鐗堬紙閬垮厤閲嶅澶勭悊锛�
/// </summary>
private async Task ExecuteEnhancedReturnOperations(PalletStatusAnalysis statusAnalysis)
{
- _logger.LogInformation($"鎵ц澧炲己鍥炲簱鎿嶄綔 - 璁㈠崟: {statusAnalysis.OrderNo}, 鎵樼洏: {statusAnalysis.PalletCode}");
+ _logger.LogInformation($"銆愬紑濮嬫墽琛屽洖搴撴搷浣溿�戣鍗�: {statusAnalysis.OrderNo}, 鎵樼洏: {statusAnalysis.PalletCode}");
+
+ // 浣跨敤鏈湴宸插鐞嗛泦鍚堬紝閬垮厤閲嶅
+ var locallyProcessedBarcodes = new HashSet<string>();
+ decimal totalProcessedQty = 0;
// 澶勭悊宸插垎閰嶇殑閿佸畾璁板綍
if (statusAnalysis.HasRemainingLocks)
{
- await HandleAllocatedLocksReturn(statusAnalysis.RemainingLocks);
+ _logger.LogInformation($"澶勭悊宸插垎閰嶉攣瀹氳褰� - {statusAnalysis.RemainingLocks.Count} 鏉�");
+ foreach (var lockInfo in statusAnalysis.RemainingLocks)
+ {
+ if (string.IsNullOrEmpty(lockInfo.CurrentBarcode) ||
+ locallyProcessedBarcodes.Contains(lockInfo.CurrentBarcode))
+ {
+ _logger.LogInformation($"璺宠繃宸插鐞嗘潯鐮佺殑閿佸畾璁板綍: {lockInfo.CurrentBarcode}");
+ continue;
+ }
+
+ decimal returnQty = lockInfo.AssignQuantity - lockInfo.PickedQty;
+ if (returnQty > 0)
+ {
+ // 銆愪慨澶嶃�戜紶閫� isUnallocated = false
+ await ProcessSingleBarcodeReturn(lockInfo.CurrentBarcode, statusAnalysis.StockId, returnQty, false);
+ locallyProcessedBarcodes.Add(lockInfo.CurrentBarcode);
+ totalProcessedQty += returnQty;
+ _logger.LogInformation($"宸插鐞嗛攣瀹氳褰� - 鏉＄爜: {lockInfo.CurrentBarcode}, 鏁伴噺: {returnQty}");
+ }
+ }
}
- // 澶勭悊鏈垎閰嶇殑閿佸畾璁板綍
+ // 澶勭悊鏈垎閰嶇殑閿佸畾璁板綍
if (statusAnalysis.HasUnallocatedLocks)
{
- await HandleUnallocatedLocksReturn(statusAnalysis.UnallocatedLocks);
+ _logger.LogInformation($"澶勭悊鏈垎閰嶉攣瀹氳褰� - {statusAnalysis.UnallocatedLocks.Count} 鏉�");
+ foreach (var lockInfo in statusAnalysis.UnallocatedLocks)
+ {
+ if (string.IsNullOrEmpty(lockInfo.CurrentBarcode) ||
+ locallyProcessedBarcodes.Contains(lockInfo.CurrentBarcode))
+ {
+ _logger.LogInformation($"璺宠繃宸插鐞嗘潯鐮佺殑鏈垎閰嶉攣瀹�: {lockInfo.CurrentBarcode}");
+ continue;
+ }
+
+ decimal returnQty = lockInfo.AssignQuantity - lockInfo.PickedQty;
+ if (returnQty > 0)
+ {
+ // 銆愪慨澶嶃�戜娇鐢ㄤ笓闂ㄧ殑鏈垎閰嶉攣瀹氬鐞嗘柟娉�
+ await ProcessUnallocatedLockReturn(lockInfo, returnQty);
+ locallyProcessedBarcodes.Add(lockInfo.CurrentBarcode);
+ totalProcessedQty += returnQty;
+ _logger.LogInformation($"宸插鐞嗘湭鍒嗛厤閿佸畾 - 鏉＄爜: {lockInfo.CurrentBarcode}, 鏁伴噺: {returnQty}");
+ }
+ }
}
// 澶勭悊鏈垎閰嶇殑搴撳瓨璐х墿
if (statusAnalysis.HasPalletStockGoods)
{
- await HandleUnallocatedStockReturn(statusAnalysis.PalletStockGoods);
+ _logger.LogInformation($"澶勭悊鏈垎閰嶅簱瀛樿揣鐗� - {statusAnalysis.PalletStockGoods.Count} 涓�");
+ foreach (var stockDetail in statusAnalysis.PalletStockGoods)
+ {
+ if (string.IsNullOrEmpty(stockDetail.Barcode) ||
+ locallyProcessedBarcodes.Contains(stockDetail.Barcode))
+ {
+ _logger.LogInformation($"璺宠繃宸插鐞嗘潯鐮佺殑搴撳瓨: {stockDetail.Barcode}");
+ continue;
+ }
+
+ decimal returnQty = stockDetail.StockQuantity;
+ if (returnQty > 0)
+ {
+ await ProcessUnallocatedStockReturn(stockDetail);
+ locallyProcessedBarcodes.Add(stockDetail.Barcode);
+ totalProcessedQty += returnQty;
+ _logger.LogInformation($"宸插鐞嗘湭鍒嗛厤搴撳瓨 - 鏉＄爜: {stockDetail.Barcode}, 鏁伴噺: {returnQty}");
+ }
+ }
}
- // 澶勭悊鎷嗗寘璁板綍
- if (statusAnalysis.HasSplitRecords)
+ // 澶勭悊鎷嗗寘璁板綍 - 鍙鐞嗘湭琚叾浠栭�昏緫瑕嗙洊鐨勬潯鐮�
+ if (statusAnalysis.HasSplitRecords && statusAnalysis.SplitReturnQty > 0)
{
- await HandleSplitRecordsReturn(statusAnalysis.SplitRecords, statusAnalysis.StockId);
+ _logger.LogInformation($"澶勭悊鎷嗗寘璁板綍鐩稿叧搴撳瓨 - 鏂板鏁伴噺: {statusAnalysis.SplitReturnQty}");
+
+ // 鍙鐞嗗湪SplitRecords涓絾涓嶅湪宸插鐞嗛泦鍚堜腑鐨勬潯鐮�
+ var splitBarcodes = statusAnalysis.SplitRecords
+ .SelectMany(r => new[] { r.OriginalBarcode, r.NewBarcode })
+ .Where(b => !string.IsNullOrEmpty(b))
+ .Distinct()
+ .ToList();
+
+ foreach (var barcode in splitBarcodes)
+ {
+ if (locallyProcessedBarcodes.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;
+ await ProcessSingleBarcodeReturn(barcode, statusAnalysis.StockId, returnQty);
+ locallyProcessedBarcodes.Add(barcode);
+ totalProcessedQty += returnQty;
+ _logger.LogInformation($"澶勭悊鎷嗗寘鏉＄爜 - {barcode}, 鏁伴噺: {returnQty}");
+ }
+ }
+ }
+
+ _logger.LogInformation($"銆愬洖搴撴搷浣滃畬鎴愩�戞�诲鐞嗘暟閲�: {totalProcessedQty}, 澶勭悊鏉＄爜鏁�: {locallyProcessedBarcodes.Count}");
+
+ // 楠岃瘉澶勭悊鏁伴噺涓庨鏈熶竴鑷�
+ if (Math.Abs(totalProcessedQty - statusAnalysis.TotalReturnQty) > 0.01m)
+ {
+ _logger.LogWarning($"澶勭悊鏁伴噺({totalProcessedQty})涓庨鏈�({statusAnalysis.TotalReturnQty})涓嶄竴鑷达紝浣嗙户缁墽琛�");
+ }
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鍗曚釜鏉＄爜鍥炲簱锛堥�氱敤鏂规硶锛�- 鍖哄垎宸插垎閰嶅拰鏈垎閰�
+ /// </summary>
+ private async Task ProcessSingleBarcodeReturn(string barcode, int stockId, decimal returnQty, bool isUnallocated = false)
+ {
+ try
+ {
+ _logger.LogInformation($"澶勭悊鍗曚釜鏉＄爜鍥炲簱 - {barcode}, 鏁伴噺: {returnQty}, 鏄惁鏈垎閰�: {isUnallocated}");
+
+ 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($"鍥炲簱鍓嶇姸鎬� - 搴撳瓨: {originalStockQty}, 鍑哄簱: {originalOutboundQty}, 鐘舵��: {GetStockStatusName(originalStatus)}");
+
+ // 鏍规嵁鏄惁鏈垎閰嶅喅瀹氬鐞嗛�昏緫
+ if (isUnallocated)
+ {
+ // 鏈垎閰嶉攣瀹氾細鍙仮澶嶇姸鎬侊紝涓嶆敼鍙樺簱瀛樻暟閲�
+ // 鍑哄簱鏁伴噺搴斾负0
+ if (stockDetail.OutboundQuantity > 0)
+ {
+ _logger.LogWarning($"鏈垎閰嶉攣瀹氱殑搴撳瓨鍑哄簱鏁伴噺涓嶄负0锛岄噸缃负0 - 鏉＄爜: {stockDetail.Barcode}, 褰撳墠鍑哄簱: {stockDetail.OutboundQuantity}");
+ stockDetail.OutboundQuantity = 0;
+ }
+
+ // 搴撳瓨鏁伴噺淇濇寔涓嶅彉
+ _logger.LogInformation($"鏈垎閰嶉攣瀹氬洖搴� - 搴撳瓨鏁伴噺淇濇寔涓嶅彉: {stockDetail.StockQuantity}");
+ }
+ else
+ {
+ // 宸插垎閰嶉攣瀹氾細鎭㈠搴撳瓨鏁伴噺
+ stockDetail.StockQuantity += returnQty;
+
+ // 鍑忓皯鍑哄簱鏁伴噺锛堝鏋滃嚭搴撴暟閲忓ぇ浜�0锛�
+ if (stockDetail.OutboundQuantity >= returnQty)
+ {
+ stockDetail.OutboundQuantity -= returnQty;
+ }
+ else
+ {
+ // 濡傛灉鍑哄簱鏁伴噺灏忎簬鍥炲簱鏁伴噺锛岃鏄庢暟鎹紓甯革紝鍑哄簱鏁伴噺娓呴浂
+ _logger.LogWarning($"鍑哄簱鏁伴噺({stockDetail.OutboundQuantity})灏忎簬鍥炲簱鏁伴噺({returnQty})锛屾竻闆�");
+ stockDetail.OutboundQuantity = 0;
+ }
+
+ _logger.LogInformation($"宸插垎閰嶉攣瀹氬洖搴� - 搴撳瓨鏁伴噺澧炲姞: {originalStockQty} -> {stockDetail.StockQuantity}");
+ }
+
+ // 鏇存柊鐘舵��
+ stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+
+ _logger.LogInformation($"鏉＄爜鍥炲簱瀹屾垚 - {barcode}: 搴撳瓨 {originalStockQty}->{stockDetail.StockQuantity}, 鍑哄簱 {originalOutboundQty}->{stockDetail.OutboundQuantity}");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"澶勭悊鏉＄爜鍥炲簱澶辫触 - {barcode}: {ex.Message}");
+ throw;
+ }
+ }
+ /// <summary>
+ /// 澶勭悊鏈垎閰嶉攣瀹氳褰曞洖搴� - 淇鐗堟湰
+ /// 鏈垎閰嶉攣瀹氳褰曪細鍙仮澶嶇姸鎬侊紝涓嶅鍔犲簱瀛樻暟閲�
+ /// </summary>
+ private async Task ProcessUnallocatedLockReturn(Dt_OutStockLockInfo lockInfo, decimal returnQty)
+ {
+ _logger.LogInformation($"澶勭悊鏈垎閰嶉攣瀹氬洖搴� - 閿佸畾ID: {lockInfo.Id}, 鏉＄爜: {lockInfo.CurrentBarcode}, 鏁伴噺: {returnQty}");
+
+ try
+ {
+ // 楠岃瘉閿佸畾璁板綍鐘舵��
+ if (lockInfo.Status != (int)OutLockStockStatusEnum.鍑哄簱涓� &&
+ lockInfo.Status != (int)OutLockStockStatusEnum.鍥炲簱涓�)
+ {
+ _logger.LogWarning($"閿佸畾璁板綍鐘舵�佷笉鏄嚭搴撲腑鎴栧洖搴撲腑锛岃烦杩囧鐞� - 鐘舵��: {lockInfo.Status}");
+ return;
+ }
+
+ // 鑾峰彇搴撳瓨鏄庣粏
+ var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId);
+
+ if (stockDetail == null)
+ {
+ _logger.LogError($"鏈壘鍒板簱瀛樻槑缁� - 鏉＄爜: {lockInfo.CurrentBarcode}, StockId: {lockInfo.StockId}");
+ throw new InvalidOperationException($"搴撳瓨鏄庣粏涓嶅瓨鍦�: {lockInfo.CurrentBarcode}");
+ }
+
+ // 璁板綍鍘熷鐘舵��
+ decimal originalStockQty = stockDetail.StockQuantity;
+ decimal originalOutboundQty = stockDetail.OutboundQuantity;
+ int originalStatus = stockDetail.Status;
+
+ _logger.LogInformation($"鏈垎閰嶉攣瀹氬洖搴撳墠鐘舵��:");
+ _logger.LogInformation($" 搴撳瓨 - 鏉＄爜: {stockDetail.Barcode}, 鏁伴噺: {originalStockQty}, 鍑哄簱: {originalOutboundQty}, 鐘舵��: {GetStockStatusName(originalStatus)}");
+
+ // 瀵逛簬鏈垎閰嶉攣瀹氳褰曪紝搴撳瓨鏁伴噺涓嶅簲鏀瑰彉锛�
+ // 鍥犱负搴撳瓨鏈潵灏卞瓨鍦紝鍙槸鐘舵�佽閿佸畾
+ // stockDetail.StockQuantity 淇濇寔涓嶅彉
+
+ // 鍑哄簱鏁伴噺搴斾负0锛堟湭鍒嗛厤閿佸畾涓嶅簲璇ユ湁鍑哄簱锛�
+ if (stockDetail.OutboundQuantity > 0)
+ {
+ _logger.LogWarning($"鏈垎閰嶉攣瀹氱殑搴撳瓨鍑哄簱鏁伴噺涓嶄负0锛岄噸缃负0 - 鏉＄爜: {stockDetail.Barcode}, 褰撳墠鍑哄簱: {stockDetail.OutboundQuantity}");
+ stockDetail.OutboundQuantity = 0;
+ }
+
+ // 鏇存柊搴撳瓨鐘舵�佷负鍏ュ簱瀹屾垚锛堟仮澶嶄负鍙敤鐘舵�侊級
+ stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+
+ _logger.LogInformation($"鏇存柊鏈垎閰嶅簱瀛樼姸鎬� - 鏉＄爜: {stockDetail.Barcode}");
+ _logger.LogInformation($" 搴撳瓨鏁伴噺: {originalStockQty} -> {stockDetail.StockQuantity} (淇濇寔涓嶅彉)");
+ _logger.LogInformation($" 鍑哄簱鏁伴噺: {originalOutboundQty} -> {stockDetail.OutboundQuantity}");
+ _logger.LogInformation($" 鐘舵��: {GetStockStatusName(originalStatus)} -> {GetStockStatusName(stockDetail.Status)}");
+
+ // 鏇存柊閿佸畾璁板綍鐘舵�佷负宸插洖搴�
+ 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($"澶勭悊鏈垎閰嶉攣瀹氬洖搴撳け璐� - 閿佸畾ID: {lockInfo.Id}, Error: {ex.Message}");
+ throw new InvalidOperationException($"澶勭悊鏈垎閰嶉攣瀹氬洖搴撳け璐�: {ex.Message}", ex);
}
}
/// <summary>
- /// 鍥炲簱鍚庢暟鎹獙璇�
+ /// 澶勭悊鏈垎閰嶅簱瀛樺洖搴�
+ /// </summary>
+ private async Task ProcessUnallocatedStockReturn(Dt_StockInfoDetail stockDetail)
+ {
+ _logger.LogInformation($"澶勭悊鏈垎閰嶅簱瀛樺洖搴� - 鏉＄爜: {stockDetail.Barcode}, 鏁伴噺: {stockDetail.StockQuantity}");
+
+ // 鐩存帴鏇存柊搴撳瓨鐘舵��
+ stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+ }
+
+
+ /// <summary>
+ /// 鍥炲簱鍚庢暟鎹獙璇� - 澧炲己鐗�
/// </summary>
private async Task ValidateDataAfterReturn(string orderNo, string palletCode, int stockId)
{
@@ -2215,36 +2378,63 @@
{
_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();
+ decimal totalStock = stockDetails.Sum(x => x.StockQuantity);
- if (stillOutboundLocked.Any())
+ // 楠岃瘉搴撳瓨鏁伴噺鏄惁鍚堢悊
+ var unreasonableStocks = stockDetails.Where(x => x.StockQuantity < 0).ToList();
+ if (unreasonableStocks.Any())
{
- _logger.LogWarning($"鍥炲簱鍚庝粛鏈夊嚭搴撻攣瀹氱姸鎬佺殑搴撳瓨: {stillOutboundLocked.Count}涓�");
+ _logger.LogError($"鍙戠幇璐熸暟搴撳瓨鏁伴噺锛佹潯鐮�: {string.Join(", ", unreasonableStocks.Select(x => x.Barcode))}");
}
- // 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();
+ x.Status != (int)OutLockStockStatusEnum.宸插彇璧� &&
+ x.Status != (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�).ToList();
if (notReturnedLocks.Any())
{
_logger.LogWarning($"鍥炲簱鍚庝粛鏈夋湭鍥炲簱鐘舵�佺殑閿佸畾璁板綍: {notReturnedLocks.Count}鏉�");
+ foreach (var lockInfo in notReturnedLocks)
+ {
+ _logger.LogWarning($"鏈洖搴撻攣瀹� - ID: {lockInfo.Id}, 鐘舵��: {GetLockStatusName(lockInfo.Status)}, 鏉＄爜: {lockInfo.CurrentBarcode}");
+ }
}
- // 3. 鏁版嵁涓�鑷存�ч獙璇�
- decimal totalStock = stockDetails.Sum(x => x.StockQuantity);
- _logger.LogInformation($"鍥炲簱鍚庡簱瀛樻�婚噺: {totalStock}");
+ // 鏁版嵁涓�鑷存�ч獙璇�
+ decimal totalExpectedReturnQty = lockInfos
+ .Where(x => x.Status == (int)OutLockStockStatusEnum.宸插洖搴�)
+ .Sum(x => x.AssignQuantity - x.PickedQty);
+
+ _logger.LogInformation($"鍥炲簱楠岃瘉姹囨��:");
+ _logger.LogInformation($" 鍥炲簱鍚庡簱瀛樻�婚噺: {totalStock}");
+ _logger.LogInformation($" 宸插洖搴撻攣瀹氳褰曟暟閲�: {lockInfos.Count(x => x.Status == (int)OutLockStockStatusEnum.宸插洖搴�)}");
+ _logger.LogInformation($" 鎬诲洖搴撴暟閲忥紙閿佸畾璁板綍璁＄畻锛�: {totalExpectedReturnQty}");
+
+ // 楠岃瘉搴撳瓨鏁伴噺涓庨攣瀹氳褰曠殑涓�鑷存��
+ foreach (var lockInfo in lockInfos.Where(x => !string.IsNullOrEmpty(x.CurrentBarcode)))
+ {
+ var stock = stockDetails.FirstOrDefault(x => x.Barcode == lockInfo.CurrentBarcode);
+ if (stock != null)
+ {
+ // 濡傛灉閿佸畾璁板綍鏄凡鍥炲簱鐘舵�侊紝瀵瑰簲鐨勫簱瀛樺簲璇ユ槸鍏ュ簱瀹屾垚鐘舵��
+ if (lockInfo.Status == (int)OutLockStockStatusEnum.宸插洖搴� &&
+ stock.Status != (int)StockStatusEmun.鍏ュ簱瀹屾垚)
+ {
+ _logger.LogWarning($"閿佸畾璁板綍宸插洖搴撲絾搴撳瓨鐘舵�佷笉姝ｇ‘ - 鏉＄爜: {lockInfo.CurrentBarcode}, 搴撳瓨鐘舵��: {GetStockStatusName(stock.Status)}");
+ }
+ }
+ }
_logger.LogInformation($"鍥炲簱鍚庢暟鎹獙璇佸畬鎴�");
}
@@ -2254,77 +2444,7 @@
}
}
-
- /// <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
@@ -2336,6 +2456,7 @@
_ => $"鏈煡({status})"
};
}
+
/// <summary>
/// 绠�鍖栧洖搴撴暟鎹搷浣滐紙褰撲富鏂规硶澶辫触鏃朵娇鐢級
/// </summary>
@@ -2345,22 +2466,51 @@
try
{
- // 鑾峰彇璇ユ墭鐩樼殑鎵�鏈夋潯鐮�
+ // 鑾峰彇璇ユ墭鐩樼殑鎵�鏈夋潯鐮侊紙鍖呮嫭鎵�鏈夌姸鎬佺殑搴撳瓨锛�
var allStockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .Where(x => x.StockId == statusAnalysis.StockId && x.StockQuantity > 0)
+ .Where(x => x.StockId == statusAnalysis.StockId)
.ToListAsync();
- _logger.LogInformation($"鎵惧埌 {allStockDetails.Count} 涓湁搴撳瓨鐨勬潯鐮�");
+ _logger.LogInformation($"鎵惧埌 {allStockDetails.Count} 涓簱瀛樻槑缁嗚褰�");
foreach (var stockDetail in allStockDetails)
{
- // 鎭㈠鎵�鏈夊簱瀛樼姸鎬佷负鍏ュ簱瀹屾垚
- if (stockDetail.Status == (int)StockStatusEmun.鍑哄簱閿佸畾)
+ // 璁板綍鍘熷鐘舵��
+ int originalStatus = stockDetail.Status;
+ decimal originalStockQty = stockDetail.StockQuantity;
+
+ // 灏嗘墍鏈夊嚭搴撶浉鍏崇殑鐘舵�佹仮澶嶄负鍏ュ簱瀹屾垚
+ if (stockDetail.Status == (int)StockStatusEmun.鍑哄簱閿佸畾 ||
+ //stockDetail.Status == (int)StockStatusEmun.鍑哄簱涓� ||
+ stockDetail.Status == (int)StockStatusEmun.鍑哄簱瀹屾垚)
{
+ // 濡傛灉鏄嚭搴撳畬鎴愮姸鎬佷笖搴撳瓨涓�0锛屽彲鑳介渶瑕佺壒娈婂鐞�
+ if (stockDetail.Status == (int)StockStatusEmun.鍑哄簱瀹屾垚 && stockDetail.StockQuantity == 0)
+ {
+ _logger.LogInformation($"璺宠繃宸插嚭搴撳畬鎴愮殑闆跺簱瀛樻潯鐮�: {stockDetail.Barcode}");
+ continue;
+ }
+
stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+ // 濡傛灉鏄嚭搴撻攣瀹氱姸鎬佷絾搴撳瓨涓�0锛岄噸缃簱瀛樹负1锛堥伩鍏嶉浂搴撳瓨闂锛�
+ if (stockDetail.Status == (int)StockStatusEmun.鍑哄簱閿佸畾 && stockDetail.StockQuantity == 0)
+ {
+ // 鏌ユ壘鏄惁鏈夊搴旂殑閿佸畾璁板綍鏉ョ‘瀹氬簲璇ユ仮澶嶇殑鏁伴噺
+ var lockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.CurrentBarcode == stockDetail.Barcode &&
+ x.StockId == stockDetail.StockId)
+ .FirstAsync();
+
+ if (lockInfo != null)
+ {
+ stockDetail.StockQuantity = lockInfo.AssignQuantity - lockInfo.PickedQty;
+ _logger.LogInformation($"鎭㈠闆跺簱瀛樻潯鐮佺殑鏁伴噺 - 鏉＄爜: {stockDetail.Barcode}, 鏁伴噺: {stockDetail.StockQuantity}");
+ }
+ }
+
await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
- _logger.LogInformation($"绠�鍖栧洖搴� - 鏉＄爜: {stockDetail.Barcode}, 鏁伴噺: {stockDetail.StockQuantity}");
+ _logger.LogInformation($"绠�鍖栧洖搴� - 鏉＄爜: {stockDetail.Barcode}, 鐘舵��: {GetStockStatusName(originalStatus)} -> 鍏ュ簱瀹屾垚, 鏁伴噺: {originalStockQty} -> {stockDetail.StockQuantity}");
}
}
@@ -2378,7 +2528,7 @@
lockInfo.Operator = App.User.UserName;
await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
- _logger.LogInformation($"绠�鍖栧洖搴� - 閿佸畾璁板綍: {lockInfo.Id}");
+ _logger.LogInformation($"绠�鍖栧洖搴� - 閿佸畾璁板綍: {lockInfo.Id}, 鐘舵��: 宸插洖搴�");
}
_logger.LogInformation($"銆愮畝鍖栧洖搴撱�戝畬鎴� - 澶勭悊 {allStockDetails.Count} 涓潯鐮�, {allLocks.Count} 鏉￠攣瀹氳褰�");
@@ -2389,416 +2539,25 @@
throw;
}
}
- /// <summary>
- /// 鎵ц鍥炲簱鏁版嵁鎿嶄綔 - 绠�鍖栫増鏈�
- /// </summary>
- private async Task ExecuteReturnDataOperations(PalletStatusAnalysis statusAnalysis)
- {
- _logger.LogInformation($"寮�濮嬫墽琛屽洖搴撴暟鎹搷浣� - 璁㈠崟: {statusAnalysis.OrderNo}, 鎵樼洏: {statusAnalysis.PalletCode}");
-
- try
- {
- // 浣跨敤 HashSet 閬垮厤閲嶅澶勭悊鏉＄爜
- var processedBarcodes = new HashSet<string>();
- decimal totalReturnedQty = 0;
-
- // 1. 澶勭悊宸插垎閰嶇殑鏈垎鎷ｉ攣瀹氳褰�
- if (statusAnalysis.HasRemainingLocks)
- {
- _logger.LogInformation($"澶勭悊 {statusAnalysis.RemainingLocks.Count} 鏉″凡鍒嗛厤鏈垎鎷ｉ攣瀹氳褰�");
-
- 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.HasPalletStockGoods)
- {
- _logger.LogInformation($"澶勭悊 {statusAnalysis.PalletStockGoods.Count} 涓湭鍒嗛厤搴撳瓨璐х墿");
-
- 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}");
- }
- }
- }
-
- // 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)
- {
- _logger.LogError($"鍥炲簱鏁版嵁鎿嶄綔澶辫触 - 璁㈠崟: {statusAnalysis.OrderNo}, 鎵樼洏: {statusAnalysis.PalletCode}, Error: {ex.Message}");
- throw;
- }
- }
- /// <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>
- private async Task HandleUnallocatedLocksReturn(List<Dt_OutStockLockInfo> unallocatedLocks)
+ private string GetStockStatusName(int status)
{
- _logger.LogInformation($"寮�濮嬪鐞嗘湭鍒嗛厤閿佸畾璁板綍鍥炲簱 - 鍏� {unallocatedLocks.Count} 鏉¤褰�");
-
- foreach (var lockInfo in unallocatedLocks)
+ return status switch
{
- // 璁＄畻鍥炲簱鏁伴噺锛堟湭鎷ｉ�夌殑閮ㄥ垎锛�
- decimal returnQty = lockInfo.AssignQuantity - lockInfo.PickedQty;
-
- if (returnQty <= 0)
- {
- _logger.LogInformation($"璺宠繃鏈垎閰嶉攣瀹氳褰� - 閿佸畾ID: {lockInfo.Id}, 宸叉嫞閫夊畬鎴愭垨鏃犻渶鍥炲簱");
- continue;
- }
-
- _logger.LogInformation($"澶勭悊鏈垎閰嶉攣瀹氳褰曞洖搴� - 閿佸畾ID: {lockInfo.Id}, 鏉＄爜: {lockInfo.CurrentBarcode}, 鍥炲簱鏁伴噺: {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.宸插洖搴�;
- lockInfo.Operator = App.User.UserName;
-
- await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
-
- _logger.LogInformation($"鏇存柊鏈垎閰嶉攣瀹氱姸鎬� - 閿佸畾ID: {lockInfo.Id}, 鐘舵��: 鍑哄簱涓� -> 宸插洖搴�");
- }
-
- _logger.LogInformation($"鏈垎閰嶉攣瀹氳褰曞洖搴撳鐞嗗畬鎴� - 鍏卞鐞� {unallocatedLocks.Count} 鏉¤褰�");
+ 1 => "鍏ュ簱纭",
+ 2 => "鍏ュ簱瀹屾垚",
+ 3 => "鍑哄簱閿佸畾",
+ 4 => "鍑哄簱涓�",
+ 5 => "鍑哄簱瀹屾垚",
+ 6 => "宸叉竻鐞�",
+ _ => $"鏈煡({status})"
+ };
}
- private async Task HandleAllocatedLocksReturn(List<Dt_OutStockLockInfo> allocatedLocks)
- {
- _logger.LogInformation($"寮�濮嬪鐞嗗凡鍒嗛厤閿佸畾璁板綍鍥炲簱 - 鍏� {allocatedLocks.Count} 鏉¤褰�");
- // 鎸夎鍗曟槑缁嗗垎缁勫鐞�
- var orderDetailGroups = allocatedLocks.GroupBy(x => x.OrderDetailId);
-
- foreach (var group in orderDetailGroups)
- {
- var orderDetailId = group.Key;
- var groupLocks = group.ToList();
-
- _logger.LogInformation($"澶勭悊璁㈠崟鏄庣粏 {orderDetailId} 鐨� {groupLocks.Count} 鏉￠攣瀹氳褰�");
-
- // 鑾峰彇璁㈠崟鏄庣粏
- var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
- .FirstAsync(x => x.Id == orderDetailId);
-
- if (orderDetail == null)
- {
- _logger.LogWarning($"鏈壘鍒拌鍗曟槑缁� - OrderDetailId: {orderDetailId}");
- continue;
- }
-
- decimal totalReturnQtyForDetail = 0;
-
- foreach (var lockInfo in groupLocks)
- {
- // 璁＄畻鍥炲簱鏁伴噺锛堟湭鎷ｉ�夌殑閮ㄥ垎锛�
- decimal returnQty = lockInfo.AssignQuantity - lockInfo.PickedQty;
-
- if (returnQty <= 0)
- {
- _logger.LogInformation($"璺宠繃閿佸畾璁板綍 - 閿佸畾ID: {lockInfo.Id}, 宸叉嫞閫夊畬鎴愭垨鏃犻渶鍥炲簱");
- continue;
- }
-
- _logger.LogInformation($"澶勭悊宸插垎閰嶉攣瀹氳褰曞洖搴� - 閿佸畾ID: {lockInfo.Id}, 鏉＄爜: {lockInfo.CurrentBarcode}, 鍥炲簱鏁伴噺: {returnQty}");
-
- // 鎭㈠搴撳瓨鐘舵��
- await RestoreStockForLockInfo(lockInfo, returnQty);
-
- // 鏇存柊閿佸畾璁板綍鐘舵�佷负宸插洖搴�
- lockInfo.Status = (int)OutLockStockStatusEnum.宸插洖搴�;
- lockInfo.Operator = App.User.UserName;
-
- await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
-
- _logger.LogInformation($"鏇存柊宸插垎閰嶉攣瀹氱姸鎬� - 閿佸畾ID: {lockInfo.Id}, 鐘舵��: 鍑哄簱涓� -> 宸插洖搴�");
-
- totalReturnQtyForDetail += returnQty;
- }
-
- // 鍑忓皯璁㈠崟鏄庣粏鐨勫垎閰嶆暟閲�
- if (totalReturnQtyForDetail > 0)
- {
- await ReduceOrderDetailAllocation(orderDetail, totalReturnQtyForDetail);
- }
- }
-
- _logger.LogInformation($"宸插垎閰嶉攣瀹氳褰曞洖搴撳鐞嗗畬鎴� - 鍏卞鐞� {allocatedLocks.Count} 鏉¤褰�");
- }
- /// <summary>
- /// 鎭㈠閿佸畾璁板綍瀵瑰簲鐨勫簱瀛�
- /// </summary>
- private async Task RestoreStockForLockInfo(Dt_OutStockLockInfo lockInfo, decimal 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;
- decimal originalOutboundQty = stockDetail.OutboundQuantity;
-
- // 鎭㈠搴撳瓨鏁伴噺锛氬嚭搴撴暟閲忓噺灏戯紝搴撳瓨鏁伴噺澧炲姞
- stockDetail.OutboundQuantity -= returnQty;
- stockDetail.StockQuantity += returnQty;
-
- // 纭繚鏁伴噺涓嶄細涓鸿礋鏁�
- if (stockDetail.OutboundQuantity < 0)
- {
- _logger.LogWarning($"鍑哄簱鏁伴噺鍑虹幇璐熸暟锛岄噸缃负0銆傚師鍊�: {stockDetail.OutboundQuantity + returnQty}");
- stockDetail.OutboundQuantity = 0;
- }
-
- // 鎭㈠搴撳瓨鐘舵�佷负鍙敤鐘舵��
- if (stockDetail.Status == (int)StockStatusEmun.鍑哄簱閿佸畾)
- {
- stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
- _logger.LogInformation($"搴撳瓨鐘舵�佹洿鏂颁负鍏ュ簱瀹屾垚 - 鏉＄爜: {stockDetail.Barcode}");
- }
-
- await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
-
- _logger.LogInformation($"鎭㈠搴撳瓨鐘舵�� - 鏉＄爜: {stockDetail.Barcode}, " +
- $"搴撳瓨鏁伴噺: {originalStockQty} -> {stockDetail.StockQuantity}, " +
- $"鍑哄簱鏁伴噺: {originalOutboundQty} -> {stockDetail.OutboundQuantity}");
- }
- else
- {
- _logger.LogWarning($"鏈壘鍒板搴旂殑搴撳瓨淇℃伅 - 鏉＄爜: {lockInfo.CurrentBarcode}, StockId: {lockInfo.StockId}");
- }
- }
/// <summary>
/// 鍒涘缓鍥炲簱浠诲姟
/// </summary>
@@ -2860,6 +2619,7 @@
_logger.LogInformation($"鍒涘缓鍥炲簱浠诲姟鎴愬姛 - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}");
}
}
+
/// <summary>
/// 鏇存柊鍥炲簱鍚庣殑璁㈠崟鐘舵��
/// </summary>
@@ -2899,6 +2659,12 @@
// 娓呯悊闆跺簱瀛樻暟鎹�
await CleanupZeroStockData(stockInfo.Id);
+ // 鑾峰彇褰撳墠浠诲姟
+ var currentTask = await GetCurrentTask(orderNo, palletCode);
+ if (currentTask == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒板綋鍓嶄换鍔�");
+ }
// 鍒涘缓绌烘墭鐩樺簱瀛樿褰�
var emptyStockInfo = new Dt_StockInfo()
{
@@ -2910,25 +2676,93 @@
emptyStockInfo.Details = new List<Dt_StockInfoDetail>();
_stockInfoService.AddMaterielGroup(emptyStockInfo);
- // 鍒涘缓绌烘墭鐩樺洖搴撲换鍔�
- await CreateReturnTask(orderNo, palletCode, emptyStockInfo);
+ // 鍒涘缓鍥炲簱浠诲姟锛堜笉鍙戦�丒SS鍛戒护锛�
+ var returnTaskInfo = await CreateEmptyPalletReturnTask(orderNo, palletCode, emptyStockInfo, currentTask);
- return WebResponseContent.Instance.OK("绌烘墭鐩樺洖搴撴垚鍔�");
+ return WebResponseContent.Instance.OK("绌烘墭鐩樺洖搴撴垚鍔�", returnTaskInfo);
}
catch (Exception ex)
{
- _logger.LogError($"绌烘墭鐩樺洖搴撳け璐�: {ex.Message}");
- return WebResponseContent.Instance.Error($"绌烘墭鐩樺洖搴撳け璐�: {ex.Message}");
+ _logger.LogError($"绌烘墭鐩樺洖搴撳け璐� HandleEmptyPalletReturn: {ex.Message}");
+ return WebResponseContent.Instance.Error($"绌烘墭鐩樺洖搴撳け璐� HandleEmptyPalletReturn: {ex.Message}");
}
}
- /// <summary>
- /// 鍒嗘瀽鎵樼洏鐘舵�佺敤浜庡洖搴�
- /// 纭繚涓嶄細閿欒璇嗗埆闇�瑕佸洖搴撶殑鐗╁搧
+
+ private async Task<Dt_Task> GetCurrentTask(string orderNo, string palletCode)
+ {
+ // 鍏堝皾璇曢�氳繃璁㈠崟鍙峰拰鎵樼洏鍙锋煡鎵句换鍔�
+ var task = await _taskRepository.Db.Queryable<Dt_Task>()
+ .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
+ .FirstAsync();
+
+ if (task == null)
+ {
+ // 濡傛灉鎵句笉鍒帮紝鍐嶉�氳繃鎵樼洏鍙锋煡鎵�
+ task = await _taskRepository.Db.Queryable<Dt_Task>()
+ .Where(x => x.PalletCode == palletCode)
+ .FirstAsync();
+ }
+
+ return task;
+ }
+
+ // <summary>
+ /// 鍒涘缓绌烘墭鐩樺洖搴撲换鍔★紙涓嶅彂閫丒SS鍛戒护锛�
/// </summary>
+ private async Task<ReturnTaskInfo> CreateEmptyPalletReturnTask(string orderNo, string palletCode, Dt_StockInfo emptyStockInfo, Dt_Task currentTask)
+ {
+ try
+ {
+ // 鍒嗛厤鏂拌揣浣�
+ var newLocation = _locationInfoService.AssignLocation(emptyStockInfo.LocationType);
+
+ var returnTask = new Dt_Task()
+ {
+ CurrentAddress = stations[currentTask.TargetAddress],
+ Grade = 0,
+ PalletCode = palletCode,
+ NextAddress = "",
+ OrderNo = orderNo,
+ Roadway = newLocation.RoadwayNo,
+ SourceAddress = stations[currentTask.TargetAddress],
+ TargetAddress = newLocation.LocationCode,
+ TaskStatus = TaskStatusEnum.New.ObjToInt(),
+ TaskType = TaskTypeEnum.InEmpty.ObjToInt(),
+ PalletType = PalletTypeEnum.Empty.ObjToInt(),
+ WarehouseId = currentTask.WarehouseId
+ };
+
+ await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();
+
+ _logger.LogInformation($"鍒涘缓绌烘墭鐩樺洖搴撲换鍔℃垚鍔�: {returnTask.TaskNum}");
+
+ // 鍒犻櫎鍘熷鍑哄簱浠诲姟
+ var result = _task_HtyService.DeleteAndMoveIntoHty(currentTask, OperateTypeEnum.浜哄伐鍒犻櫎);
+ await _taskRepository.Db.Deleteable(currentTask).ExecuteCommandAsync();
+
+ if (!result)
+ {
+ await _taskRepository.Db.Deleteable(currentTask).ExecuteCommandAsync();
+ }
+
+ // 杩斿洖浠诲姟淇℃伅
+ return new ReturnTaskInfo
+ {
+ ShouldSendESS = true,
+ PalletCode = palletCode,
+ OriginalTaskTargetAddress = currentTask.TargetAddress,
+ ReturnTask = returnTask
+ };
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"鍒涘缓绌烘墭鐩樺洖搴撲换鍔″け璐�: {ex.Message}");
+ throw;
+ }
+ }
/// <summary>
- /// 鍒嗘瀽鎵樼洏鐘舵�佺敤浜庡洖搴� - 瀹屾暣鐗堟湰
- /// 纭繚涓嶄細閿欒璇嗗埆闇�瑕佸洖搴撶殑鐗╁搧锛岄伩鍏嶉噸澶嶈绠�
+ /// 鍒嗘瀽鎵樼洏鐘舵�佺敤浜庡洖搴� - 淇鐗堬紙瑙ｅ喅鎷嗗寘璁板綍閲嶅璁＄畻闂锛�
/// </summary>
private async Task<PalletStatusAnalysis> AnalyzePalletStatusForReturn(string orderNo, string palletCode, int stockId)
{
@@ -2938,550 +2772,108 @@
PalletCode = palletCode,
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>()
+ ProcessedBarcodes = new HashSet<string>()
};
- _logger.LogInformation($"寮�濮嬪垎鏋愭墭鐩樼姸鎬佺敤浜庡洖搴� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, StockId: {stockId}");
+ _logger.LogInformation($"銆愬洖搴撳垎鏋愩�戝紑濮嬪垎鏋愭墭鐩樼姸鎬� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, StockId: {stockId}");
try
{
- // 1. 鍒嗘瀽鎵�鏈夐攣瀹氳褰曪紙鐘舵�佷负鍑哄簱涓級
- var allUnfinishedLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.OrderNo == orderNo &&
- x.PalletCode == palletCode &&
- x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
- .ToListAsync();
-
- if (allUnfinishedLocks.Any())
- {
- _logger.LogInformation($"鎵惧埌 {allUnfinishedLocks.Count} 鏉″嚭搴撲腑鐘舵�佺殑閿佸畾璁板綍");
-
- // 鍖哄垎宸插垎閰嶅拰鏈垎閰嶇殑閿佸畾璁板綍
- 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)
+ .Where(x => x.StockId == stockId && x.StockQuantity > 0)
.ToListAsync();
- if (allStockDetails.Any())
- {
- _logger.LogInformation($"鎵惧埌 {allStockDetails.Count} 涓嚭搴撻攣瀹氱姸鎬佺殑搴撳瓨璐х墿");
+ _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.宸插洖搴�)
+ // 鍒嗘瀽鎵�鏈夐攣瀹氳褰曪紙宸插垎閰嶅拰鏈垎閰嶏級
+ var allLockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
.ToListAsync();
- if (splitRecords.Any())
+ // 鍖哄垎宸插垎閰嶅拰鏈垎閰嶉攣瀹氳褰�
+ var allocatedLocks = allLockInfos
+ .Where(x => x.IsUnallocated != 1 && x.OrderDetailId > 0 &&
+ x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
+ .ToList();
+
+ var unallocatedLocks = allLockInfos
+ .Where(x => (x.IsUnallocated == 1 || x.OrderDetailId == 0) &&
+ x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
+ .ToList();
+
+ // 澶勭悊宸插垎閰嶉攣瀹氳褰�
+ if (allocatedLocks.Any())
{
- result.HasSplitRecords = true;
- result.SplitRecords = splitRecords;
+ result.HasRemainingLocks = true;
+ result.RemainingLocks = allocatedLocks;
- // 璁＄畻鎷嗗寘璁板綍鐩稿叧鐨勫洖搴撴暟閲忥紙閬垮厤閲嶅璁＄畻锛�
- var splitBarcodes = new HashSet<string>();
- decimal splitReturnQty = 0;
-
- foreach (var splitRecord in splitRecords)
+ // 瀵逛簬宸插垎閰嶉攣瀹氳褰曪紝鍥炲簱鏁伴噺鏄湭鎷ｉ�夌殑閮ㄥ垎
+ result.RemainingLocksReturnQty = allocatedLocks.Sum(x =>
{
- // 鍘熸潯鐮�
- if (!string.IsNullOrEmpty(splitRecord.OriginalBarcode) && !splitBarcodes.Contains(splitRecord.OriginalBarcode))
+ var returnQty = x.AssignQuantity - x.PickedQty;
+ return returnQty > 0 ? returnQty : 0;
+ });
+
+ foreach (var lockInfo in allocatedLocks)
+ {
+ if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode))
{
- 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}");
- }
+ result.AllBarcodes.Add(lockInfo.CurrentBarcode);
+ result.ProcessedBarcodes.Add(lockInfo.CurrentBarcode);
}
-
- // 鏂版潯鐮�
- 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}");
+ _logger.LogInformation($"鍙戠幇 {allocatedLocks.Count} 鏉″凡鍒嗛厤閿佸畾璁板綍锛屽洖搴撴暟閲�: {result.RemainingLocksReturnQty}");
}
- else
+
+ // 澶勭悊鏈垎閰嶉攣瀹氳褰曪紙鑷姩鎷嗗寘浜х敓鐨勶級
+ if (unallocatedLocks.Any())
{
- _logger.LogInformation($"鏈壘鍒伴渶瑕佸洖搴撶殑鎷嗗寘璁板綍");
+ result.HasUnallocatedLocks = true;
+ result.UnallocatedLocks = unallocatedLocks;
+
+ // 瀵逛簬鏈垎閰嶉攣瀹氳褰曪紝鍥炲簱鏁伴噺鏄畠鐨勫垎閰嶆暟閲忥紙鍥犱负鏈嫞閫夎繃锛�
+ // 浣嗗疄闄呬笂锛屽簱瀛樻湰鏉ュ氨瀛樺湪锛屽彧鏄姸鎬侀渶瑕佹仮澶�
+ result.UnallocatedLocksReturnQty = unallocatedLocks.Sum(x => x.AssignQuantity);
+
+ foreach (var lockInfo in unallocatedLocks)
+ {
+ if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode) &&
+ !result.ProcessedBarcodes.Contains(lockInfo.CurrentBarcode))
+ {
+ result.AllBarcodes.Add(lockInfo.CurrentBarcode);
+ result.ProcessedBarcodes.Add(lockInfo.CurrentBarcode);
+ }
+ }
+ _logger.LogInformation($"鍙戠幇 {unallocatedLocks.Count} 鏉℃湭鍒嗛厤閿佸畾璁板綍锛屽洖搴撴暟閲忥紙鐘舵�佹仮澶嶏級: {result.UnallocatedLocksReturnQty}");
}
- // 4. 璁＄畻鎬诲洖搴撴暟閲忓拰绌烘墭鐩樼姸鎬�
- result.TotalReturnQty = result.RemainingLocksReturnQty +
- result.UnallocatedLocksReturnQty +
- result.PalletStockReturnQty +
- result.SplitReturnQty;
+ // 閲嶆柊璁＄畻鎬诲洖搴撴暟閲�
+ // 瀵逛簬宸插垎閰嶉攣瀹氾細鍥炲簱鏁伴噺 = 鏈嫞閫夋暟閲�
+ // 瀵逛簬鏈垎閰嶉攣瀹氾細娌℃湁瀹為檯鐨勫簱瀛樻暟閲忓彉鍖栵紝鍙槸鐘舵�佹仮澶�
+ result.TotalReturnQty = result.RemainingLocksReturnQty; // 鍙绠楀凡鍒嗛厤閿佸畾鐨勫洖搴撴暟閲�
- result.HasItemsToReturn = result.TotalReturnQty > 0;
+ // 璁板綍搴撳瓨鏁伴噺锛堢敤浜庨獙璇侊級
+ decimal totalStockOnPallet = allStockDetails.Sum(x => x.StockQuantity);
+
+ _logger.LogInformation($"鍥炲簱鍒嗘瀽瀹屾垚:");
+ _logger.LogInformation($" 鎵樼洏鎬诲簱瀛�: {totalStockOnPallet}");
+ _logger.LogInformation($" 宸插垎閰嶉攣瀹氬洖搴撴暟閲�: {result.RemainingLocksReturnQty}");
+ _logger.LogInformation($" 鏈垎閰嶉攣瀹氱姸鎬佹仮澶嶆暟閲�: {result.UnallocatedLocksReturnQty}");
+ _logger.LogInformation($" 瀹為檯鐗╃悊鍥炲簱鏁伴噺: {result.TotalReturnQty}");
+
+ result.HasItemsToReturn = result.TotalReturnQty > 0 || result.UnallocatedLocksReturnQty > 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)
{
- _logger.LogError($"鎵樼洏鐘舵�佸垎鏋愬け璐� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, Error: {ex.Message}");
+ _logger.LogError($"鍥炲簱鍒嗘瀽澶辫触 - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}, Error: {ex.Message}");
throw;
}
- }
-
- /// <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))
- {
- 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鎴栬礋鏁�");
- }
- }
- }
-
- // 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($"鍒嗘瀽缁撴灉楠岃瘉瀹屾垚");
- }
- catch (Exception ex)
- {
- _logger.LogError($"鍒嗘瀽缁撴灉楠岃瘉澶辫触 - Error: {ex.Message}");
- // 涓嶆姏鍑哄紓甯革紝鍙褰曢敊璇�
- }
- }
-
- /// <summary>
- /// 澶勭悊鏈垎鎷ｇ殑閿佸畾璁板綍鍥炲簱
- /// 纭繚涓嶄細閿欒缁戝畾鏉＄爜鏁伴噺鍒伴攣瀹氭暟閲�
- /// </summary>
- private async Task HandleRemainingLocksReturn(List<Dt_OutStockLockInfo> remainingLocks)
- {
- _logger.LogInformation($"寮�濮嬪鐞嗘湭鍒嗘嫞閿佸畾璁板綍鍥炲簱 - 鍏� {remainingLocks.Count} 鏉¤褰�");
-
- // 鎸夎鍗曟槑缁嗗垎缁勫鐞嗭紝纭繚璁㈠崟鏄庣粏鏁版嵁鐨勪竴鑷存��
- var orderDetailGroups = remainingLocks.GroupBy(x => x.OrderDetailId);
-
- foreach (var group in orderDetailGroups)
- {
- var orderDetailId = group.Key;
- var groupLocks = group.ToList();
-
- _logger.LogInformation($"澶勭悊璁㈠崟鏄庣粏 {orderDetailId} 鐨� {groupLocks.Count} 鏉￠攣瀹氳褰�");
-
- // 鑾峰彇璁㈠崟鏄庣粏
- var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
- .FirstAsync(x => x.Id == orderDetailId);
-
- if (orderDetail == null)
- {
- _logger.LogWarning($"鏈壘鍒拌鍗曟槑缁� - OrderDetailId: {orderDetailId}");
- continue;
- }
-
- decimal totalReturnQtyForDetail = 0;
-
- foreach (var lockInfo in groupLocks)
- {
- // 鍙鐞嗙姸鎬佷负鍑哄簱涓殑閿佸畾璁板綍
- if (lockInfo.Status != (int)OutLockStockStatusEnum.鍑哄簱涓�)
- {
- _logger.LogInformation($"璺宠繃闈炲嚭搴撲腑鐘舵�佺殑閿佸畾璁板綍 - 閿佸畾ID: {lockInfo.Id}, 鐘舵��: {lockInfo.Status}");
- continue;
- }
-
- // 璁＄畻鍥炲簱鏁伴噺锛堟湭鎷ｉ�夌殑閮ㄥ垎锛�
- decimal returnQty = lockInfo.AssignQuantity - lockInfo.PickedQty;
-
- if (returnQty <= 0)
- {
- _logger.LogInformation($"璺宠繃閿佸畾璁板綍 - 閿佸畾ID: {lockInfo.Id}, 宸叉嫞閫夊畬鎴愭垨鏃犻渶鍥炲簱");
- continue;
- }
-
- _logger.LogInformation($"澶勭悊閿佸畾璁板綍鍥炲簱 - 閿佸畾ID: {lockInfo.Id}, 鏉＄爜: {lockInfo.CurrentBarcode}, 鍥炲簱鏁伴噺: {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;
- decimal originalOutboundQty = stockDetail.OutboundQuantity;
-
- // 鍙仮澶嶅疄闄呯殑搴撳瓨鏁伴噺锛屼笉鍒涘缓鏂扮殑鏉＄爜鎴栫粦瀹�
- // 鎭㈠搴撳瓨鏁伴噺锛氬嚭搴撴暟閲忓噺灏戯紝搴撳瓨鏁伴噺澧炲姞
- stockDetail.OutboundQuantity -= returnQty;
- stockDetail.StockQuantity += returnQty;
-
- // 纭繚鏁伴噺涓嶄細涓鸿礋鏁�
- if (stockDetail.OutboundQuantity < 0)
- {
- _logger.LogWarning($"鍑哄簱鏁伴噺鍑虹幇璐熸暟锛岄噸缃负0銆傚師鍊�: {stockDetail.OutboundQuantity + returnQty}");
- stockDetail.OutboundQuantity = 0;
- }
-
- // 鎭㈠搴撳瓨鐘舵�佷负鍙敤鐘舵��
- if (stockDetail.Status == (int)StockStatusEmun.鍑哄簱閿佸畾)
- {
- stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
- _logger.LogInformation($"搴撳瓨鐘舵�佹洿鏂颁负鍏ュ簱瀹屾垚 - 鏉＄爜: {stockDetail.Barcode}");
- }
-
- await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
-
- _logger.LogInformation($"鎭㈠搴撳瓨鐘舵�� - 鏉＄爜: {stockDetail.Barcode}, " +
- $"搴撳瓨鏁伴噺: {originalStockQty} -> {stockDetail.StockQuantity}, " +
- $"鍑哄簱鏁伴噺: {originalOutboundQty} -> {stockDetail.OutboundQuantity}");
- }
- else
- {
- _logger.LogWarning($"鏈壘鍒板搴旂殑搴撳瓨淇℃伅 - 鏉＄爜: {lockInfo.CurrentBarcode}, StockId: {lockInfo.StockId}");
- // 閲嶈锛氬鏋滄壘涓嶅埌搴撳瓨淇℃伅锛岃烦杩囨閿佸畾璁板綍锛岄伩鍏嶆暟鎹笉涓�鑷�
- continue;
- }
-
- // 鏇存柊閿佸畾璁板綍鐘舵�佷负宸插洖搴擄紝浣嗕笉淇敼鍒嗛厤鏁伴噺
- // 鍒嗛厤鏁伴噺鍦ㄨ鍗曟槑缁嗗眰闈㈢粺涓�澶勭悊
- var originalStatus = lockInfo.Status;
- lockInfo.Status = (int)OutLockStockStatusEnum.宸插洖搴�;
- lockInfo.Operator = App.User.UserName;
-
- await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
-
- _logger.LogInformation($"鏇存柊閿佸畾鐘舵�� - 閿佸畾ID: {lockInfo.Id}, 鐘舵��: {originalStatus} -> {lockInfo.Status}");
-
- totalReturnQtyForDetail += returnQty;
-
- _logger.LogInformation($"閿佸畾璁板綍鍥炲簱瀹屾垚 - 閿佸畾ID: {lockInfo.Id}, 鍥炲簱鏁伴噺: {returnQty}");
- }
-
- // 鍑忓皯璁㈠崟鏄庣粏鐨勫垎閰嶆暟閲�
- if (totalReturnQtyForDetail > 0)
- {
- await ReduceOrderDetailAllocation(orderDetail, totalReturnQtyForDetail);
- }
- }
-
- _logger.LogInformation($"鏈垎鎷ｉ攣瀹氳褰曞洖搴撳鐞嗗畬鎴� - 鍏卞鐞� {remainingLocks.Count} 鏉¤褰�");
- }
- /// <summary>
- /// 澶勭悊鏈垎閰嶇殑搴撳瓨璐х墿鍥炲簱
- /// 纭繚涓嶄細鍒涘缓鏂扮殑閿佸畾璁板綍
- /// </summary>
- private async Task HandleUnallocatedStockReturn(List<Dt_StockInfoDetail> stockGoods)
- {
- _logger.LogInformation($"寮�濮嬪鐞嗘湭鍒嗛厤搴撳瓨鍥炲簱 - 鍏� {stockGoods.Count} 涓揣鐗�");
-
- foreach (var stockDetail in stockGoods)
- {
- if (stockDetail.StockQuantity <= 0)
- {
- _logger.LogInformation($"璺宠繃闆跺簱瀛樿揣鐗� - 鏉＄爜: {stockDetail.Barcode}");
- continue;
- }
-
- _logger.LogInformation($"澶勭悊鏈垎閰嶅簱瀛樺洖搴� - 鏉＄爜: {stockDetail.Barcode}, 鏁伴噺: {stockDetail.StockQuantity}");
-
- // 妫�鏌ユ槸鍚﹀凡缁忔湁瀵瑰簲鐨勯攣瀹氳褰�
- var existingLock = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.CurrentBarcode == stockDetail.Barcode &&
- x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
- .FirstAsync();
-
- if (existingLock != null)
- {
- _logger.LogWarning($"搴撳瓨鏉＄爜 {stockDetail.Barcode} 宸叉湁閿佸畾璁板綍锛岃烦杩囩洿鎺ュ洖搴撳鐞�");
- continue;
- }
-
- // 璁板綍鎭㈠鍓嶇殑鐘舵��
- var originalStatus = stockDetail.Status;
-
- // 鐩存帴鎭㈠搴撳瓨鐘舵�佷负鍙敤鐘舵�侊紝涓嶅垱寤轰换浣曢攣瀹氳褰�
- stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
-
- await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
-
- _logger.LogInformation($"鏈垎閰嶅簱瀛樺洖搴撳畬鎴� - 鏉＄爜: {stockDetail.Barcode}, 鐘舵��: {originalStatus} -> {stockDetail.Status}");
- }
-
- _logger.LogInformation($"鏈垎閰嶅簱瀛樺洖搴撳鐞嗗畬鎴� - 鍏卞鐞� {stockGoods.Count} 涓揣鐗�");
- }
- /// <summary>
- /// 鍑忓皯璁㈠崟鏄庣粏鐨勫垎閰嶆暟閲�
- /// 纭繚鍒嗛厤鏁伴噺鐨勫噺灏戞槸鍑嗙‘鐨�
- /// </summary>
- private async Task ReduceOrderDetailAllocation(Dt_OutboundOrderDetail orderDetail, decimal reduceQty)
- {
- 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}");
-
- // 楠岃瘉鏁版嵁涓�鑷存��
- await ValidateOrderDetailConsistency(orderDetail.Id);
- }
- /// <summary>
- /// 楠岃瘉璁㈠崟鏄庣粏鏁版嵁涓�鑷存��
- /// </summary>
- private async Task ValidateOrderDetailConsistency(long orderDetailId)
- {
- var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
- .FirstAsync(x => x.Id == orderDetailId);
-
- if (orderDetail == null)
- return;
-
- // 璁＄畻鎵�鏈夌浉鍏抽攣瀹氳褰曠殑鎬诲垎閰嶆暟閲�
- var relatedLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.OrderDetailId == orderDetailId &&
- x.Status != (int)OutLockStockStatusEnum.宸插洖搴�)
- .ToListAsync();
-
- decimal totalLockAssignQty = relatedLocks.Sum(x => x.AssignQuantity);
-
- // 楠岃瘉璁㈠崟鏄庣粏鍒嗛厤鏁伴噺涓庨攣瀹氳褰曟�诲垎閰嶆暟閲忕殑涓�鑷存��
- if (Math.Abs(orderDetail.AllocatedQuantity - totalLockAssignQty) > 0.01m)
- {
- _logger.LogWarning($"鏁版嵁涓嶄竴鑷磋鍛� - OrderDetailId: {orderDetailId}, " +
- $"璁㈠崟鏄庣粏鍒嗛厤鏁伴噺: {orderDetail.AllocatedQuantity}, " +
- $"閿佸畾璁板綍鎬诲垎閰嶆暟閲�: {totalLockAssignQty}");
- }
- else
- {
- _logger.LogInformation($"鏁版嵁涓�鑷存�ч獙璇侀�氳繃 - OrderDetailId: {orderDetailId}");
- }
- }
+ }
+
/// <summary>
/// 鍒嗘壒鍥炲簱 - 璋冪敤缁熶竴鍥炲簱鏂规硶
/// </summary>
@@ -3490,16 +2882,10 @@
return await ExecutePalletReturn(orderNo, palletCode, "鍒嗘壒鍥炲簱");
}
- /// <summary>
- /// 鍓╀綑鍥炲簱 - 璋冪敤缁熶竴鍥炲簱鏂规硶
- /// </summary>
- public async Task<WebResponseContent> ReturnRemaining(string orderNo, string palletCode, string reason)
- {
- return await ExecutePalletReturn(orderNo, palletCode, reason);
- }
+
/// <summary>
- /// 鍙栬蛋绌虹 - 鍏堟墽琛屽洖搴撳啀娓呯悊
+ /// 鍙栬蛋绌虹 -姝ｇ‘澶勭悊鏈垎閰嶉攣瀹氳褰�
/// </summary>
public async Task<WebResponseContent> RemoveEmptyPallet(string orderNo, string palletCode)
{
@@ -3509,38 +2895,82 @@
_unitOfWorkManage.BeginTran();
- // 1. 鍏堝皾璇曟墽琛屽洖搴撴搷浣滐紝纭繚鎵�鏈夌墿鍝侀兘鍥炲簱
+ // 鍏堝皾璇曟墽琛屽洖搴撴搷浣滐紝纭繚鎵�鏈夌墿鍝侀兘鍥炲簱
_logger.LogInformation($"姝ラ1: 鍏堟墽琛屽洖搴撴搷浣�");
var returnResult = await ExecutePalletReturn(orderNo, palletCode, "鍙栬蛋绌虹鍓嶅洖搴�");
+
+ // 鍗充娇鍥炲簱澶辫触锛岀户缁獙璇佺┖绠辨潯浠讹紙鍙兘鏄湡鐨勭┖鎵樼洏锛�
if (!returnResult.Status)
{
- // 鍥炲簱澶辫触锛屽彲鑳芥槸绌烘墭鐩樻垨鑰呮湁鍏朵粬闂
- _logger.LogWarning($"鍥炲簱鎿嶄綔澶辫触: {returnResult.Message}");
-
- // 缁х画楠岃瘉绌虹鍙栬蛋鏉′欢
+ _logger.LogWarning($"鍥炲簱鎿嶄綔鍙兘澶辫触鎴栨棤鐗╁搧: {returnResult.Message}");
}
- // 2. 楠岃瘉绌虹鍙栬蛋鏉′欢锛堝繀椤诲叏閮ㄥ畬鎴愭嫞閫夛級
+ // 楠岃瘉绌虹鍙栬蛋鏉′欢锛堝繀椤诲叏閮ㄥ畬鎴愭嫞閫夋垨宸插洖搴擄級
_logger.LogInformation($"姝ラ2: 楠岃瘉绌虹鍙栬蛋鏉′欢");
- var validationResult = await ValidateEmptyPalletRemoval(orderNo, palletCode);
- if (!validationResult.IsValid)
+
+ // 鑾峰彇鎵樼洏鐨勬墍鏈夐攣瀹氳褰曪紙鍖呮嫭宸插洖搴撳拰宸插彇璧扮殑锛�
+ var allLockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
+ .ToListAsync();
+
+ if (!allLockInfos.Any())
{
_unitOfWorkManage.RollbackTran();
- _logger.LogError($"绌虹楠岃瘉澶辫触: {validationResult.ErrorMessage}");
- return WebResponseContent.Instance.Error(validationResult.ErrorMessage);
+ return WebResponseContent.Instance.Error("璇ユ墭鐩樻病鏈夐攣瀹氳褰�");
}
- var completedLocks = validationResult.Data;
+ // 妫�鏌ユ槸鍚︽湁鏈畬鎴愮殑閿佸畾璁板綍
+ var unfinishedLocks = allLockInfos.Where(x =>
+ x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓� ||
+ x.Status == (int)OutLockStockStatusEnum.鍥炲簱涓�).ToList();
+
+ if (unfinishedLocks.Any())
+ {
+ var unfinishedCount = unfinishedLocks.Count;
+ // 鍖哄垎宸插垎閰嶅拰鏈垎閰�
+ var allocatedUnfinished = unfinishedLocks.Where(x => x.IsUnallocated != 1).ToList();
+ var unallocatedUnfinished = unfinishedLocks.Where(x => x.IsUnallocated == 1).ToList();
+
+ string errorMsg = $"鎵樼洏杩樻湁{unfinishedCount}鏉℃湭瀹屾垚璁板綍";
+ if (allocatedUnfinished.Any()) errorMsg += $"锛屽叾涓凡鍒嗛厤{allocatedUnfinished.Count}鏉�";
+ if (unallocatedUnfinished.Any()) errorMsg += $"锛屾湭鍒嗛厤{unallocatedUnfinished.Count}鏉�";
+
+ errorMsg += "锛屼笉鑳藉彇璧扮┖绠�";
+
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(errorMsg);
+ }
+
+ // 鑾峰彇宸插畬鎴愮殑閿佸畾璁板綍锛堢姸鎬佷负鎷ｉ�夊畬鎴愭垨宸插彇璧帮級
+ var completedLocks = allLockInfos.Where(x =>
+ x.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴� ||
+ x.Status == (int)OutLockStockStatusEnum.宸插彇璧�).ToList();
+
+ if (!completedLocks.Any())
+ {
+ // 妫�鏌ユ槸鍚﹂兘鏄凡鍥炲簱鐘舵��
+ var returnedLocks = allLockInfos.Where(x => x.Status == (int)OutLockStockStatusEnum.宸插洖搴�).ToList();
+ if (returnedLocks.Any())
+ {
+ _logger.LogInformation($"鎵�鏈夐攣瀹氳褰曢兘宸插洖搴擄紝鍙互鍙栬蛋绌虹");
+ completedLocks = returnedLocks;
+ }
+ else
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error("璇ユ墭鐩樻病鏈夊凡瀹屾垚鎷ｉ�夋垨宸插洖搴撶殑璁板綍");
+ }
+ }
+
_logger.LogInformation($"楠岃瘉閫氳繃锛屾壘鍒� {completedLocks.Count} 鏉″凡瀹屾垚璁板綍");
- // 3. 娓呯悊宸插畬鎴愮殑閿佸畾璁板綍锛堟爣璁颁负宸插彇璧帮級
+ // 娓呯悊宸插畬鎴愮殑閿佸畾璁板綍锛堟爣璁颁负宸插彇璧帮級
_logger.LogInformation($"姝ラ3: 娓呯悊閿佸畾璁板綍");
foreach (var lockInfo in completedLocks)
{
- // 鍙鐞嗙姸鎬佷负鎷ｉ�夊畬鎴愮殑璁板綍锛堝凡鍙栬蛋鐨勮烦杩囷級
- if (lockInfo.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�)
+ // 鍙鐞嗙姸鎬佷笉鏄凡鍙栬蛋鐨勮褰�
+ if (lockInfo.Status != (int)OutLockStockStatusEnum.宸插彇璧�)
{
- // 鏍囪閿佸畾璁板綍涓哄凡鍙栬蛋
lockInfo.Status = (int)OutLockStockStatusEnum.宸插彇璧�;
lockInfo.Operator = App.User.UserName;
await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
@@ -3548,20 +2978,20 @@
}
}
- // 4. 娓呯悊瀵瑰簲鐨勫簱瀛樿褰曠姸鎬�
+ // 娓呯悊瀵瑰簲鐨勫簱瀛樿褰曠姸鎬�
_logger.LogInformation($"姝ラ4: 娓呯悊搴撳瓨璁板綍");
foreach (var lockInfo in completedLocks)
{
await CleanupStockInfo(lockInfo);
}
- // 5. 鏇存柊鐩稿叧璁㈠崟鐘舵��
+ // 鏇存柊鐩稿叧璁㈠崟鐘舵��
_logger.LogInformation($"姝ラ5: 鏇存柊璁㈠崟鐘舵��");
await UpdateOrderStatusAfterPalletRemoval(orderNo);
- // 6. 璁板綍鎿嶄綔鍘嗗彶
- _logger.LogInformation($"姝ラ6: 璁板綍鎿嶄綔鍘嗗彶");
- await RecordEmptyPalletRemoval(orderNo, palletCode, completedLocks);
+ // 璁板綍鎿嶄綔鍘嗗彶
+ //_logger.LogInformation($"姝ラ6: 璁板綍鎿嶄綔鍘嗗彶");
+ //await RecordEmptyPalletRemoval(orderNo, palletCode, completedLocks);
_unitOfWorkManage.CommitTran();
@@ -3576,685 +3006,16 @@
return WebResponseContent.Instance.Error($"鍙栬蛋绌虹澶辫触锛歿ex.Message}");
}
}
- /// <summary>
- /// 鏀堕泦闇�瑕佸洖搴撶殑鏉＄爜
- /// </summary>
- private async Task<List<string>> CollectReturnBarcodes(PalletStatusAnalysis status)
- {
- var returnBarcodes = new HashSet<string>();
-
- try
- {
- _logger.LogInformation($"寮�濮嬫敹闆嗗洖搴撴潯鐮� - 璁㈠崟: {status.OrderNo}, 鎵樼洏: {status.PalletCode}");
-
- // 1. 鏀堕泦鏈垎鎷ｉ攣瀹氳褰曠殑鏉＄爜
- if (status.HasRemainingLocks)
- {
- foreach (var lockInfo in status.RemainingLocks)
- {
- if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode))
- {
- returnBarcodes.Add(lockInfo.CurrentBarcode);
- _logger.LogInformation($"娣诲姞閿佸畾璁板綍鏉＄爜: {lockInfo.CurrentBarcode}");
- }
- }
- }
-
- // 2. 鏀堕泦鎵樼洏涓婂簱瀛樿揣鐗╃殑鏉＄爜
- if (status.HasPalletStockGoods)
- {
- foreach (var stockDetail in status.PalletStockGoods)
- {
- if (!string.IsNullOrEmpty(stockDetail.Barcode) && stockDetail.StockQuantity > 0)
- {
- returnBarcodes.Add(stockDetail.Barcode);
- _logger.LogInformation($"娣诲姞搴撳瓨璐х墿鏉＄爜: {stockDetail.Barcode}, 鏁伴噺: {stockDetail.StockQuantity}");
- }
- }
- }
-
- // 3. 鏀堕泦鎷嗗寘璁板綍鐩稿叧鐨勬潯鐮�
- if (status.HasSplitRecords)
- {
- foreach (var splitRecord in status.SplitRecords)
- {
- // 娣诲姞鍘熸潯鐮�
- if (!string.IsNullOrEmpty(splitRecord.OriginalBarcode))
- {
- var originalStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .FirstAsync(x => x.Barcode == splitRecord.OriginalBarcode && x.StockId == status.StockId);
-
- if (originalStock != null && originalStock.StockQuantity > 0)
- {
- returnBarcodes.Add(splitRecord.OriginalBarcode);
- _logger.LogInformation($"娣诲姞鎷嗗寘鍘熸潯鐮�: {splitRecord.OriginalBarcode}, 鏁伴噺: {originalStock.StockQuantity}");
- }
- }
-
- // 娣诲姞鏂版潯鐮�
- if (!string.IsNullOrEmpty(splitRecord.NewBarcode))
- {
- var newStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .FirstAsync(x => x.Barcode == splitRecord.NewBarcode && x.StockId == status.StockId);
-
- if (newStock != null && newStock.StockQuantity > 0)
- {
- returnBarcodes.Add(splitRecord.NewBarcode);
- _logger.LogInformation($"娣诲姞鎷嗗寘鏂版潯鐮�: {splitRecord.NewBarcode}, 鏁伴噺: {newStock.StockQuantity}");
- }
- }
- }
- }
-
- _logger.LogInformation($"鍥炲簱鏉＄爜鏀堕泦瀹屾垚 - 鍏� {returnBarcodes.Count} 涓潯鐮�: {string.Join(", ", returnBarcodes)}");
-
- return returnBarcodes.ToList();
- }
- catch (Exception ex)
- {
- _logger.LogError($"鏀堕泦鍥炲簱鏉＄爜澶辫触 - Error: {ex.Message}");
- return returnBarcodes.ToList();
- }
- }
+
#endregion
- #region 鍥炲簱鎿嶄綔鏍稿績鏂规硶
-
- /// <summary>
- /// 鎵ц鍥炲簱鎿嶄綔 - 澧炲己鐗堟湰
- /// </summary>
- private async Task ExecuteReturnOperations(string orderNo, string palletCode, Dt_StockInfo stockInfo,
- Dt_Task task, PalletStatusAnalysis statusAnalysis)
- {
- _logger.LogInformation($"寮�濮嬫墽琛屽洖搴撴搷浣� - 璁㈠崟: {orderNo}, 鎵樼洏: {palletCode}");
-
- // 澶勭悊鏈垎鎷ｇ殑閿佸畾璁板綍
- if (statusAnalysis.HasRemainingLocks)
- {
- _logger.LogInformation($"澶勭悊 {statusAnalysis.RemainingLocks.Count} 鏉℃湭鍒嗘嫞閿佸畾璁板綍");
- await HandleRemainingLocksReturn(statusAnalysis.RemainingLocks);
- }
-
- //澶勭悊鎵樼洏涓婄殑搴撳瓨璐х墿
- if (statusAnalysis.HasPalletStockGoods)
- {
- _logger.LogInformation($"澶勭悊 {statusAnalysis.PalletStockGoods.Count} 涓簱瀛樿揣鐗�");
- await HandlePalletStockGoodsReturn(statusAnalysis.PalletStockGoods, stockInfo.Id);
- }
-
- //澶勭悊鎷嗗寘璁板綍
- if (statusAnalysis.HasSplitRecords)
- {
- _logger.LogInformation($"澶勭悊 {statusAnalysis.SplitRecords.Count} 鏉℃媶鍖呰褰�");
- await HandleSplitRecordsReturn(statusAnalysis.SplitRecords, stockInfo.Id);
- }
-
- _logger.LogInformation($"鍥炲簱鎿嶄綔瀹屾垚 - 鎬诲洖搴撴暟閲�: {statusAnalysis.TotalReturnQty}");
- }
-
- /// <summary>
- /// 澶勭悊鏈垎鎷ｇ殑閿佸畾璁板綍鍥炲簱
- /// </summary>
-
-
- /// <summary>
- /// 澶勭悊鎵樼洏涓婄殑搴撳瓨璐х墿鍥炲簱
- /// </summary>
- private async Task HandlePalletStockGoodsReturn(List<Dt_StockInfoDetail> palletStockGoods, int stockId)
- {
- foreach (var stockDetail in palletStockGoods)
- {
- // 鍙鐞嗗嚭搴撻攣瀹氱姸鎬佺殑搴撳瓨
- if (stockDetail.Status == (int)StockStatusEmun.鍑哄簱閿佸畾 && stockDetail.StockQuantity > 0)
- {
- // 鎭㈠搴撳瓨鐘舵�佷负鍙敤鐘舵��
- stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
- await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
-
- _logger.LogInformation($"鎭㈠搴撳瓨璐х墿 - 鏉＄爜: {stockDetail.Barcode}, 鏁伴噺: {stockDetail.StockQuantity}");
- }
- }
- }
-
- /// <summary>
- /// 澶勭悊鎷嗗寘璁板綍鍥炲簱
- /// </summary>
- private async Task HandleSplitRecordsReturn(List<Dt_SplitPackageRecord> splitRecords, int stockId)
- {
- foreach (var splitRecord in splitRecords)
- {
- // 澶勭悊鏂版潯鐮�
- var newLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.CurrentBarcode == splitRecord.NewBarcode &&
- x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
- .FirstAsync();
-
- if (newLockInfo != null)
- {
- await HandleSingleLockReturn(newLockInfo);
- }
-
- // 澶勭悊鍘熸潯鐮�
- var originalLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.CurrentBarcode == splitRecord.OriginalBarcode &&
- x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
- .FirstAsync();
-
- if (originalLockInfo != null)
- {
- await HandleSingleLockReturn(originalLockInfo);
- }
-
- // 鏇存柊鎷嗗寘璁板綍鐘舵�佷负宸插洖搴�
- splitRecord.Status = (int)SplitPackageStatusEnum.宸插洖搴�;
- await _splitPackageService.Db.Updateable(splitRecord).ExecuteCommandAsync();
- }
- }
-
- private async Task HandleSingleLockReturn(Dt_OutStockLockInfo lockInfo)
- {
- decimal returnQty = lockInfo.AssignQuantity - lockInfo.PickedQty;
-
- if (returnQty <= 0)
- {
- _logger.LogInformation($"璺宠繃閿佸畾璁板綍 - 閿佸畾ID: {lockInfo.Id}, 宸叉嫞閫夊畬鎴愭垨鏃犻渶鍥炲簱");
- return;
- }
-
- _logger.LogInformation($"澶勭悊鎷嗗寘鐩稿叧閿佸畾璁板綍 - 閿佸畾ID: {lockInfo.Id}, 鏉＄爜: {lockInfo.CurrentBarcode}, 鍥炲簱鏁伴噺: {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;
- decimal originalOutboundQty = stockDetail.OutboundQuantity;
-
- stockDetail.StockQuantity += returnQty;
- stockDetail.OutboundQuantity -= returnQty;
-
- if (stockDetail.OutboundQuantity < 0)
- {
- stockDetail.OutboundQuantity = 0;
- }
-
- stockDetail.Status = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
- await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
-
- _logger.LogInformation($"鎭㈠鎷嗗寘鐩稿叧搴撳瓨 - 鏉＄爜: {stockDetail.Barcode}, " +
- $"搴撳瓨鏁伴噺: {originalStockQty} -> {stockDetail.StockQuantity}");
- }
-
- // 鏇存柊閿佸畾鐘舵��
- 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);
-
- if (orderDetail != null)
- {
- await ReduceOrderDetailAllocation(orderDetail, returnQty);
- }
- }
-
- _logger.LogInformation($"鎷嗗寘鐩稿叧閿佸畾璁板綍鍥炲簱瀹屾垚 - 閿佸畾ID: {lockInfo.Id}, 鍥炲簱鏁伴噺: {returnQty}");
- }
- /// <summary>
- /// 閲婃斁鎵�鏈夐攣瀹氫互渚块噸鏂板垎閰�
- /// </summary>
- private async Task ReleaseAllLocksForReallocation(string orderNo, string palletCode, PalletStatusAnalysis statusAnalysis)
- {
- // 鏇存柊璁㈠崟鏄庣粏鐨勫凡鍒嗛厤鏁伴噺
- if (statusAnalysis.HasRemainingLocks)
- {
- var orderDetailGroups = statusAnalysis.RemainingLocks.GroupBy(x => x.OrderDetailId);
-
- foreach (var group in orderDetailGroups)
- {
- var orderDetailId = group.Key;
- var returnedQty = group.Sum(x => x.AssignQuantity - x.PickedQty);
-
- var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
- .FirstAsync(x => x.Id == orderDetailId);
-
- if (orderDetail != null)
- {
- orderDetail.AllocatedQuantity -= returnedQty;
- orderDetail.LockQuantity = orderDetail.AllocatedQuantity;
-
- await UpdateBatchAllocateStatus(orderDetail);
- await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();
-
- _logger.LogInformation($"鏇存柊璁㈠崟鏄庣粏 - OrderDetailId: {orderDetailId}, 鍑忓皯鍒嗛厤鏁伴噺: {returnedQty}");
- }
- }
- }
- }
-
- /// <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 杈呭姪鏂规硶
-
- /// <summary>
- /// 澶勭悊娌℃湁鍥炲簱鐗╁搧鐨勬儏鍐�
- /// </summary>
- private async Task<WebResponseContent> HandleNoReturnItems(string orderNo, string palletCode, Dt_Task originalTask, int stockId)
- {
- _logger.LogInformation($"鎵樼洏 {palletCode} 娌℃湁闇�瑕佸洖搴撶殑鐗╁搧");
-
- // 妫�鏌ユ槸鍚︽槸绌烘墭鐩�
- var statusAnalysis = await AnalyzePalletStatus(orderNo, palletCode, stockId);
- if (statusAnalysis.IsEmptyPallet)
- {
- try
- {
- var locationtype = 0;
- var stockInfo = await _stockInfoService.Db.Queryable<Dt_StockInfo>()
- .Where(x => x.PalletCode == palletCode)
- .FirstAsync();
-
- if (stockInfo == null)
- {
- var firstLocation = await _locationInfoService.Db.Queryable<Dt_LocationInfo>().FirstAsync(x => x.LocationCode == originalTask.SourceAddress);
- locationtype = firstLocation?.LocationType ?? 1;
- }
- else
- {
- locationtype = stockInfo.LocationType;
- _stockInfoService.DeleteData(stockInfo);
- }
-
- var targetAddress = originalTask.TargetAddress;
-
- await CleanupZeroStockData(stockId);
-
-
- var emptystockInfo = new Dt_StockInfo() { PalletType = PalletTypeEnum.Empty.ObjToInt(), StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(), PalletCode = palletCode, LocationType = locationtype };
- emptystockInfo.Details = new List<Dt_StockInfoDetail>();
- _stockInfoService.AddMaterielGroup(emptystockInfo);
- //绌烘墭鐩樺浣曞鐞� 杩樻湁涓�涓嚭搴撲换鍔¤澶勭悊銆�
- originalTask.PalletType = PalletTypeEnum.Empty.ObjToInt();
-
- await CreateReturnTaskAndHandleESS(orderNo, palletCode, originalTask, TaskTypeEnum.InEmpty, PalletTypeEnum.Empty.ObjToInt());
-
- }
- catch (Exception ex)
- {
- _logger.LogError($" HandleNoReturnItems 澶辫触: {ex.Message}");
- return WebResponseContent.Instance.Error($" 鍥炲簱绌烘墭鐩樺け璐ワ紒");
- }
- return WebResponseContent.Instance.OK("绌烘墭鐩樺洖搴撲换鍔″垱寤烘垚鍔�");
- }
- else
- {
- return WebResponseContent.Instance.Error("鎵樼洏鐘舵�佸紓甯革細鏈夌墿鍝佷絾鏃犳硶璁＄畻鍥炲簱鏁伴噺");
- }
- }
+ #region 杈呭姪鏂规硶
+
private async Task CleanupZeroStockData(int stockId)
{
try
{
- // 1. 鍒犻櫎搴撳瓨鏁伴噺涓�0鐨勬槑缁嗚褰�
+ // 鍒犻櫎搴撳瓨鏁伴噺涓�0鐨勬槑缁嗚褰�
var deleteDetailCount = await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
.Where(x => x.StockId == stockId && x.StockQuantity == 0)
.ExecuteCommandAsync();
@@ -4270,42 +3031,11 @@
catch (Exception ex)
{
_logger.LogWarning($"娓呯悊闆跺簱瀛樻暟鎹け璐� - StockId: {stockId}, Error: {ex.Message}");
- // 娉ㄦ剰锛氭竻鐞嗗け璐ヤ笉搴旇褰卞搷涓绘祦绋�
+
}
}
- /// <summary>
- /// 鏇存柊璁㈠崟鐘舵�侊紙鍥炲簱鍚庯級
- /// </summary>
- private async Task UpdateOrderStatusForReturn(string orderNo)
- {
- // 妫�鏌ヨ鍗曟槸鍚︽墍鏈夋墭鐩橀兘宸插畬鎴愭垨宸插洖搴�
- var allLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.OrderNo == orderNo)
- .ToListAsync();
-
- var activeLocks = allLocks.Where(x =>
- x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓� ||
- x.Status == (int)OutLockStockStatusEnum.鍥炲簱涓�).ToList();
-
- // 濡傛灉娌℃湁娲昏穬鐨勯攣瀹氳褰曪紝鏇存柊璁㈠崟鐘舵��
- if (!activeLocks.Any())
- {
- await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
- .SetColumns(x => new Dt_OutboundOrder
- {
- OrderStatus = (int)OutOrderStatusEnum.鍑哄簱瀹屾垚,
- })
- .Where(x => x.OrderNo == orderNo)
- .ExecuteCommandAsync();
-
- _logger.LogInformation($"鏇存柊璁㈠崟鐘舵�佷负鍑哄簱瀹屾垚 - 璁㈠崟: {orderNo}");
- }
- }
-
+
#endregion
-
-
-
#region 楠岃瘉鏂规硶
private async Task<ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>> ValidatePickingRequest(
@@ -4410,6 +3140,7 @@
_logger.LogInformation($"璺宠繃鏈垎閰嶉攣瀹氳褰曠殑鑷姩鎷嗗寘妫�鏌� - 閿佸畾ID: {lockInfo.Id}");
return null;
}
+
// 妫�鏌ユ槸鍚﹂渶瑕佽嚜鍔ㄦ媶鍖呯殑鏉′欢锛�
// 1. 搴撳瓨鏁伴噺澶т簬鍒嗛厤鏁伴噺
// 2. 閿佸畾淇℃伅鐘舵�佷负鍑哄簱涓�
@@ -4424,191 +3155,176 @@
// 璁＄畻鎷嗗寘鏁伴噺 = 搴撳瓨鏁伴噺 - 鍒嗛厤鏁伴噺
decimal splitQuantity = stockDetail.StockQuantity - lockInfo.AssignQuantity;
+ _logger.LogInformation($"闇�瑕佽嚜鍔ㄦ媶鍖� - 搴撳瓨: {stockDetail.StockQuantity}, 鍒嗛厤: {lockInfo.AssignQuantity}, 鎷嗗寘鏁伴噺: {splitQuantity}");
+
// 鎵ц鑷姩鎷嗗寘
- var splitResult = await ExecuteAutoSplitLogic(lockInfo, stockDetail, splitQuantity, palletCode);
+ var splitResult = await ExecuteAutoSplitLogic(lockInfo, stockDetail, splitQuantity, palletCode);
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}");
- // 楠岃瘉鎷嗗寘鏁伴噺鍚堢悊鎬�
- if (splitQuantity <= 0)
+ try
{
- throw new InvalidOperationException($"鎷嗗寘鏁伴噺蹇呴』澶т簬0锛屽綋鍓嶅��: {splitQuantity}");
+ // 楠岃瘉鎷嗗寘鏁伴噺鍚堢悊鎬�
+ if (splitQuantity <= 0)
+ throw new InvalidOperationException($"鎷嗗寘鏁伴噺蹇呴』澶т簬0锛屽綋鍓嶅��: {splitQuantity}");
+
+ if (stockDetail.StockQuantity < lockInfo.AssignQuantity + splitQuantity)
+ throw new InvalidOperationException($"搴撳瓨鏁伴噺涓嶈冻浠ヨ繘琛岃嚜鍔ㄦ媶鍖咃紝搴撳瓨: {stockDetail.StockQuantity}, 闇�瑕�: {lockInfo.AssignQuantity + splitQuantity}");
+
+ // 鐢熸垚鏂版潯鐮�
+ string newBarcode = await GenerateNewBarcode();
+ _logger.LogInformation($"鐢熸垚鏂版潯鐮�: {newBarcode}");
+
+ // 銆愭牳蹇冧慨姝ｃ�戞洿鏂板師搴撳瓨鏄庣粏锛氬彧鍑忓皯鐗╃悊搴撳瓨锛屼笉褰卞搷鍑哄簱鏁伴噺
+ decimal originalStockQty = stockDetail.StockQuantity;
+ stockDetail.StockQuantity -= splitQuantity; // 浠呭簱瀛樺噺灏�
+ // stockDetail.OutboundQuantity 淇濇寔涓嶅彉锛�
+
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+ _logger.LogInformation($"鏇存柊鍘熷簱瀛樻槑缁嗭細鏉＄爜 {stockDetail.Barcode} 搴撳瓨 {originalStockQty} -> {stockDetail.StockQuantity}锛屽嚭搴撴暟閲忎笉鍙�({stockDetail.OutboundQuantity})");
+
+ // 鍒涘缓鏂板簱瀛樻槑缁嗭紙澶氫綑閮ㄥ垎锛�- 鍑哄簱鏁伴噺涓�0
+ var newStockDetail = new Dt_StockInfoDetail
+ {
+ StockId = stockDetail.StockId,
+ MaterielCode = stockDetail.MaterielCode,
+ OrderNo = stockDetail.OrderNo,
+ BatchNo = stockDetail.BatchNo,
+ StockQuantity = splitQuantity, // 鏂板簱瀛樻暟閲�
+ OutboundQuantity = 0, // 鍒濆鍑哄簱鏁伴噺涓�0
+ Barcode = newBarcode,
+ Status = (int)StockStatusEmun.鍑哄簱閿佸畾, // 浠嶄负閿佸畾鐘舵�侊紝浣嗘湭缁戝畾璁㈠崟
+ SupplyCode = stockDetail.SupplyCode,
+ Unit = stockDetail.Unit,
+ BarcodeQty = stockDetail.BarcodeQty,
+ BarcodeUnit = stockDetail.BarcodeUnit,
+ BusinessType = stockDetail.BusinessType,
+ InboundOrderRowNo = stockDetail.InboundOrderRowNo,
+ FactoryArea=stockDetail.FactoryArea,
+ WarehouseCode = stockDetail.WarehouseCode,
+ };
+
+ await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
+ _logger.LogInformation($"鍒涘缓鏂板簱瀛樻槑缁嗭細鏉＄爜 {newBarcode}锛屽簱瀛� {splitQuantity}锛屽嚭搴� 0");
+
+ // 鍒涘缓鏂伴攣瀹氫俊鎭� - 鏍囪涓烘湭鍒嗛厤
+ var newLockInfo = new Dt_OutStockLockInfo
+ {
+ OrderNo = lockInfo.OrderNo,
+ OrderDetailId = 0, // 涓嶇粦瀹氬埌鍏蜂綋璁㈠崟鏄庣粏锛岃〃绀烘湭鍒嗛厤
+ 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,
+ IsUnallocated = 1 // 鏄庣‘鏍囪涓�"鏈垎閰�"鐨勯攣瀹氳褰�
+ };
+
+ await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();
+ _logger.LogInformation($"鍒涘缓鏈垎閰嶉攣瀹氳褰曪細ID {newLockInfo.Id}锛屾潯鐮� {newBarcode}锛屾暟閲� {splitQuantity}");
+
+ //鍘熼攣瀹氳褰曞拰鍘熻鍗曟槑缁嗘暟鎹畬鍏ㄤ繚鎸佷笉鍙橈紒
+ // - 涓嶄慨鏀� lockInfo 鐨勪换浣曞瓧娈�
+ // - 涓嶄慨鏀瑰叧鑱旂殑 Dt_OutboundOrderDetail 鐨� AllocatedQuantity 鍜� LockQuantity
+
+ // 璁板綍鎷嗗寘鍘嗗彶
+ await RecordSplitHistory(lockInfo, stockDetail, splitQuantity, newBarcode, true, originalStockQty);
+
+ // 鍒涘缓鎷嗗寘缁撴灉鍒楄〃
+ var splitResults = CreateSplitResults(lockInfo, splitQuantity, stockDetail.StockQuantity, newBarcode, stockDetail.Barcode);
+
+ _logger.LogInformation($"鑷姩鎷嗗寘閫昏緫鎵ц瀹屾垚 - 鍒涘缓浜嗘湭鍒嗛厤鐨勫簱瀛樺拰閿佸畾璁板綍");
+
+ return splitResults;
}
-
- if (stockDetail.StockQuantity < lockInfo.AssignQuantity + splitQuantity)
+ catch (Exception ex)
{
- throw new InvalidOperationException($"搴撳瓨鏁伴噺涓嶈冻浠ヨ繘琛岃嚜鍔ㄦ媶鍖�");
- }
-
- // 鐢熸垚鏂版潯鐮�
- string newBarcode = await GenerateNewBarcode();
-
- // 璁板綍鎷嗗寘鍓嶇殑鍒嗛厤鏁伴噺
- decimal originalAssignQty = lockInfo.AssignQuantity;
- decimal remainQty = originalAssignQty; // 鍘熼攣瀹氫俊鎭垎閰嶆暟閲忎繚鎸佷笉鍙�
-
- // 鍒涘缓鏂板簱瀛樻槑缁嗭紙澶氫綑閮ㄥ垎锛�
- 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}");
-
- // 鍒涘缓鏂伴攣瀹氫俊鎭紙澶氫綑閮ㄥ垎锛�- 鏍囪涓烘湭鍒嗛厤
- var newLockInfo = new Dt_OutStockLockInfo
- {
- OrderNo = lockInfo.OrderNo,
- OrderDetailId = 0, // 閲嶈锛氫笉缁戝畾鍒板叿浣撹鍗曟槑缁�
- 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,
- IsUnallocated = 1 // 鏍囪涓烘湭鍒嗛厤
- };
-
- await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();
- _logger.LogInformation($"鍒涘缓鏂伴攣瀹氫俊鎭� - 鏉＄爜: {newBarcode}, 鍒嗛厤鏁伴噺: {splitQuantity}, 鏍囪涓烘湭鍒嗛厤");
-
- // 閲嶈锛氳嚜鍔ㄦ媶鍖呴渶瑕佸鍔犺鍗曟槑缁嗙殑鍒嗛厤鏁伴噺鍜岄攣瀹氭暟閲�
- 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);
-
- // 鍒涘缓鎷嗗寘缁撴灉鍒楄〃
- var splitResults = CreateSplitResults(lockInfo, splitQuantity, remainQty, newBarcode, stockDetail.Barcode);
-
- _logger.LogInformation($"鑷姩鎷嗗寘閫昏緫鎵ц瀹屾垚");
-
- return splitResults;
- }
-
- /// <summary>
- /// 楠岃瘉鑷姩鎷嗗寘鍚庢暟鎹竴鑷存��
- /// </summary>
- private async Task ValidateDataConsistencyAfterAutoSplit(long orderDetailId, decimal originalAllocatedQty, decimal originalLockQty, decimal splitQuantity)
- {
- // 閲嶆柊鑾峰彇璁㈠崟鏄庣粏鏁版嵁
- var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
- .FirstAsync(x => x.Id == orderDetailId);
-
- if (orderDetail == null)
- return;
-
- // 璁＄畻鎵�鏈夐攣瀹氫俊鎭殑鎬诲垎閰嶆暟閲�
- var allLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(x => x.OrderDetailId == orderDetailId)
- .ToListAsync();
-
- decimal totalLockAssignQty = allLocks.Sum(x => x.AssignQuantity);
-
- _logger.LogInformation($"鑷姩鎷嗗寘鍚庢暟鎹竴鑷存�ч獙璇� - 璁㈠崟鏄庣粏鍒嗛厤鏁伴噺: {orderDetail.AllocatedQuantity}, 閿佸畾淇℃伅鎬诲垎閰嶆暟閲�: {totalLockAssignQty}");
-
- // 楠岃瘉鑷姩鎷嗗寘鍚庣殑鏁版嵁涓�鑷存��
- decimal expectedAllocatedQty = originalAllocatedQty + splitQuantity;
- decimal expectedLockQty = originalLockQty + splitQuantity;
-
- if (Math.Abs(orderDetail.AllocatedQuantity - expectedAllocatedQty) > 0.01m)
- {
- _logger.LogWarning($"鑷姩鎷嗗寘鍚庡垎閰嶆暟閲忓紓甯� - 鏈熸湜: {expectedAllocatedQty}, 瀹為檯: {orderDetail.AllocatedQuantity}");
- }
-
- if (Math.Abs(orderDetail.LockQuantity - expectedLockQty) > 0.01m)
- {
- _logger.LogWarning($"鑷姩鎷嗗寘鍚庨攣瀹氭暟閲忓紓甯� - 鏈熸湜: {expectedLockQty}, 瀹為檯: {orderDetail.LockQuantity}");
- }
-
- if (Math.Abs(orderDetail.AllocatedQuantity - totalLockAssignQty) > 0.01m)
- {
- _logger.LogWarning($"鑷姩鎷嗗寘鍚庢暟鎹笉涓�鑷� - 璁㈠崟鏄庣粏鍒嗛厤鏁伴噺: {orderDetail.AllocatedQuantity}, 閿佸畾淇℃伅鎬诲垎閰嶆暟閲�: {totalLockAssignQty}");
+ _logger.LogError($"鑷姩鎷嗗寘閫昏緫鎵ц澶辫触 - 鍘熸潯鐮�: {stockDetail.Barcode}, Error: {ex.Message}");
+ throw;
}
}
+
#endregion
#region 鏍稿績閫昏緫鏂规硶
+ /// <summary>
+ /// 鎵ц鍒嗘嫞閫昏緫 - 瀹屽叏淇鐗�
+ /// 纭繚OutboundQuantity鍑嗙‘绱姞锛屼笉鍖呭惈鎷嗗寘鏁伴噺
+ /// </summary>
private async Task<PickingResult> ExecutePickingLogic(
Dt_OutStockLockInfo lockInfo, Dt_OutboundOrderDetail orderDetail,
Dt_StockInfoDetail stockDetail, decimal actualPickedQty)
{
_logger.LogInformation($"寮�濮嬫墽琛屽垎鎷ｉ�昏緫 - 鏉＄爜: {stockDetail.Barcode}, 鍒嗛厤鏁伴噺: {lockInfo.AssignQuantity}, 瀹為檯鎷ｉ��: {actualPickedQty}");
- // 鍐嶆楠岃瘉璁㈠崟鏄庣粏鐨勫垎閰嶆暟閲忥紙闃叉骞跺彂鎿嶄綔锛�
- if (orderDetail.AllocatedQuantity < actualPickedQty)
+ // 鍐嶆楠岃瘉搴撳瓨鏁伴噺
+ if (stockDetail.StockQuantity < actualPickedQty)
{
- throw new InvalidOperationException($"璁㈠崟鏄庣粏鍒嗛厤鏁伴噺涓嶈冻锛岄渶瑕佹嫞閫� {actualPickedQty}锛屽彲鐢ㄥ垎閰嶆暟閲� {orderDetail.AllocatedQuantity}");
+ throw new InvalidOperationException($"搴撳瓨鏁伴噺涓嶈冻锛岄渶瑕佹嫞閫� {actualPickedQty}锛屽疄闄呭簱瀛� {stockDetail.StockQuantity}");
}
- if (orderDetail.LockQuantity < actualPickedQty)
+ // 璁板綍鎷ｉ�夊墠鐨勫��
+ decimal originalStockQty = stockDetail.StockQuantity;
+ decimal originalOutboundQty = stockDetail.OutboundQuantity;
+ int originalStatus = stockDetail.Status;
+
+ // 纭繚OutboundQuantity鍙鍔犳湰娆℃嫞閫夋暟閲忥紝涓嶅寘鍚叾浠�
+ stockDetail.StockQuantity -= actualPickedQty;
+ stockDetail.OutboundQuantity += actualPickedQty; // 鍙鍔犳湰娆℃嫞閫夋暟閲�
+
+ _logger.LogInformation($"鏇存柊搴撳瓨淇℃伅 - 鏉＄爜: {stockDetail.Barcode}");
+ _logger.LogInformation($" 搴撳瓨鏁伴噺: {originalStockQty} -> {stockDetail.StockQuantity}");
+ _logger.LogInformation($" 鍑哄簱鏁伴噺: {originalOutboundQty} -> {stockDetail.OutboundQuantity}");
+
+ // 鏇存柊搴撳瓨鐘舵��
+ if (stockDetail.StockQuantity <= 0)
{
- throw new InvalidOperationException($"璁㈠崟鏄庣粏閿佸畾鏁伴噺涓嶈冻锛岄渶瑕佹嫞閫� {actualPickedQty}锛屽彲鐢ㄩ攣瀹氭暟閲� {orderDetail.LockQuantity}");
+ stockDetail.Status = (int)StockStatusEmun.鍑哄簱瀹屾垚;
+ _logger.LogInformation($"搴撳瓨鐘舵�佹洿鏂颁负鍑哄簱瀹屾垚");
}
+ else
+ {
+ stockDetail.Status = (int)StockStatusEmun.鍑哄簱閿佸畾;
+ _logger.LogInformation($"搴撳瓨鐘舵�佷繚鎸佷负鍑哄簱閿佸畾");
+ }
+
+ await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
// 鏇存柊閿佸畾淇℃伅
+ decimal originalPickedQty = lockInfo.PickedQty;
lockInfo.PickedQty += actualPickedQty;
- _logger.LogInformation($"鏇存柊閿佸畾淇℃伅 - 宸叉嫞閫夋暟閲忎粠 {lockInfo.PickedQty - actualPickedQty} 澧炲姞鍒� {lockInfo.PickedQty}");
+ _logger.LogInformation($"鏇存柊閿佸畾淇℃伅 - 宸叉嫞閫夋暟閲忎粠 {originalPickedQty} 澧炲姞鍒� {lockInfo.PickedQty}");
- // 鍑嗙‘鍒ゆ柇鎷ｉ�夊畬鎴愮姸鎬�
+ // 鍒ゆ柇鎷ｉ�夊畬鎴愮姸鎬�
if (Math.Abs(lockInfo.PickedQty - lockInfo.AssignQuantity) < 0.001m)
{
lockInfo.Status = (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�;
@@ -4623,29 +3339,8 @@
lockInfo.Operator = App.User.UserName;
await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
- // 鏇存柊搴撳瓨淇℃伅
- decimal originalStockQty = stockDetail.StockQuantity;
- decimal originalOutboundQty = stockDetail.OutboundQuantity;
-
- stockDetail.StockQuantity -= actualPickedQty;
- stockDetail.OutboundQuantity += actualPickedQty;
-
- _logger.LogInformation($"鏇存柊搴撳瓨淇℃伅 - 搴撳瓨鏁伴噺浠� {originalStockQty} 鍑忓皯鍒� {stockDetail.StockQuantity}");
- _logger.LogInformation($"鏇存柊搴撳瓨淇℃伅 - 鍑哄簱鏁伴噺浠� {originalOutboundQty} 澧炲姞鍒� {stockDetail.OutboundQuantity}");
-
- // 鍑嗙‘鍒ゆ柇搴撳瓨鐘舵��
- if (stockDetail.StockQuantity <= 0)
- {
- stockDetail.Status = (int)StockStatusEmun.鍑哄簱瀹屾垚;
- _logger.LogInformation($"搴撳瓨鐘舵�佹洿鏂颁负鍑哄簱瀹屾垚");
- }
- else
- {
- stockDetail.Status = (int)StockStatusEmun.鍑哄簱閿佸畾;
- _logger.LogInformation($"搴撳瓨鐘舵�佷繚鎸佷负鍑哄簱閿佸畾");
- }
-
- await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
+ // 楠岃瘉鎷ｉ�夊悗鐨勬暟鎹竴鑷存��
+ await ValidatePickingDataConsistency(lockInfo, stockDetail, actualPickedQty);
_logger.LogInformation($"鍒嗘嫞閫昏緫鎵ц瀹屾垚 - 鏉＄爜: {stockDetail.Barcode}");
@@ -4656,11 +3351,45 @@
};
}
+ /// <summary>
+ /// 楠岃瘉鎷ｉ�夊悗鏁版嵁涓�鑷存��
+ /// </summary>
+ private async Task ValidatePickingDataConsistency(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail, decimal pickedQty)
+ {
+ _logger.LogInformation($"楠岃瘉鎷ｉ�夋暟鎹竴鑷存�� - 鏉＄爜: {stockDetail.Barcode}");
+
+ // 楠岃瘉搴撳瓨鏄庣粏鐨凮utboundQuantity澧炲姞閲忕瓑浜庢嫞閫夋暟閲�
+ var refreshedStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .FirstAsync(x => x.Id == stockDetail.Id);
+
+ decimal outboundIncrease = refreshedStockDetail.OutboundQuantity - stockDetail.OutboundQuantity;
+
+ if (Math.Abs(outboundIncrease - pickedQty) > 0.01m)
+ {
+ _logger.LogError($"鎷ｉ�夋暟鎹笉涓�鑷达細鍑哄簱鏁伴噺澧炲姞 {outboundIncrease}锛屼絾鎷ｉ�夋暟閲忔槸 {pickedQty}");
+ // 纭繚OutboundQuantity姝ｇ‘
+ refreshedStockDetail.OutboundQuantity = stockDetail.OutboundQuantity + pickedQty;
+ await _stockInfoDetailService.Db.Updateable(refreshedStockDetail).ExecuteCommandAsync();
+ _logger.LogWarning($"宸蹭慨澶嶅嚭搴撴暟閲忥細{stockDetail.OutboundQuantity} -> {refreshedStockDetail.OutboundQuantity}");
+ }
+
+ // 楠岃瘉閿佸畾璁板綍鐨勫凡鎷ｉ�夋暟閲�
+ var refreshedLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .FirstAsync(x => x.Id == lockInfo.Id);
+
+ if (Math.Abs(refreshedLockInfo.PickedQty - (lockInfo.PickedQty - pickedQty) - pickedQty) > 0.01m)
+ {
+ _logger.LogError($"閿佸畾璁板綍宸叉嫞閫夋暟閲忎笉涓�鑷�");
+ }
+
+ _logger.LogInformation($"鎷ｉ�夋暟鎹竴鑷存�ч獙璇侀�氳繃");
+ }
+
private async Task<RevertPickingResult> RevertPickingData(Dt_PickingRecord pickingRecord)
{
_logger.LogInformation($"寮�濮嬫仮澶嶆嫞閫夋暟鎹� - 鎷ｉ�夎褰旾D: {pickingRecord.Id}, 鏉＄爜: {pickingRecord.Barcode}, 鎷ｉ�夋暟閲�: {pickingRecord.PickQuantity}");
- // 1. 鎭㈠閿佸畾淇℃伅
+ // 鎭㈠閿佸畾淇℃伅
var lockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
.FirstAsync(x => x.Id == pickingRecord.OutStockLockId);
@@ -4699,7 +3428,7 @@
await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
- // 2. 鎭㈠搴撳瓨淇℃伅
+ // 鎭㈠搴撳瓨淇℃伅
var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
.FirstAsync(x => x.Barcode == pickingRecord.Barcode);
@@ -4746,59 +3475,85 @@
#region 鏁版嵁鏇存柊鏂规硶
+ /// <summary>
+ /// 鏇存柊鎵规鍜岃鍗曟暟鎹� - 淇鐗�
+ /// 纭繚鍙洿鏂板疄闄呯殑鎷ｉ�夋暟閲�
+ /// </summary>
private async Task UpdateBatchAndOrderData(Dt_OutboundBatch batch, Dt_OutboundOrderDetail orderDetail, decimal pickedQty, string orderNo)
{
_logger.LogInformation($"寮�濮嬫洿鏂版壒娆″拰璁㈠崟鏁版嵁 - 鎷ｉ�夋暟閲�: {pickedQty}");
- var latestOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().FirstAsync(x => x.Id == orderDetail.Id);
+
+ // 閲嶆柊鑾峰彇鏈�鏂版暟鎹紙闃叉骞跺彂闂锛�
+ var latestOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .FirstAsync(x => x.Id == orderDetail.Id);
if (latestOrderDetail == null)
throw new InvalidOperationException("鏈壘鍒拌鍗曟槑缁�");
orderDetail = latestOrderDetail;
- // 楠岃瘉鍒嗛厤鏁伴噺涓嶄細鍙樻垚璐熸暟
- if (orderDetail.AllocatedQuantity < pickedQty)
+
+ // 楠岃瘉鎷ｉ�夋暟閲忓悎鐞嗘��
+ if (pickedQty <= 0)
{
- decimal actualPickedQty = orderDetail.AllocatedQuantity;
- _logger.LogWarning($"鍒嗛厤鏁伴噺涓嶈冻锛岃皟鏁存嫞閫夋暟閲� - 鍘熼渶瑕�: {pickedQty}, 瀹為檯鍙敤: {actualPickedQty}");
- pickedQty = actualPickedQty;
+ _logger.LogWarning($"鎷ｉ�夋暟閲忔棤鏁�: {pickedQty}");
+ return;
}
- if (orderDetail.LockQuantity < pickedQty)
- {
- decimal actualPickedQty = orderDetail.LockQuantity;
- _logger.LogWarning($"閿佸畾鏁伴噺涓嶈冻锛岃皟鏁存嫞閫夋暟閲� - 鍘熼渶瑕�: {pickedQty}, 瀹為檯鍙敤: {actualPickedQty}");
- pickedQty = actualPickedQty;
- }
-
- // 1. 鏇存柊鎵规瀹屾垚鏁伴噺
- decimal originalBatchCompletedQty = batch.CompletedQuantity;
- batch.CompletedQuantity += pickedQty;
-
- _logger.LogInformation($"鏇存柊鎵规瀹屾垚鏁伴噺 - 浠� {originalBatchCompletedQty} 澧炲姞鍒� {batch.CompletedQuantity}");
-
- if (batch.CompletedQuantity >= batch.BatchQuantity)
- {
- batch.BatchStatus = (int)BatchStatusEnum.宸插畬鎴�;
- _logger.LogInformation($"鎵规鐘舵�佹洿鏂颁负宸插畬鎴�");
- }
- await _outboundBatchRepository.Db.Updateable(batch).ExecuteCommandAsync();
-
- // 鏇存柊璁㈠崟鏄庣粏
+ // 璁板綍鍘熷鍊�
decimal originalOverOutQty = orderDetail.OverOutQuantity;
decimal originalAllocatedQty = orderDetail.AllocatedQuantity;
decimal originalLockQty = orderDetail.LockQuantity;
- orderDetail.OverOutQuantity += pickedQty;
- orderDetail.AllocatedQuantity -= pickedQty;
- // LockQuantity 鍚屾鍑忓皯
- orderDetail.LockQuantity = orderDetail.AllocatedQuantity;
- if (orderDetail.AllocatedQuantity < 0) orderDetail.AllocatedQuantity = 0;
- if (orderDetail.LockQuantity < 0) orderDetail.LockQuantity = 0;
- _logger.LogInformation($"鏇存柊璁㈠崟鏄庣粏 - 宸插嚭搴撴暟閲忎粠 {originalOverOutQty} 澧炲姞鍒� {orderDetail.OverOutQuantity}");
- _logger.LogInformation($"鏇存柊璁㈠崟鏄庣粏 - 宸插垎閰嶆暟閲忎粠 {originalAllocatedQty} 鍑忓皯鍒� {orderDetail.AllocatedQuantity}");
- _logger.LogInformation($"鏇存柊璁㈠崟鏄庣粏 - 閿佸畾鏁伴噺浠� {originalLockQty} 鍑忓皯鍒� {orderDetail.LockQuantity}");
+ // 鏇存柊璁㈠崟鏄庣粏
+ orderDetail.OverOutQuantity += pickedQty; // 宸插嚭搴撴暟閲忓鍔�
+ orderDetail.AllocatedQuantity -= pickedQty; // 宸插垎閰嶆暟閲忓噺灏�
+ orderDetail.LockQuantity -= pickedQty; // 閿佸畾鏁伴噺鍑忓皯
+
+ // 纭繚鏁伴噺涓嶄細涓鸿礋鏁�
+ if (orderDetail.AllocatedQuantity < 0)
+ {
+ _logger.LogWarning($"鍒嗛厤鏁伴噺鍑虹幇璐熸暟锛岄噸缃负0銆傚師鍊�: {orderDetail.AllocatedQuantity + pickedQty}");
+ orderDetail.AllocatedQuantity = 0;
+ }
+
+ if (orderDetail.LockQuantity < 0)
+ {
+ _logger.LogWarning($"閿佸畾鏁伴噺鍑虹幇璐熸暟锛岄噸缃负0銆傚師鍊�: {orderDetail.LockQuantity + pickedQty}");
+ orderDetail.LockQuantity = 0;
+ }
+
+ // 鏇存柊鎵规鍒嗛厤鐘舵��
+ await UpdateBatchAllocateStatus(orderDetail);
await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();
+
+ _logger.LogInformation($"鏇存柊璁㈠崟鏄庣粏鎴愬姛");
+ _logger.LogInformation($" 宸插嚭搴撴暟閲�: {originalOverOutQty} -> {orderDetail.OverOutQuantity}");
+ _logger.LogInformation($" 宸插垎閰嶆暟閲�: {originalAllocatedQty} -> {orderDetail.AllocatedQuantity}");
+ _logger.LogInformation($" 閿佸畾鏁伴噺: {originalLockQty} -> {orderDetail.LockQuantity}");
+
+ // 鏇存柊鎵规瀹屾垚鏁伴噺
+ if (batch != null)
+ {
+ decimal originalBatchCompletedQty = batch.CompletedQuantity;
+ batch.CompletedQuantity += pickedQty;
+
+ _logger.LogInformation($"鏇存柊鎵规瀹屾垚鏁伴噺 - 浠� {originalBatchCompletedQty} 澧炲姞鍒� {batch.CompletedQuantity}");
+
+ // 鏇存柊鎵规鐘舵��
+ if (batch.CompletedQuantity >= batch.BatchQuantity)
+ {
+ batch.BatchStatus = (int)BatchStatusEnum.宸插畬鎴�;
+ _logger.LogInformation($"鎵规鐘舵�佹洿鏂颁负宸插畬鎴�");
+ }
+ else if (batch.CompletedQuantity > 0)
+ {
+ batch.BatchStatus = (int)BatchStatusEnum.鎵ц涓�;
+ _logger.LogInformation($"鎵规鐘舵�佹洿鏂颁负鎵ц涓�");
+ }
+
+ await _outboundBatchRepository.Db.Updateable(batch).ExecuteCommandAsync();
+ }
// 妫�鏌ヨ鍗曠姸鎬�
await CheckAndUpdateOrderStatus(orderNo);
@@ -4866,7 +3621,7 @@
await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();
}
- // 3. 閲嶆柊妫�鏌ヨ鍗曠姸鎬�
+ // 閲嶆柊妫�鏌ヨ鍗曠姸鎬�
await CheckAndUpdateOrderStatus(pickingRecord.OrderNo);
_logger.LogInformation($"鎭㈠鎵规鍜岃鍗曟暟鎹畬鎴�");
@@ -4887,136 +3642,9 @@
orderDetail.BatchAllocateStatus = OrderDetailStatusEnum.New.ObjToInt();
}
}
- private async Task ReleaseLockAndStock(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.鍏ュ簱瀹屾垚;
- await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
- }
-
- // 鏇存柊閿佸畾璁板綍鐘舵�佷负宸插洖搴�
- lockInfo.Status = (int)OutLockStockStatusEnum.宸插洖搴�;
- lockInfo.Operator = App.User.UserName;
- await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
- }
-
- /// <summary>
- /// 鏇存柊鎵规鐘舵�侊紙鍥炲簱锛�
- /// </summary>
- private async Task UpdateBatchStatusForReturn(string outboundBatchNo, List<Dt_OutStockLockInfo> returnedLocks)
- {
- var batch = await _outboundBatchRepository.Db.Queryable<Dt_OutboundBatch>()
- .FirstAsync(x => x.BatchNo == outboundBatchNo);
-
- if (batch != null)
- {
- // 璁＄畻鍥炲簱鏁伴噺锛堟湭鎷ｉ�夌殑閮ㄥ垎锛�
- var returnedQty = returnedLocks.Sum(x => x.AssignQuantity - x.PickedQty);
- batch.CompletedQuantity -= returnedQty;
-
- // 鏇存柊鎵规鐘舵��
- if (batch.CompletedQuantity <= 0)
- {
- batch.BatchStatus = (int)BatchStatusEnum.宸插洖搴�;
- }
- else if (batch.CompletedQuantity < batch.BatchQuantity)
- {
- batch.BatchStatus = (int)BatchStatusEnum.鎵ц涓�;
- }
- else
- {
- batch.BatchStatus = (int)BatchStatusEnum.宸插畬鎴�;
- }
-
- batch.Operator = App.User.UserName;
- await _outboundBatchRepository.Db.Updateable(batch).ExecuteCommandAsync();
- }
- }
-
- /// <summary>
- /// 鏇存柊璁㈠崟鏄庣粏锛堝洖搴撳悗锛�
- /// </summary>
- private async Task UpdateOrderDetailAfterReturn(List<Dt_OutStockLockInfo> returnedLocks)
- {
- var orderDetailGroups = returnedLocks.GroupBy(x => x.OrderDetailId);
-
- foreach (var group in orderDetailGroups)
- {
- var orderDetailId = group.Key;
- var returnedQty = group.Sum(x => x.AssignQuantity - x.PickedQty);
-
- var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
- .FirstAsync(x => x.Id == orderDetailId);
-
- if (orderDetail != null)
- {
- orderDetail.AllocatedQuantity -= returnedQty;
- // LockQuantity 鍚屾鍑忓皯锛屼繚鎸佷笌宸插垎閰嶆暟閲忎竴鑷�
- orderDetail.LockQuantity = orderDetail.AllocatedQuantity;
-
- await UpdateBatchAllocateStatus(orderDetail);
-
- await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();
- }
- }
- }
+
#endregion
-
- private async Task CreateReturnTaskAndHandleESS(string orderNo, string palletCode, Dt_Task originalTask, TaskTypeEnum taskTypeEnum, int palletType)
- {
- var firstLocation = await _locationInfoService.Db.Queryable<Dt_LocationInfo>()
- .FirstAsync(x => x.LocationCode == originalTask.SourceAddress);
-
- // 鍒嗛厤鏂拌揣浣�
- var newLocation = _locationInfoService.AssignLocation(firstLocation.LocationType);
-
- Dt_Task returnTask = new()
- {
- CurrentAddress = stations[originalTask.TargetAddress],
- Grade = 0,
- PalletCode = palletCode,
- NextAddress = "",
- // OrderNo = originalTask.OrderNo,
- OrderNo = orderNo,
- Roadway = newLocation.RoadwayNo,
- SourceAddress = stations[originalTask.TargetAddress],
- TargetAddress = newLocation.LocationCode,
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- TaskType = taskTypeEnum.ObjToInt(),
- PalletType = palletType,
- WarehouseId = originalTask.WarehouseId
-
- };
- // 淇濆瓨鍥炲簱浠诲姟
- var insertcount = await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();
- if (insertcount <= 0)
- {
- throw new Exception("鍒涘缓浠诲姟澶辫触锛�");
- }
- var targetAddress = originalTask.TargetAddress;
-
- _logger.LogInformation($"CreateReturnTaskAndHandleESS 鍒嗘壒鍒犻櫎鍘嗗彶浠诲姟: {orderNo} 锛� {originalTask.TaskNum}");
- // 鍒犻櫎鍘熷鍑哄簱浠诲姟
- //_taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.鑷姩瀹屾垚);
- var result = _task_HtyService.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.浜哄伐鍒犻櫎);
- await _taskRepository.Db.Deleteable(originalTask).ExecuteCommandAsync();
-
- if (!result)
- {
- await _taskRepository.Db.Deleteable(originalTask).ExecuteCommandAsync();
- }
- _logger.LogInformation($"CreateReturnTaskAndHandleESS 鍒嗘壒鍒犻櫎鍘嗗彶浠诲姟: {orderNo} 锛� {originalTask.TaskNum},褰卞搷琛� {result}");
-
-
- // 缁� ESS 鍙戦�佹祦鍔ㄤ俊鍙峰拰鍒涘缓浠诲姟
- await SendESSCommands(palletCode, targetAddress, returnTask);
- }
+
/// <summary>
/// 缁橢SS涓嬩换鍔�
/// </summary>
@@ -5029,16 +3657,14 @@
{
try
{
- // 1. 鍙戦�佹祦鍔ㄤ俊鍙�
+ // 鍙戦�佹祦鍔ㄤ俊鍙�
var moveResult = await _eSSApiService.MoveContainerAsync(new WIDESEA_DTO.Basic.MoveContainerRequest
{
slotCode = movestations[targetAddress],
containerCode = palletCode
});
- //if (moveResult)
- //{
- // 2. 鍒涘缓鍥炲簱浠诲姟
+
var essTask = new TaskModel()
{
taskType = "putaway",
@@ -5062,7 +3688,7 @@
var resultTask = await _eSSApiService.CreateTaskAsync(essTask);
_logger.LogInformation($"ReturnRemaining 鍒涘缓浠诲姟鎴愬姛: {resultTask}");
- //}
+
}
catch (Exception ex)
{
@@ -5070,7 +3696,6 @@
throw new Exception($"ESS绯荤粺閫氫俊澶辫触: {ex.Message}");
}
}
-
#region 杈呭姪鏂规硶
@@ -5084,20 +3709,29 @@
{
var splitHistory = new Dt_SplitPackageRecord
{
- OrderNo = lockInfo.OrderNo,
+ FactoryArea = lockInfo.FactoryArea,
+ TaskNum = lockInfo.TaskNum,
OutStockLockInfoId = lockInfo.Id,
StockId = stockDetail.StockId,
Operator = App.User.UserName,
+ IsReverted = false,
OriginalBarcode = stockDetail.Barcode,
NewBarcode = newBarcode,
SplitQty = splitQty,
+ // RemainQuantity = remainQty,
+ MaterielCode = lockInfo.MaterielCode,
SplitTime = DateTime.Now,
+ OrderNo = lockInfo.OrderNo,
+ PalletCode = lockInfo.PalletCode,
+
+
+
Status = (int)SplitPackageStatusEnum.宸叉媶鍖�,
IsAutoSplit = isAutoSplit,
// SplitType = isAutoSplit ? "鑷姩鎷嗗寘" : "鎵嬪姩鎷嗗寘"
OriginalStockQuantity = originalStockQuantity ?? stockDetail.StockQuantity,
//RemainingStockQuantity = stockDetail.StockQuantity - splitQty
- TaskNum = lockInfo.TaskNum
+
};
await _splitPackageService.Db.Insertable(splitHistory).ExecuteCommandAsync();
@@ -5160,28 +3794,32 @@
}
#endregion
-
#region DTO绫�
+
/// <summary>
- /// 鏉＄爜鐘舵�佷俊鎭疍TO
+ /// 鍥炲簱浠诲姟淇℃伅绫�
/// </summary>
- public class BarcodeStatusInfoDto
+ public class ReturnTaskInfo
{
- public string Barcode { get; set; }
- public string OrderNo { get; set; }
- public bool IsOriginalBarcode { get; set; }
- public int SplitChainCount { get; set; }
- public bool HasBeenPicked { get; set; }
- public decimal TotalPickedQuantity { get; set; }
- public int PickRecordCount { get; set; }
- public int LockInfoStatus { get; set; }
- public decimal LockInfoPickedQty { get; set; }
- public decimal LockInfoAssignQty { get; set; }
- public decimal StockQuantity { get; set; }
- public int StockStatus { get; set; }
- public bool CanCancelSplit { get; set; }
- public bool NeedCancelPickFirst { get; set; }
- public List<string> OperationSuggestions { get; set; } = new List<string>();
+ /// <summary>
+ /// 鏄惁闇�瑕佸彂閫丒SS鍛戒护
+ /// </summary>
+ public bool ShouldSendESS { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏鐮�
+ /// </summary>
+ public string PalletCode { get; set; }
+
+ /// <summary>
+ /// 鍘熷浠诲姟鐨勭洰鏍囧湴鍧�
+ /// </summary>
+ public string OriginalTaskTargetAddress { get; set; }
+
+ /// <summary>
+ /// 鍥炲簱浠诲姟
+ /// </summary>
+ public Dt_Task ReturnTask { get; set; }
}
public class PickedBarcodeInfo
{
@@ -5189,14 +3827,7 @@
public decimal PickedQty { get; set; }
public int PickRecordCount { get; set; }
}
- /// <summary>
- /// 鑷姩鎷嗗寘缁撴灉
- /// </summary>
- public class AutoSplitResult
- {
- public string NewBarcode { get; set; }
- public decimal SplitQuantity { get; set; }
- }
+
public class PickingResult
{
@@ -5208,11 +3839,6 @@
{
public Dt_OutStockLockInfo LockInfo { get; set; }
public Dt_StockInfoDetail StockDetail { get; set; }
- }
-
- public class SplitResultDto
- {
- public string NewBarcode { get; set; }
}
public class ValidationResult<T>
--
Gitblit v1.9.3