From 61d8f975a9f02a4e1d3bd0eb234851e6da39fff4 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 02 十二月 2025 14:16:28 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 500 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 401 insertions(+), 99 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_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 29f446f..b00aac2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -27,6 +27,7 @@
using System.Reflection.Emit;
using System.Threading.Tasks;
using System.Xml.Linq;
+using WIDESEA_BasicService;
using WIDESEA_Common.AllocateEnum;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.LocationEnum;
@@ -76,6 +77,7 @@
private readonly IOutboundOrderDetailService _outboundOrderDetailService;
private readonly IOutStockLockInfoService _outStockLockInfoService;
private readonly ILocationStatusChangeRecordService _locationStatusChangeRecordService;
+ private readonly IMaterialUnitService _materialUnitService;
private readonly IESSApiService _eSSApiService;
private readonly IStockService _stockService;
private readonly IRecordService _recordService;
@@ -100,7 +102,7 @@
public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();
- public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository, IRepository<Dt_ReCheckOrder> reCheckOrderRepository, IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository) : base(BaseDal)
+ public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository, IRepository<Dt_ReCheckOrder> reCheckOrderRepository, IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository, IMaterialUnitService materialUnitService) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -122,6 +124,7 @@
_reCheckOrderRepository = reCheckOrderRepository;
_allocateOrderDetailRepository = allocateOrderDetailRepository;
_allocateOrderRepository = allocateOrderRepository;
+ _materialUnitService = materialUnitService;
}
@@ -554,60 +557,92 @@
}
}
+
public async Task<WebResponseContent> InPickTaskCompleted(Dt_Task task)
{
- _logger.LogInformation($"TaskService InPickTaskCompleted: {task.TaskNum}");
+ _logger.LogInformation($"TaskService InPickTaskCompleted: {task.TaskNum}");
+
try
{
- //鏌ュ簱瀛�
- Dt_StockInfo stockInfo = await _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(x => x.Details).Where(x => x.PalletCode == task.PalletCode).FirstAsync();
+ _unitOfWorkManage.BeginTran(); // 娣诲姞浜嬪姟绠＄悊
+
+ // 鏌ュ簱瀛�
+ Dt_StockInfo stockInfo = await _stockRepository.Db.Queryable<Dt_StockInfo>()
+ .Includes(x => x.Details)
+ .Where(x => x.PalletCode == task.PalletCode)
+ .FirstAsync();
+
if (stockInfo == null)
{
- _logger.LogInformation($"TaskService InPickTaskCompleted: 鏈壘鍒版墭鐩樺搴旂殑缁勭洏淇℃伅.{task.TaskNum}");
+ _logger.LogInformation($"TaskService InPickTaskCompleted: 鏈壘鍒版墭鐩樺搴旂殑缁勭洏淇℃伅.{task.TaskNum}");
return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑缁勭洏淇℃伅");
}
+
if (stockInfo.Details.Count == 0 && stockInfo.PalletType != PalletTypeEnum.Empty.ObjToInt())
{
- _logger.LogInformation($"TaskService InPickTaskCompleted: 鏈壘鍒拌鎵樼洏搴撳瓨鏄庣粏淇℃伅.{task.TaskNum}");
+ _logger.LogInformation($"TaskService InPickTaskCompleted: 鏈壘鍒拌鎵樼洏搴撳瓨鏄庣粏淇℃伅.{task.TaskNum}");
return WebResponseContent.Instance.Error($"鏈壘鍒拌鎵樼洏搴撳瓨鏄庣粏淇℃伅");
}
- //鏌ヨ揣浣�
+
+ // 鏌ヨ揣浣�
Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
if (locationInfo == null)
{
- _logger.LogInformation($"TaskService InPickTaskCompleted: 鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅 {task.TaskNum}.");
+ _logger.LogInformation($"TaskService InPickTaskCompleted: 鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅 {task.TaskNum}.");
return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
}
var beforelocationStatus = locationInfo.LocationStatus;
+
// 鑾峰彇鎵�鏈夊洖搴撲腑鐨勫嚭搴撻攣瀹氳褰�
var returnLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
- .Where(it => it.OrderNo == task.OrderNo && it.PalletCode == task.PalletCode && it.Status == (int)OutLockStockStatusEnum.鍥炲簱涓�)
+ .Where(it => it.OrderNo == task.OrderNo &&
+ it.PalletCode == task.PalletCode &&
+ it.Status == (int)OutLockStockStatusEnum.鍥炲簱涓�)
.ToListAsync();
+
// 鏇存柊鍑哄簱閿佸畾璁板綍鐘舵�佷负鍥炲簱瀹屾垚
foreach (var lockInfo in returnLocks)
{
lockInfo.Status = (int)OutLockStockStatusEnum.宸插洖搴�;
+ lockInfo.Operator = App.User.UserName;
}
- _outStockLockInfoService.Db.Updateable(returnLocks).ExecuteCommand();
+ if (returnLocks.Any())
+ {
+ await _outStockLockInfoService.Db.Updateable(returnLocks).ExecuteCommandAsync();
+ _logger.LogInformation($"鏇存柊{returnLocks.Count}鏉￠攣瀹氳褰曚负宸插洖搴撶姸鎬�");
+ }
+
+ // 鏇存柊搴撳瓨淇℃伅
stockInfo.LocationCode = task.TargetAddress;
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+
+ // 鏇存柊搴撳瓨鏄庣粏鐘舵��
if (stockInfo.Details != null && stockInfo.Details.Any())
{
- stockInfo.Details.ForEach(x =>
+ foreach (var detail in stockInfo.Details)
{
- x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
- });
- _stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);
+ detail.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+
+ // 纭繚搴撳瓨鏁伴噺涓庡嚭搴撴暟閲忎竴鑷�
+ if (detail.Status == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt())
+ {
+ detail.OutboundQuantity = 0; // 鍏ュ簱瀹屾垚鏃跺嚭搴撴暟閲忔竻闆�
+ }
+ }
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);
}
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ // 澶勭悊鍥炲簱鐩稿叧鐨勫簱瀛樻槑缁�
await ProcessStockDetailsForReturn(task, stockInfo.Id);
+ // 鍒犻櫎闆跺簱瀛樻暟鎹�
await DeleteZeroQuantityStockDetails(stockInfo.Id);
+ // 鏇存柊璐т綅鐘舵��
if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
{
locationInfo.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
@@ -616,30 +651,321 @@
{
locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
}
- _locationInfoService.Repository.UpdateData(locationInfo);
- var outboundOrder = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().First(x => x.OrderNo == task.OrderNo);
- task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
+
+ _locationInfoService.Repository.UpdateData(locationInfo);
+ // 鏇存柊璁㈠崟鐩稿叧鏁版嵁
+ await UpdateOrderDataAfterReturn(task.OrderNo, returnLocks);
+
+ // 鑾峰彇骞舵洿鏂板嚭搴撹鍗�
+ var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
+ .FirstAsync(x => x.OrderNo == task.OrderNo);
+
+ task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
+
+ // 鍒犻櫎浠诲姟璁板綍
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
BaseDal.DeleteData(task);
- _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforelocationStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
+
+ // 璁板綍璐т綅鐘舵�佸彉鏇�
+ _locationStatusChangeRecordService.AddLocationStatusChangeRecord(
+ locationInfo,
+ beforelocationStatus,
+ StockChangeType.Inbound.ObjToInt(),
+ "",
+ task.TaskNum
+ );
if (outboundOrder != null)
{
+ // 妫�鏌ヨ鍗曠姸鎬佹槸鍚﹂渶瑕佹洿鏂�
+ await CheckAndUpdateOrderStatusAfterReturn(task.OrderNo);
+
+ // 澶勭悊MES鍙嶉
await HandleOutboundOrderToMESCompletion(outboundOrder, outboundOrder.OrderNo);
}
else
{
- _logger.LogInformation($"TaskService InPickTaskCompleted: {task.TaskNum} ,鏈壘鍒板嚭搴撳崟銆� ");
+ _logger.LogInformation($"TaskService InPickTaskCompleted: {task.TaskNum} ,鏈壘鍒板嚭搴撳崟銆�");
+ }
+
+ _unitOfWorkManage.CommitTran(); // 鎻愪氦浜嬪姟
+
+ _logger.LogInformation($"鍥炲簱浠诲姟瀹屾垚澶勭悊鎴愬姛 - 浠诲姟鍙�: {task.TaskNum}, 鎵樼洏: {task.PalletCode}");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran(); // 鍥炴粴浜嬪姟
+ _logger.LogError($"TaskService InPickTaskCompleted澶辫触 - TaskNum: {task.TaskNum}, Error: {ex.Message}");
+ return WebResponseContent.Instance.Error($"鍥炲簱浠诲姟瀹屾垚澶勭悊澶辫触: {ex.Message}");
+ }
+
+ return WebResponseContent.Instance.OK();
+ }
+
+ /// <summary>
+ /// 鍥炲簱鍚庢洿鏂拌鍗曟暟鎹�
+ /// </summary>
+ private async Task UpdateOrderDataAfterReturn(string orderNo, List<Dt_OutStockLockInfo> returnLocks)
+ {
+ try
+ {
+ // 鑾峰彇鎵�鏈夊彈褰卞搷鐨勮鍗曟槑缁咺D
+ var affectedDetailIds = returnLocks
+ .Select(x => x.OrderDetailId)
+ .Distinct()
+ .ToList();
+
+ foreach (var detailId in affectedDetailIds)
+ {
+ // 璁＄畻璇ヨ鍗曟槑缁嗙殑鍥炲簱鎬绘暟閲�
+ var detailReturnLocks = returnLocks
+ .Where(x => x.OrderDetailId == detailId)
+ .ToList();
+
+ decimal totalReturnQty = detailReturnLocks.Sum(x => x.AssignQuantity - x.PickedQty);
+
+ if (totalReturnQty > 0)
+ {
+ // 鑾峰彇璁㈠崟鏄庣粏
+ var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .FirstAsync(x => x.Id == detailId);
+
+ if (orderDetail != null)
+ {
+ // 鏇存柊閿佸畾鏁伴噺锛堝洖搴撳悗閿佸畾鏁伴噺搴斿噺灏戯級
+ var remainingLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderDetailId == detailId &&
+ x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
+ .ToListAsync();
+
+ decimal remainingLockQty = remainingLocks.Sum(x => x.AssignQuantity - x.PickedQty);
+
+ // 鏇存柊璁㈠崟鏄庣粏
+ await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
+ .SetColumns(it => new Dt_OutboundOrderDetail
+ {
+ LockQuantity = remainingLockQty,
+ })
+ .Where(it => it.Id == detailId)
+ .ExecuteCommandAsync();
+
+ // 鏇存柊璁㈠崟鏄庣粏鐘舵��
+ await UpdateOrderDetailStatus(detailId);
+
+ _logger.LogInformation($"鍥炲簱鏇存柊璁㈠崟鏄庣粏 - OrderDetailId: {detailId}, " +
+ $"鎵ｅ噺閿佸畾鏁伴噺: {totalReturnQty}, 鏂伴攣瀹氭暟閲�: {remainingLockQty}");
+ }
+ }
}
}
catch (Exception ex)
{
- _logger.LogInformation($"TaskService InPickTaskCompleted: {task.TaskNum} , {ex.Message}");
+ _logger.LogError($"UpdateOrderDataAfterReturn澶辫触 - OrderNo: {orderNo}, Error: {ex.Message}");
+ throw;
}
- return await Task.FromResult(WebResponseContent.Instance.OK());
+ }
+ /// <summary>
+ /// 鏇存柊璁㈠崟鏄庣粏鐘舵��
+ /// </summary>
+ private async Task UpdateOrderDetailStatus(int orderDetailId)
+ {
+ try
+ {
+ var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .FirstAsync(x => x.Id == orderDetailId);
+
+ if (orderDetail == null)
+ {
+ _logger.LogWarning($"UpdateOrderDetailStatus澶辫触锛氭湭鎵惧埌璁㈠崟鏄庣粏锛孖D: {orderDetailId}");
+ return;
+ }
+
+ int newStatus = orderDetail.OrderDetailStatus;
+
+ // 1. 妫�鏌ユ槸鍚﹀凡瀹屾垚
+ if (orderDetail.OverOutQuantity >= orderDetail.NeedOutQuantity)
+ {
+ newStatus = (int)OrderDetailStatusEnum.Over;
+ }
+ // 2. 妫�鏌ユ槸鍚︽鍦ㄨ繘琛屼腑锛堟湁閿佸畾鏁伴噺鎴栭儴鍒嗘嫞閫夛級
+ else if (orderDetail.LockQuantity > 0 ||
+ (orderDetail.OverOutQuantity > 0 && orderDetail.OverOutQuantity < orderDetail.NeedOutQuantity))
+ {
+ newStatus = (int)OrderDetailStatusEnum.Outbound;
+ }
+ // 3. 妫�鏌ユ槸鍚︽湁閿佸畾浣嗘湭鎷ｉ��
+ else if (orderDetail.LockQuantity > 0 && orderDetail.OverOutQuantity == 0)
+ {
+ newStatus = (int)OrderDetailStatusEnum.AssignOverPartial;
+ }
+ // 4. 鍚﹀垯涓烘柊璁㈠崟
+ else
+ {
+ newStatus = (int)OrderDetailStatusEnum.New;
+ }
+
+ // 鍙湁鐘舵�佸彉鍖栨椂鎵嶆洿鏂�
+ if (orderDetail.OrderDetailStatus != newStatus)
+ {
+ await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
+ .SetColumns(it => new Dt_OutboundOrderDetail
+ {
+ OrderDetailStatus = newStatus,
+ })
+ .Where(it => it.Id == orderDetailId)
+ .ExecuteCommandAsync();
+
+ _logger.LogInformation($"鏇存柊璁㈠崟鏄庣粏鐘舵�� - OrderDetailId: {orderDetailId}, " +
+ $"鏃х姸鎬�: {orderDetail.OrderDetailStatus}, 鏂扮姸鎬�: {newStatus}, " +
+ $"宸插嚭搴�: {orderDetail.OverOutQuantity}/{orderDetail.NeedOutQuantity}, " +
+ $"閿佸畾鏁伴噺: {orderDetail.LockQuantity}");
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"UpdateOrderDetailStatus澶辫触 - OrderDetailId: {orderDetailId}, Error: {ex.Message}");
+ throw;
+ }
+ }
+ /// <summary>
+ /// 鍥炲簱鍚庢鏌ュ苟鏇存柊璁㈠崟鐘舵��
+ /// </summary>
+ private async Task CheckAndUpdateOrderStatusAfterReturn(string orderNo)
+ {
+ try
+ {
+ var orderDetails = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .LeftJoin<Dt_OutboundOrder>((o, item) => o.OrderId == item.Id)
+ .Where((o, item) => item.OrderNo == orderNo)
+ .Select((o, item) => o)
+ .ToListAsync();
+
+ bool allCompleted = true;
+ bool hasInProgress = false;
+
+ foreach (var detail in orderDetails)
+ {
+ // 妫�鏌ユ槸鍚﹀畬鎴�
+ if (detail.OverOutQuantity < detail.NeedOutQuantity)
+ {
+ allCompleted = false;
+ }
+
+ // 妫�鏌ユ槸鍚︽湁杩涜涓殑浠诲姟锛堥攣瀹氭垨閮ㄥ垎鎷ｉ�夛級
+ if (detail.LockQuantity > 0 ||
+ detail.OrderDetailStatus == OrderDetailStatusEnum.Outbound.ObjToInt())
+ {
+ hasInProgress = true;
+ }
+ }
+
+ var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
+ .FirstAsync(x => x.OrderNo == orderNo);
+
+ if (outboundOrder == null) return;
+
+ int newStatus;
+ if (allCompleted)
+ {
+ newStatus = (int)OutOrderStatusEnum.鍑哄簱瀹屾垚;
+ }
+ else if (hasInProgress)
+ {
+ newStatus = (int)OutOrderStatusEnum.鍑哄簱涓�;
+ }
+ else
+ {
+ newStatus = (int)OutOrderStatusEnum.鏈紑濮�;
+ }
+
+ if (outboundOrder.OrderStatus != newStatus)
+ {
+ await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
+ .SetColumns(x => new Dt_OutboundOrder
+ {
+ OrderStatus = newStatus,
+ Operator = App.User.UserName,
+ })
+ .Where(x => x.OrderNo == orderNo)
+ .ExecuteCommandAsync();
+
+ _logger.LogInformation($"鍥炲簱鍚庢洿鏂拌鍗曠姸鎬� - OrderNo: {orderNo}, 鏂扮姸鎬�: {newStatus}");
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"CheckAndUpdateOrderStatusAfterReturn澶辫触 - OrderNo: {orderNo}, Error: {ex.Message}");
+ throw;
+ }
}
+ /// <summary>
+ /// 澶勭悊鍥炲簱鐨勫簱瀛樻槑缁嗭紙澧炲己鐗堬級
+ /// </summary>
+ private async Task ProcessStockDetailsForReturn(Dt_Task task, int stockId)
+ {
+ try
+ {
+ // 鑾峰彇鎵�鏈夐渶瑕佸鐞嗙殑搴撳瓨鏄庣粏
+ var stockDetails = await _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockId)
+ .ToListAsync();
+
+ foreach (var detail in stockDetails)
+ {
+ // 纭繚搴撳瓨鐘舵�佹纭�
+ if (detail.Status == StockStatusEmun.鍏ュ簱纭.ObjToInt())
+ {
+ // 濡傛灉宸茬粡鏄叆搴撶‘璁ょ姸鎬侊紝鏇存柊涓哄叆搴撳畬鎴�
+ detail.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ detail.OutboundQuantity = 0;
+
+ await _stockService.StockInfoDetailService.Db.Updateable(detail).ExecuteCommandAsync();
+
+ _logger.LogInformation($"鏇存柊搴撳瓨鏄庣粏鐘舵�� - 鏉＄爜: {detail.Barcode}, " +
+ $"鏂扮姸鎬�: {detail.Status}, 鍑哄簱鏁伴噺: {detail.OutboundQuantity}");
+ }
+ else if (detail.Status == StockStatusEmun.鍑哄簱閿佸畾.ObjToInt() ||
+ detail.Status == StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt())
+ {
+ // 杩欎簺鐘舵�佷笉搴旇瀛樺湪锛岃褰曡鍛�
+ _logger.LogWarning($"寮傚父搴撳瓨鐘舵�� - 鏉＄爜: {detail.Barcode}, 鐘舵��: {detail.Status}, " +
+ $"浠诲姟鍙�: {task.TaskNum}");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"ProcessStockDetailsForReturn澶辫触 - StockId: {stockId}, Error: {ex.Message}");
+ throw;
+ }
+ }
+
+ /// <summary>
+ /// 鍒犻櫎闆跺簱瀛樻暟鎹紙澧炲己鐗堬級
+ /// </summary>
+ private async Task DeleteZeroQuantityStockDetails(int stockId)
+ {
+ try
+ {
+ // 鏌ユ壘搴撳瓨鏁伴噺涓�0鐨勮褰�
+ var zeroStockDetails = await _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockId && x.StockQuantity <= 0)
+ .ToListAsync();
+
+ if (zeroStockDetails.Any())
+ {
+ await _stockService.StockInfoDetailService.Db.Deleteable(zeroStockDetails).ExecuteCommandAsync();
+ _logger.LogInformation($"鍒犻櫎{zeroStockDetails.Count}鏉￠浂搴撳瓨璁板綍 - StockId: {stockId}");
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"DeleteZeroQuantityStockDetails澶辫触 - StockId: {stockId}, Error: {ex.Message}");
+ throw;
+ }
+ }
private async Task HandleOutboundOrderToMESCompletion(Dt_OutboundOrder outboundOrder, string orderNo)
{
@@ -701,7 +1027,7 @@
var detailLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
.Where(x => x.OrderNo == orderNo &&
x.OrderDetailId == detail.Id &&
- x.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�)
+ (x.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴� || x.Status == (int)OutLockStockStatusEnum.宸插洖搴�))
.ToListAsync();
var detailModel = new AllocateDtoDetail
@@ -709,17 +1035,32 @@
MaterialCode = detail.MaterielCode,
LineNo = detail.lineNo,
WarehouseCode = detail.WarehouseCode,
- Qty = detailLocks.Sum(x=>x.BarcodeQty),
- Unit = detail.Unit,
- Barcodes = detailLocks.Select(lockInfo => new BarcodeInfo
- {
- Barcode = lockInfo.CurrentBarcode,
- SupplyCode = lockInfo.SupplyCode,
- BatchNo = lockInfo.BatchNo,
- Unit = lockInfo.BarcodeUnit,
- Qty = lockInfo.BarcodeQty // 鏉＄爜绾у埆鐨勬暟閲忎粛鐢ㄩ攣瀹氳褰�
- }).ToList()
+ Qty = detailLocks.Sum(x=>x.PickedQty),
+ Unit = detail.BarcodeUnit,
+ Barcodes = new List<BarcodeInfo> ()
};
+ foreach (var item in detailLocks)
+ {
+ var barModel = new BarcodeInfo
+ {
+ Barcode = item.CurrentBarcode,
+ SupplyCode = item.SupplyCode,
+ BatchNo = item.BatchNo,
+ Unit = item.BarcodeUnit,
+ Qty = item.PickedQty
+ };
+ // 鍗曚綅涓嶄竴鑷存椂杞崲
+ if (item.BarcodeUnit != item.Unit)
+ {
+ var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit);
+ barModel.Unit = convertResult.Unit;
+ barModel.Qty = convertResult.Quantity;
+ }
+
+ detailModel.Qty += barModel.Qty;
+ detailModel.Barcodes.Add(barModel);
+ }
+
allocatefeedmodel.Details.Add(detailModel);
}
@@ -766,7 +1107,7 @@
var detailLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
.Where(x => x.OrderNo == orderNo &&
x.OrderDetailId == detail.Id &&
- x.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴�)
+ (x.Status == (int)OutLockStockStatusEnum.鎷ｉ�夊畬鎴� || x.Status == (int)OutLockStockStatusEnum.宸插洖搴�))
.ToListAsync();
var detailModel = new FeedbackOutboundDetailsModel
@@ -774,19 +1115,33 @@
materialCode = detail.MaterielCode,
lineNo = detail.lineNo, // 娉ㄦ剰锛氳繖閲屽彲鑳介渶瑕佽皟鏁村瓧娈靛悕
warehouseCode = detail.WarehouseCode,
- qty = detail.BarcodeQty,
- currentDeliveryQty = detail.BarcodeQty,
+ qty = detail.PickedQty,
+ currentDeliveryQty = detail.PickedQty,
unit = detail.Unit,
- barcodes = detailLocks.Select(lockInfo => new WIDESEA_DTO.Outbound.BarcodesModel
- {
- barcode = lockInfo.CurrentBarcode,
- supplyCode = lockInfo.SupplyCode,
- batchNo = lockInfo.BatchNo,
- unit = lockInfo.BarcodeUnit,
- qty = lockInfo.BarcodeQty // 鏉＄爜绾у埆鐨勬暟閲忎粛鐢ㄩ攣瀹氳褰�
- }).ToList()
+ barcodes = new List<WIDESEA_DTO.Outbound.BarcodesModel>()
};
+ foreach (var item in detailLocks)
+ {
+ var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
+ {
+ barcode = item.CurrentBarcode,
+ supplyCode = item.SupplyCode,
+ batchNo = item.BatchNo,
+ unit = item.BarcodeUnit,
+ qty = item.PickedQty
+ };
+ // 鍗曚綅涓嶄竴鑷存椂杞崲
+ if (item.BarcodeUnit != item.Unit)
+ {
+ var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit);
+ barModel.unit = convertResult.Unit;
+ barModel.qty = convertResult.Quantity;
+ }
+ detailModel.qty += barModel.qty;
+ detailModel.currentDeliveryQty += barModel.qty;
+ detailModel.barcodes.Add(barModel);
+ }
feedmodel.details.Add(detailModel);
}
var result = await _invokeMESService.FeedbackOutbound(feedmodel);
@@ -812,60 +1167,7 @@
}
- /// <summary>
- /// 鍒犻櫎搴撳瓨鏁颁负0鐨勫簱瀛樻槑缁嗚褰�
- /// </summary>
- private async Task DeleteZeroQuantityStockDetails(int stockId)
- {
- try
- {
- // 鍒犻櫎搴撳瓨鏁伴噺涓�0鐨勮褰�
- var deleteCount = await _stockService.StockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
- .Where(x => x.StockId == stockId &&
- x.StockQuantity == 0 &&
- (x.Status == StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt() || x.Status ==
- StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt())) // 鍙垹闄ゅ凡瀹屾垚鐘舵�佺殑闆跺簱瀛�
- .ExecuteCommandAsync();
-
- if (deleteCount > 0)
- {
- _logger.LogInformation($"鍒犻櫎{deleteCount}鏉￠浂搴撳瓨鏄庣粏璁板綍 - StockId: {stockId}");
- }
- }
- catch (Exception ex)
- {
- _logger.LogWarning($"鍒犻櫎闆跺簱瀛樿褰曞け璐� - StockId: {stockId}, Error: {ex.Message}");
- // 娉ㄦ剰锛氬垹闄ゅけ璐ヤ笉搴旇褰卞搷涓绘祦绋嬶紝璁板綍鏃ュ織鍚庣户缁�
- }
- }
- /// <summary>
- /// 澶勭悊鍥炲簱鐩稿叧鐨勬墍鏈夊簱瀛樻槑缁嗙姸鎬佸彉鏇�
- /// </summary>
- private async Task ProcessStockDetailsForReturn(Dt_Task returnTask, int stockId)
- {
- // 鑾峰彇璇ユ墭鐩樹笅鎵�鏈夐渶瑕佸洖搴撶殑搴撳瓨鏄庣粏
- var stockDetails = await _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .Where(x => x.StockId == stockId &&
- x.StockQuantity > 0 &&
- (x.Status == StockStatusEmun.鍑哄簱閿佸畾.ObjToInt() || x.Status ==
- StockStatusEmun.鍏ュ簱纭.ObjToInt())) // 鍖呮嫭鍑哄簱閿佸畾鍜屽叆搴撶‘璁ょ殑
- .ToListAsync();
-
- foreach (var detail in stockDetails)
- {
-
- detail.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
- detail.OutboundQuantity = 0; // 娓呯┖鍑哄簱鏁伴噺
-
- _logger.LogInformation($"鏇存柊搴撳瓨鏄庣粏鐘舵�� - 鏉＄爜: {detail.Barcode}, 鏁伴噺: {detail.StockQuantity}");
- }
-
- if (stockDetails.Any())
- {
- await _stockService.StockInfoDetailService.Db.Updateable(stockDetails).ExecuteCommandAsync();
- _logger.LogInformation($"鍏辨洿鏂皗stockDetails.Count}涓簱瀛樻槑缁嗙姸鎬佷负鍏ュ簱瀹屾垚");
- }
- }
+
public async Task<WebResponseContent> OutEmptyTaskCompleted(Dt_Task task)
{
WebResponseContent content = new WebResponseContent();
--
Gitblit v1.9.3