From c4e1a656954799267cbd61d3de3a040e8dc8e46a Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 11 十一月 2025 08:48:42 +0800
Subject: [PATCH] 提交出库
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 207 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 204 insertions(+), 3 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 358c522..027ba4e 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"
@@ -20,6 +20,7 @@
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Org.BouncyCastle.Asn1.Ocsp;
+using Org.BouncyCastle.Asn1.Pkcs;
using SqlSugar;
using System.Reflection;
using System.Reflection.Emit;
@@ -37,6 +38,7 @@
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicService;
using WIDESEA_IInboundService;
@@ -58,10 +60,16 @@
private readonly ILocationInfoService _locationInfoService;
private readonly IInboundOrderService _inboundOrderService;
private readonly IInboundOrderDetailService _inboundOrderDetailService;
+
+ private readonly IOutboundOrderService _outboundOrderService;
+ private readonly IOutboundOrderDetailService _outboundOrderDetailService;
+ private readonly IOutStockLockInfoService _outStockLockInfoService;
private readonly ILocationStatusChangeRecordService _locationStatusChangeRecordService;
private readonly IESSApiService _eSSApiService;
private readonly IStockService _stockService;
private readonly IRecordService _recordService;
+
+ private readonly IInvokeMESService _invokeMESService;
public IRepository<Dt_Task> Repository => BaseDal;
private Dictionary<string, SqlSugar.OrderByType> _taskOrderBy = new()
@@ -81,7 +89,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) : 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) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -94,6 +102,10 @@
_stockService = stockService;
_recordService = recordService;
_inboundOrderDetailService = inboundOrderDetailService;
+ _outboundOrderService = outboundOrderService;
+ _outboundOrderDetailService = outboundOrderDetailService;
+ _invokeMESService = invokeMESService;
+ _outStockLockInfoService = outStockLockInfoService;
}
/// <summary>
@@ -145,7 +157,7 @@
decimal beforeQuantity = 0;
//鏌ュ簱瀛�
- Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).First();
+ Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(x => x.Details).Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).First();
if (stockInfo == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑缁勭洏淇℃伅");
@@ -227,7 +239,51 @@
_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, WIDESEA_Common.StockEnum.StockChangeType.MaterielGroup);
+ try
+ {
+ foreach (var inboundOrder in inboundOrders)
+ {
+ if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ {
+ var feedmodel = new FeedbackInboundRequestModel
+ {
+ reqCode = Guid.NewGuid().ToString(),
+ reqTime = DateTime.Now.ToString(),
+ business_type = inboundOrder.BusinessType,
+ factoryArea = inboundOrder.FactoryArea,
+ operationType = 1,
+ orderNo = inboundOrder.UpperOrderNo,
+ status = inboundOrder.OrderStatus,
+ details = new List<FeedbackInboundDetailsModel>()
+ };
+
+ var groupedData = inboundOrder.Details.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.lineNo, item.BarcodeUnit, item.WarehouseCode})
+ .Select(group => new FeedbackInboundDetailsModel
+ {
+ materialCode = group.Key.MaterielCode,
+ supplyCode = group.Key.SupplyCode,
+ batchNo = group.Key.BatchNo,
+ lineNo = group.Key.lineNo,
+ // warehouseCode = group.Key.WarehouseCode=="0"?"1072": group.Key.WarehouseCode,
+ warehouseCode= "1072",
+ unit = group.Key.BarcodeUnit,
+ barcodes = group.Select(row => new FeedbackBarcodesModel
+ {
+ barcode = row.Barcode,
+ qty = row.BarcodeQty
+ }).ToList()
+ }).ToList();
+ feedmodel.details = groupedData;
+
+ _invokeMESService.FeedbackInbound(feedmodel);
+ }
+
+ }
+ }
+ catch (Exception ex) {
+ _logger.LogInformation("InboundTaskCompleted 鍥炲啓MES澶辫触: " + ex.Message);
+ }
return WebResponseContent.Instance.OK();
}
@@ -305,7 +361,7 @@
return content.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
}
- _stockRepository.Db.Deleteable(stockInfo);
+ // _stockRepository.Db.Deleteable(stockInfo);
int beforeStatus = locationInfo.LocationStatus;
@@ -329,5 +385,150 @@
}
}
+
+
+
+ /// <summary>
+ /// 鍥炲簱瀹屾垚鍥炶皟 - AGV灏嗘墭鐩樻斁鍥炶揣浣嶅悗璋冪敤
+ /// </summary>
+ public async Task<WebResponseContent> BackToStockComplete(Dt_Task task)
+ {
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+
+ // 鑾峰彇鐩稿叧鐨勫嚭搴撻攣瀹氫俊鎭�
+ var lockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(x => x.TaskNum == task.TaskNum &&
+ x.Status == (int)OutLockStockStatusEnum.鍥炲簱涓�)
+ .ToListAsync();
+
+ if (!lockInfos.Any())
+ return WebResponseContent.Instance.Error("鏈壘鍒板洖搴撲腑鐨勯攣瀹氫俊鎭�");
+
+ // 鎭㈠搴撳瓨鍑哄簱鏁伴噺锛堝洖搴撶殑閮ㄥ垎锛�
+ await RestoreStockOutboundQuantity(lockInfos);
+
+ // 鏇存柊鍑哄簱鍗曟槑缁嗙殑閿佸畾鏁伴噺
+ var orderDetailGroups = lockInfos.GroupBy(x => x.OrderDetailId);
+
+ foreach (var group in orderDetailGroups)
+ {
+ var orderDetailId = group.Key;
+ var totalUnpicked = group.Sum(x => x.AssignQuantity - x.PickedQty);
+
+ if (totalUnpicked > 0)
+ {
+ var orderDetail = await _outboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .Where(x => x.Id == orderDetailId)
+ .FirstAsync();
+ orderDetail.LockQuantity -= totalUnpicked;
+
+ // 鎭㈠鐘舵��
+ if (orderDetail.LockQuantity <= 0 && orderDetail.OverOutQuantity <= 0)
+ {
+ orderDetail.OrderDetailStatus = (int)OrderDetailStatusEnum.New;
+ }
+ else if (orderDetail.OverOutQuantity > 0)
+ {
+ orderDetail.OrderDetailStatus = (int)OrderDetailStatusEnum.AssignOverPartial;
+ }
+
+ await _outboundOrderService.Db.Updateable(orderDetail).ExecuteCommandAsync();
+ }
+ }
+
+ // 鏇存柊閿佸畾淇℃伅鐘舵�佷负宸插洖搴�
+ foreach (var lockInfo in lockInfos)
+ {
+ lockInfo.Status = (int)OutLockStockStatusEnum.宸插洖搴�;
+ }
+ await _outStockLockInfoService.Db.Updateable(lockInfos).ExecuteCommandAsync();
+
+ // 6. 鏇存柊搴撳瓨鐘舵��
+ var stockIds = lockInfos.Select(x => x.StockId).Distinct().ToList();
+ var stocks = await _stockService.StockInfoService.Db.Queryable<Dt_StockInfo>()
+ .Where(x => stockIds.Contains(x.Id))
+ .ToListAsync();
+
+ foreach (var stock in stocks)
+ {
+ stock.StockStatus = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+ stock.LocationCode = task.TargetAddress; // 鏇存柊璐т綅
+ }
+ await _stockService.StockInfoService.Db.Updateable(stocks).ExecuteCommandAsync();
+
+ // 7. 鏇存柊璐т綅鐘舵��
+ var location = await _locationInfoService.Db.Queryable<Dt_LocationInfo>()
+ .Where(x => x.LocationCode == task.TargetAddress)
+ .FirstAsync();
+ if (location != null)
+ {
+ location.LocationStatus = (int)LocationStatusEnum.InStock;
+ await _locationInfoService.Db.Updateable(location).ExecuteCommandAsync();
+ }
+
+ // 鏇存柊浠诲姟鐘舵�佷负宸插畬鎴�
+ task.TaskStatus = (int)TaskStatusEnum.Finish;
+
+ await Db.Updateable(task).ExecuteCommandAsync();
+
+ _unitOfWorkManage.CommitTran();
+
+ return WebResponseContent.Instance.OK("鍥炲簱瀹屾垚", new
+ {
+ TaskNum = task.TaskNum,
+ PalletCode = task.PalletCode,
+ RestoredQuantity = lockInfos.Sum(x => x.AssignQuantity - x.PickedQty)
+ });
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error($"鍥炲簱瀹屾垚澶勭悊澶辫触: {ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 鎭㈠搴撳瓨鍑哄簱鏁伴噺锛堝洖搴撶殑閮ㄥ垎锛�
+ /// </summary>
+ private async Task RestoreStockOutboundQuantity(List<Dt_OutStockLockInfo> lockInfos)
+ {
+ // 鎸夊簱瀛業D鍜岀墿鏂欏垎缁�
+ var stockGroups = lockInfos.GroupBy(x => new { x.StockId, x.MaterielCode });
+
+ foreach (var group in stockGroups)
+ {
+ var stockId = group.Key.StockId;
+ var materielCode = group.Key.MaterielCode;
+ var totalUnpicked = group.Sum(x => x.AssignQuantity - x.PickedQty);
+
+ if (totalUnpicked <= 0) continue;
+
+ // 鑾峰彇璇ョ墿鏂欏湪搴撳瓨涓殑鎵�鏈夋潯鐮�
+ var stockDetails = await _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockId && x.MaterielCode == materielCode)
+ .ToListAsync();
+
+ if (!stockDetails.Any()) continue;
+
+ // 鎸夊嚭搴撴暟閲忕殑姣斾緥鍒嗛厤鎭㈠鏁伴噺
+ var totalOutbound = stockDetails.Sum(x => x.OutboundQuantity);
+
+ if (totalOutbound <= 0) continue;
+
+ foreach (var detail in stockDetails)
+ {
+ if (detail.OutboundQuantity <= 0) continue;
+
+ decimal ratio = detail.OutboundQuantity / totalOutbound;
+ decimal restoreAmount = Math.Min(detail.OutboundQuantity, totalUnpicked * ratio);
+
+ detail.OutboundQuantity -= restoreAmount;
+ await _stockService.StockInfoDetailService.Db.Updateable(detail).ExecuteCommandAsync();
+ }
+ }
+ }
+
}
}
--
Gitblit v1.9.3