From 475fc7c0176aafe0e0833ba4dd5cab9fd5c18160 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期三, 03 十二月 2025 15:26:37 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 535 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 284 insertions(+), 251 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 b00aac2..956fcca 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"
@@ -18,6 +18,7 @@
using AutoMapper;
using Dm.filter;
using MailKit.Search;
+using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Org.BouncyCastle.Asn1.Ocsp;
@@ -67,10 +68,10 @@
private readonly IRepository<Dt_StockInfo> _stockRepository;
private readonly ILocationInfoService _locationInfoService;
private readonly IInboundOrderService _inboundOrderService;
- private readonly IInboundOrderDetailService _inboundOrderDetailService;
+ private readonly IInboundOrderDetailService _inboundOrderDetailService;
private readonly IRepository<Dt_AllocateOrderDetail> _allocateOrderDetailRepository;
- private readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
+ private readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
private readonly IRepository<Dt_ReCheckOrder> _reCheckOrderRepository;
private readonly IRepository<Dt_OutboundBatch> _OutboundBatchRepository;
private readonly IOutboundOrderService _outboundOrderService;
@@ -340,7 +341,7 @@
}
else if (inboundOrder.OrderType == InOrderTypeEnum.InternalAllocat.ObjToInt()) //鏅轰粨璋冩櫤浠�
{
- _logger.LogInformation($"InboundTaskCompleted 鍥炲啓MES : {inboundOrder.InboundOrderNo } ,ordertype: {InOrderTypeEnum.InternalAllocat.ObjToInt()} " );
+ _logger.LogInformation($"InboundTaskCompleted 鍥炲啓MES : {inboundOrder.InboundOrderNo} ,ordertype: {InOrderTypeEnum.InternalAllocat.ObjToInt()} ");
// BusinessTypeEnum.鏅轰粨璋冩櫤浠�
if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
{
@@ -454,7 +455,7 @@
{
_logger.LogInformation($"TaskService OutAllocateTaskCompleted: {task.TaskNum}");
- return await OutboundTaskCompleted(task);
+ return await OutboundTaskCompleted(task);
}
public async Task<WebResponseContent> OutboundTaskCompleted(Dt_Task task)
{
@@ -557,7 +558,7 @@
}
}
-
+
public async Task<WebResponseContent> InPickTaskCompleted(Dt_Task task)
{
_logger.LogInformation($"TaskService InPickTaskCompleted: {task.TaskNum}");
@@ -616,32 +617,24 @@
// 鏇存柊搴撳瓨淇℃伅
stockInfo.LocationCode = task.TargetAddress;
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
// 鏇存柊搴撳瓨鏄庣粏鐘舵��
if (stockInfo.Details != null && stockInfo.Details.Any())
{
foreach (var detail in stockInfo.Details)
{
- detail.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
-
- // 纭繚搴撳瓨鏁伴噺涓庡嚭搴撴暟閲忎竴鑷�
- if (detail.Status == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt())
- {
- detail.OutboundQuantity = 0; // 鍏ュ簱瀹屾垚鏃跺嚭搴撴暟閲忔竻闆�
- }
+ detail.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ detail.OutboundQuantity = 0; // 鍏ュ簱瀹屾垚鏃跺嚭搴撴暟閲忔竻闆�
}
- _stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);
}
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
-
- // 澶勭悊鍥炲簱鐩稿叧鐨勫簱瀛樻槑缁�
- await ProcessStockDetailsForReturn(task, stockInfo.Id);
-
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
// 鍒犻櫎闆跺簱瀛樻暟鎹�
await DeleteZeroQuantityStockDetails(stockInfo.Id);
+ await UpdateAffectedOrderDetails(task.OrderNo, returnLocks);
// 鏇存柊璐т綅鐘舵��
if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
{
@@ -651,17 +644,10 @@
{
locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
}
-
- _locationInfoService.Repository.UpdateData(locationInfo);
- // 鏇存柊璁㈠崟鐩稿叧鏁版嵁
- await UpdateOrderDataAfterReturn(task.OrderNo, returnLocks);
+ _locationInfoService.Repository.UpdateData(locationInfo);
- // 鑾峰彇骞舵洿鏂板嚭搴撹鍗�
- var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
- .FirstAsync(x => x.OrderNo == task.OrderNo);
-
- task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
+ task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
// 鍒犻櫎浠诲姟璁板綍
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
@@ -675,23 +661,35 @@
"",
task.TaskNum
);
-
- if (outboundOrder != null)
- {
- // 妫�鏌ヨ鍗曠姸鎬佹槸鍚﹂渶瑕佹洿鏂�
- await CheckAndUpdateOrderStatusAfterReturn(task.OrderNo);
-
- // 澶勭悊MES鍙嶉
- await HandleOutboundOrderToMESCompletion(outboundOrder, outboundOrder.OrderNo);
- }
- else
- {
- _logger.LogInformation($"TaskService InPickTaskCompleted: {task.TaskNum} ,鏈壘鍒板嚭搴撳崟銆�");
- }
+ await RecalculateOrderStatus(task.OrderNo);
_unitOfWorkManage.CommitTran(); // 鎻愪氦浜嬪姟
+ _logger.LogInformation($"鎵樼洏鍥炲簱瀹屾垚澶勭悊鎴愬姛 - 浠诲姟鍙�: {task.TaskNum}, 鎵樼洏: {task.PalletCode}, 璁㈠崟: {task.OrderNo}");
+ _ = Task.Run(async () =>
+ {
+ try
+ {
+ var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
+ .FirstAsync(x => x.OrderNo == task.OrderNo);
- _logger.LogInformation($"鍥炲簱浠诲姟瀹屾垚澶勭悊鎴愬姛 - 浠诲姟鍙�: {task.TaskNum}, 鎵樼洏: {task.PalletCode}");
+ if (outboundOrder != null)
+ {
+ // 妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚锛屽彧鏈夊畬鎴愭椂鎵嶅悜MES鍙嶉
+ if (outboundOrder.OrderStatus == (int)OutOrderStatusEnum.鍑哄簱瀹屾垚)
+ {
+ await HandleOutboundOrderToMESCompletion(outboundOrder, outboundOrder.OrderNo);
+ }
+ else
+ {
+ _logger.LogInformation($"璁㈠崟{task.OrderNo}鐘舵�佷负{outboundOrder.OrderStatus}锛屾殏涓嶅悜MES鍙嶉");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"寮傛MES鍙嶉澶勭悊澶辫触 - OrderNo: {task.OrderNo}, Error: {ex.Message}");
+ }
+ });
}
catch (Exception ex)
{
@@ -702,107 +700,151 @@
return WebResponseContent.Instance.OK();
}
-
- /// <summary>
- /// 鍥炲簱鍚庢洿鏂拌鍗曟暟鎹�
+ // <summary>
+ /// 鏇存柊鍙楀奖鍝嶇殑璁㈠崟鏄庣粏閿佸畾鏁伴噺
/// </summary>
- private async Task UpdateOrderDataAfterReturn(string orderNo, List<Dt_OutStockLockInfo> returnLocks)
+ private async Task UpdateAffectedOrderDetails(string orderNo, List<Dt_OutStockLockInfo> returnLocks)
{
try
{
- // 鑾峰彇鎵�鏈夊彈褰卞搷鐨勮鍗曟槑缁咺D
+ // 鑾峰彇鍙楀奖鍝嶇殑璁㈠崟鏄庣粏ID锛堝幓閲嶏級
var affectedDetailIds = returnLocks
.Select(x => x.OrderDetailId)
.Distinct()
.ToList();
+ if (!affectedDetailIds.Any())
+ {
+ _logger.LogInformation($"娌℃湁鍙楀奖鍝嶇殑璁㈠崟鏄庣粏 - OrderNo: {orderNo}");
+ return;
+ }
+
+ _logger.LogInformation($"鏇存柊{affectedDetailIds.Count}涓彈褰卞搷鐨勮鍗曟槑缁� - OrderNo: {orderNo}");
+
foreach (var detailId in affectedDetailIds)
{
- // 璁＄畻璇ヨ鍗曟槑缁嗙殑鍥炲簱鎬绘暟閲�
- var detailReturnLocks = returnLocks
- .Where(x => x.OrderDetailId == detailId)
- .ToList();
+ // 閲嶆柊璁＄畻璇ヨ鍗曟槑缁嗙殑閿佸畾鏁伴噺
+ decimal currentLockQty = await CalculateOrderDetailLockQuantity(detailId);
- decimal totalReturnQty = detailReturnLocks.Sum(x => x.AssignQuantity - x.PickedQty);
-
- if (totalReturnQty > 0)
+ // 妫�鏌ユ暟鎹竴鑷存��
+ if (currentLockQty < 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}");
- }
+ _logger.LogWarning($"閿佸畾鏁伴噺璁＄畻涓鸿礋鍊� - OrderDetailId: {detailId}, 褰撳墠鍊�: {currentLockQty}锛岄噸缃负0");
+ currentLockQty = 0;
}
+
+ // 鑾峰彇璁㈠崟鏄庣粏
+ var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .FirstAsync(x => x.Id == detailId);
+
+ if (orderDetail == null)
+ {
+ _logger.LogWarning($"鏈壘鍒拌鍗曟槑缁� - OrderDetailId: {detailId}");
+ continue;
+ }
+
+ // 鏇存柊閿佸畾鏁伴噺
+ if (orderDetail.LockQuantity != currentLockQty)
+ {
+ await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
+ .SetColumns(it => new Dt_OutboundOrderDetail
+ {
+ LockQuantity = currentLockQty,
+ })
+ .Where(it => it.Id == detailId)
+ .ExecuteCommandAsync();
+
+ _logger.LogInformation($"鏇存柊璁㈠崟鏄庣粏閿佸畾鏁伴噺 - OrderDetailId: {detailId}, " +
+ $"鏃у��: {orderDetail.LockQuantity}, 鏂板��: {currentLockQty}");
+ }
+
+ // 鏇存柊璁㈠崟鏄庣粏鐘舵��
+ await UpdateOrderDetailStatus(orderDetail);
}
}
catch (Exception ex)
{
- _logger.LogError($"UpdateOrderDataAfterReturn澶辫触 - OrderNo: {orderNo}, Error: {ex.Message}");
+ _logger.LogError($"UpdateAffectedOrderDetails澶辫触 - OrderNo: {orderNo}, Error: {ex.Message}");
throw;
}
}
+
/// <summary>
- /// 鏇存柊璁㈠崟鏄庣粏鐘舵��
+ /// 閲嶆柊璁＄畻璁㈠崟鏄庣粏閿佸畾鏁伴噺
/// </summary>
- private async Task UpdateOrderDetailStatus(int orderDetailId)
+ private async Task<decimal> CalculateOrderDetailLockQuantity(int orderDetailId)
{
try
{
- var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
- .FirstAsync(x => x.Id == orderDetailId);
+ // 鏌ユ壘璇ヨ鍗曟槑缁嗕笅鎵�鏈夌姸鎬佷负"鍑哄簱涓�"鐨勯攣瀹氳褰�
+ var activeLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.OrderDetailId == orderDetailId &&
+ x.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
+ .ToListAsync();
- if (orderDetail == null)
+ // 杩囨护鎷嗗寘璁板綍
+ var filteredLocks = new List<Dt_OutStockLockInfo>();
+
+ foreach (var lockInfo in activeLocks)
{
- _logger.LogWarning($"UpdateOrderDetailStatus澶辫触锛氭湭鎵惧埌璁㈠崟鏄庣粏锛孖D: {orderDetailId}");
- return;
+ // 濡傛灉鏄媶鍖呰褰曪紝闇�瑕佺壒娈婂鐞�
+ if (lockInfo.IsSplitted == 1 && lockInfo.ParentLockId.HasValue)
+ {
+ // 鏌ユ壘鐖堕攣瀹氳褰�
+ var parentLock = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.Id == lockInfo.ParentLockId.Value)
+ .FirstAsync();
+
+ // 濡傛灉鐖惰褰曞瓨鍦ㄤ笖鐘舵�佷篃鏄嚭搴撲腑锛屽垯鍙绠楃埗璁板綍
+ if (parentLock != null && parentLock.Status == (int)OutLockStockStatusEnum.鍑哄簱涓�)
+ {
+ // 鐖惰褰曞凡缁忓湪鍒楄〃涓紝璺宠繃褰撳墠鎷嗗寘璁板綍
+ continue;
+ }
+ }
+
+ filteredLocks.Add(lockInfo);
}
+ decimal totalLockQty = filteredLocks.Sum(x => x.AssignQuantity - x.PickedQty);
+
+ _logger.LogDebug($"璁＄畻閿佸畾鏁伴噺 - OrderDetailId: {orderDetailId}, " +
+ $"鎵惧埌{filteredLocks.Count}涓湁鏁堥攣瀹氳褰�, " +
+ $"鎬婚攣瀹氭暟閲�: {totalLockQty}");
+
+ return totalLockQty;
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError($"CalculateOrderDetailLockQuantity澶辫触 - OrderDetailId: {orderDetailId}, Error: {ex.Message}");
+ return 0;
+ }
+ }
+
+ /// <summary>
+ /// 鏇存柊璁㈠崟鏄庣粏鐘舵��
+ /// </summary>
+ private async Task UpdateOrderDetailStatus(Dt_OutboundOrderDetail orderDetail)
+ {
+ try
+ {
int newStatus = orderDetail.OrderDetailStatus;
- // 1. 妫�鏌ユ槸鍚﹀凡瀹屾垚
+ // 鏍规嵁瀹為檯鏋氫妇鍊艰皟鏁�
+ // 妫�鏌ユ槸鍚﹀凡瀹屾垚锛堝凡鍑哄簱鏁伴噺 >= 闇�姹傛暟閲忥級
if (orderDetail.OverOutQuantity >= orderDetail.NeedOutQuantity)
{
- newStatus = (int)OrderDetailStatusEnum.Over;
+ newStatus = (int)OrderDetailStatusEnum.Over; // 宸插畬鎴�
}
- // 2. 妫�鏌ユ槸鍚︽鍦ㄨ繘琛屼腑锛堟湁閿佸畾鏁伴噺鎴栭儴鍒嗘嫞閫夛級
- else if (orderDetail.LockQuantity > 0 ||
- (orderDetail.OverOutQuantity > 0 && orderDetail.OverOutQuantity < orderDetail.NeedOutQuantity))
+ // 妫�鏌ユ槸鍚︽湁閮ㄥ垎鍑哄簱鎴栨湁閿佸畾鏁伴噺
+ else if (orderDetail.OverOutQuantity > 0 || orderDetail.LockQuantity > 0)
{
- newStatus = (int)OrderDetailStatusEnum.Outbound;
+ newStatus = (int)OrderDetailStatusEnum.Outbound; // 閮ㄥ垎瀹屾垚/杩涜涓�
}
- // 3. 妫�鏌ユ槸鍚︽湁閿佸畾浣嗘湭鎷ｉ��
- else if (orderDetail.LockQuantity > 0 && orderDetail.OverOutQuantity == 0)
- {
- newStatus = (int)OrderDetailStatusEnum.AssignOverPartial;
- }
- // 4. 鍚﹀垯涓烘柊璁㈠崟
+ // 鍚﹀垯涓烘柊璁㈠崟
else
{
- newStatus = (int)OrderDetailStatusEnum.New;
+ newStatus = (int)OrderDetailStatusEnum.New; // 鏂板缓
}
// 鍙湁鐘舵�佸彉鍖栨椂鎵嶆洿鏂�
@@ -811,12 +853,12 @@
await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
.SetColumns(it => new Dt_OutboundOrderDetail
{
- OrderDetailStatus = newStatus,
+ OrderDetailStatus = newStatus,
})
- .Where(it => it.Id == orderDetailId)
+ .Where(it => it.Id == orderDetail.Id)
.ExecuteCommandAsync();
- _logger.LogInformation($"鏇存柊璁㈠崟鏄庣粏鐘舵�� - OrderDetailId: {orderDetailId}, " +
+ _logger.LogInformation($"鏇存柊璁㈠崟鏄庣粏鐘舵�� - OrderDetailId: {orderDetail.Id}, " +
$"鏃х姸鎬�: {orderDetail.OrderDetailStatus}, 鏂扮姸鎬�: {newStatus}, " +
$"宸插嚭搴�: {orderDetail.OverOutQuantity}/{orderDetail.NeedOutQuantity}, " +
$"閿佸畾鏁伴噺: {orderDetail.LockQuantity}");
@@ -824,23 +866,32 @@
}
catch (Exception ex)
{
- _logger.LogError($"UpdateOrderDetailStatus澶辫触 - OrderDetailId: {orderDetailId}, Error: {ex.Message}");
+ _logger.LogError($"UpdateOrderDetailStatus澶辫触 - OrderDetailId: {orderDetail.Id}, Error: {ex.Message}");
throw;
}
}
+
/// <summary>
- /// 鍥炲簱鍚庢鏌ュ苟鏇存柊璁㈠崟鐘舵��
+ /// 閲嶆柊璁＄畻骞舵洿鏂拌鍗曠姸鎬�
/// </summary>
- private async Task CheckAndUpdateOrderStatusAfterReturn(string orderNo)
+ private async Task RecalculateOrderStatus(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();
+ if (!orderDetails.Any())
+ {
+ _logger.LogWarning($"鏈壘鍒拌鍗曟槑缁� - OrderNo: {orderNo}");
+ return;
+ }
+
+ // 妫�鏌ョ姸鎬�
bool allCompleted = true;
bool hasInProgress = false;
@@ -854,7 +905,7 @@
// 妫�鏌ユ槸鍚︽湁杩涜涓殑浠诲姟锛堥攣瀹氭垨閮ㄥ垎鎷ｉ�夛級
if (detail.LockQuantity > 0 ||
- detail.OrderDetailStatus == OrderDetailStatusEnum.Outbound.ObjToInt())
+ detail.OrderDetailStatus == (int)OrderDetailStatusEnum.Outbound)
{
hasInProgress = true;
}
@@ -863,7 +914,11 @@
var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
.FirstAsync(x => x.OrderNo == orderNo);
- if (outboundOrder == null) return;
+ if (outboundOrder == null)
+ {
+ _logger.LogWarning($"鏈壘鍒板嚭搴撹鍗� - OrderNo: {orderNo}");
+ return;
+ }
int newStatus;
if (allCompleted)
@@ -890,57 +945,16 @@
.Where(x => x.OrderNo == orderNo)
.ExecuteCommandAsync();
- _logger.LogInformation($"鍥炲簱鍚庢洿鏂拌鍗曠姸鎬� - OrderNo: {orderNo}, 鏂扮姸鎬�: {newStatus}");
+ _logger.LogInformation($"鏇存柊璁㈠崟鐘舵�� - OrderNo: {orderNo}, 鏃х姸鎬�: {outboundOrder.OrderStatus}, 鏂扮姸鎬�: {newStatus}");
}
}
catch (Exception ex)
{
- _logger.LogError($"CheckAndUpdateOrderStatusAfterReturn澶辫触 - OrderNo: {orderNo}, Error: {ex.Message}");
+ _logger.LogError($"RecalculateOrderStatus澶辫触 - 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>
/// 鍒犻櫎闆跺簱瀛樻暟鎹紙澧炲己鐗堬級
@@ -1033,51 +1047,57 @@
var detailModel = new AllocateDtoDetail
{
MaterialCode = detail.MaterielCode,
- LineNo = detail.lineNo,
+ LineNo = detail.lineNo,
WarehouseCode = detail.WarehouseCode,
- Qty = detailLocks.Sum(x=>x.PickedQty),
+ Qty = 0,
Unit = detail.BarcodeUnit,
- Barcodes = new List<BarcodeInfo> ()
+ Barcodes = new List<BarcodeInfo>()
};
foreach (var item in detailLocks)
{
- var barModel = new BarcodeInfo
+ if (item.PickedQty > 0)
{
- 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;
+ var barModel = new BarcodeInfo
+ {
+ Barcode = item.CurrentBarcode,
+ SupplyCode = item.SupplyCode,
+ BatchNo = item.BatchNo,
+ Unit = detail.BarcodeUnit,
+ Qty = 0
+ };
+ // 鍗曚綅涓嶄竴鑷存椂杞崲
+ if (detail.BarcodeUnit != detail.Unit)
+ {
+ var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
+ barModel.Unit = convertResult.Unit;
+ barModel.Qty = convertResult.Quantity;
+ }
+ else
+ {
+ barModel.Qty = item.PickedQty;
+ }
+ detailModel.Qty += barModel.Qty;
+ detailModel.Barcodes.Add(barModel);
}
- detailModel.Qty += barModel.Qty;
- detailModel.Barcodes.Add(barModel);
+
+ allocatefeedmodel.Details.Add(detailModel);
}
+ var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
+ if (result != null && result.code == 200)
+ {
+ await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
+ .SetColumns(x => x.ReturnToMESStatus == 1)
+ .Where(x => x.OrderId == outboundOrder.Id).ExecuteCommandAsync();
- allocatefeedmodel.Details.Add(detailModel);
- }
-
- var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
- if (result != null && result.code == 200)
- {
- await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
- .SetColumns(x => x.ReturnToMESStatus == 1)
- .Where(x => x.OrderId == outboundOrder.Id).ExecuteCommandAsync();
-
- await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
- .SetColumns(x => new Dt_OutboundOrder
- {
- ReturnToMESStatus = 1,
- Operator = App.User.UserName,
- }).Where(x => x.OrderNo == orderNo).ExecuteCommandAsync();
+ await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
+ .SetColumns(x => new Dt_OutboundOrder
+ {
+ ReturnToMESStatus = 1,
+ Operator = App.User.UserName,
+ }).Where(x => x.OrderNo == orderNo).ExecuteCommandAsync();
+ }
}
}
else if (outboundOrder.OrderType == OutOrderTypeEnum.ReCheck.ObjToInt())
@@ -1085,78 +1105,91 @@
//涓嶇敤鍥炰紶
}
else
- {
- var feedmodel = new FeedbackOutboundRequestModel
+ {
+ if (outboundOrder != null && outboundOrder.IsBatch == 0)
{
- reqCode = Guid.NewGuid().ToString(),
- reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- business_type = outboundOrder.BusinessType,
- factoryArea = outboundOrder.FactoryArea,
- operationType = 1,
- Operator = outboundOrder.Operator,
- orderNo = outboundOrder.UpperOrderNo,
- documentsNO = outboundOrder.OrderNo,
- status = outboundOrder.OrderStatus,
- details = new List<FeedbackOutboundDetailsModel>()
- };
-
-
- foreach (var detail in orderDetails)
- {
- // 鑾峰彇璇ユ槑缁嗗搴旂殑鏉＄爜淇℃伅锛堜粠閿佸畾璁板綍锛�
- 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.宸插洖搴�))
- .ToListAsync();
-
- var detailModel = new FeedbackOutboundDetailsModel
+ var feedmodel = new FeedbackOutboundRequestModel
{
- materialCode = detail.MaterielCode,
- lineNo = detail.lineNo, // 娉ㄦ剰锛氳繖閲屽彲鑳介渶瑕佽皟鏁村瓧娈靛悕
- warehouseCode = detail.WarehouseCode,
- qty = detail.PickedQty,
- currentDeliveryQty = detail.PickedQty,
- unit = detail.Unit,
- barcodes = new List<WIDESEA_DTO.Outbound.BarcodesModel>()
+ reqCode = Guid.NewGuid().ToString(),
+ reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ business_type = outboundOrder.BusinessType,
+ factoryArea = outboundOrder.FactoryArea,
+ operationType = 1,
+ Operator = outboundOrder.Operator,
+ orderNo = outboundOrder.UpperOrderNo,
+ documentsNO = outboundOrder.OrderNo,
+ status = outboundOrder.OrderStatus,
+ details = new List<FeedbackOutboundDetailsModel>()
};
- foreach (var item in detailLocks)
+ foreach (var detail in orderDetails)
{
- var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
+ // 鑾峰彇璇ユ槑缁嗗搴旂殑鏉＄爜淇℃伅锛堜粠閿佸畾璁板綍锛�
+ 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.宸插洖搴�))
+ .ToListAsync();
+
+ var detailModel = new FeedbackOutboundDetailsModel
{
- barcode = item.CurrentBarcode,
- supplyCode = item.SupplyCode,
- batchNo = item.BatchNo,
- unit = item.BarcodeUnit,
- qty = item.PickedQty
+ materialCode = detail.MaterielCode,
+ lineNo = detail.lineNo, // 娉ㄦ剰锛氳繖閲屽彲鑳介渶瑕佽皟鏁村瓧娈靛悕
+ warehouseCode = detail.WarehouseCode,
+ qty = 0,
+ currentDeliveryQty = 0,
+ unit = detail.Unit,
+ barcodes = new List<WIDESEA_DTO.Outbound.BarcodesModel>()
};
- // 鍗曚綅涓嶄竴鑷存椂杞崲
- if (item.BarcodeUnit != item.Unit)
+ foreach (var item in detailLocks)
{
- var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, item.Unit, item.BarcodeUnit);
- barModel.unit = convertResult.Unit;
- barModel.qty = convertResult.Quantity;
+ if (item.PickedQty > 0)
+ {
+ var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
+ {
+ barcode = item.CurrentBarcode,
+ supplyCode = item.SupplyCode,
+ batchNo = item.BatchNo,
+ unit = item.BarcodeUnit,
+ qty = item.PickedQty
+ };
+ // 鍗曚綅涓嶄竴鑷存椂杞崲
+ if (detail.BarcodeUnit != detail.Unit)
+ {
+ var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
+ barModel.unit = convertResult.Unit;
+ barModel.qty = convertResult.Quantity;
+ }
+ else
+ {
+ barModel.qty = item.PickedQty;
+ }
+ detailModel.qty += barModel.qty;
+ detailModel.currentDeliveryQty += barModel.qty;
+ detailModel.barcodes.Add(barModel);
+ }
}
-
- detailModel.qty += barModel.qty;
- detailModel.currentDeliveryQty += barModel.qty;
- detailModel.barcodes.Add(barModel);
+ feedmodel.details.Add(detailModel);
}
- feedmodel.details.Add(detailModel);
- }
- var result = await _invokeMESService.FeedbackOutbound(feedmodel);
- if (result != null && result.code == 200)
- {
- await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
- .SetColumns(x => x.ReturnToMESStatus == 1)
- .Where(x => x.OrderId == outboundOrder.Id)
- .ExecuteCommandAsync();
- await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
- .SetColumns(x => x.ReturnToMESStatus == 1)
- .Where(x => x.OrderNo == orderNo)
- .ExecuteCommandAsync();
+ var result = await _invokeMESService.FeedbackOutbound(feedmodel);
+ if (result != null && result.code == 200)
+ {
+ await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
+ .SetColumns(x => x.ReturnToMESStatus == 1)
+ .Where(x => x.OrderId == outboundOrder.Id)
+ .ExecuteCommandAsync();
+
+ await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
+ .SetColumns(x => x.ReturnToMESStatus == 1)
+ .Where(x => x.OrderNo == orderNo)
+ .ExecuteCommandAsync();
+ }
}
+ else if (outboundOrder != null && outboundOrder.IsBatch == 1)
+ {
+ await _invokeMESService.BatchOrderFeedbackToMes(new List<string>(){outboundOrder.OrderNo },2);
+ }
+
}
}
}
@@ -1167,7 +1200,7 @@
}
-
+
public async Task<WebResponseContent> OutEmptyTaskCompleted(Dt_Task task)
{
WebResponseContent content = new WebResponseContent();
--
Gitblit v1.9.3