From d292487812b280e7f484a5cdf6e8a994baa486fd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 03 十二月 2025 14:02:06 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs"
index 0b07035..d0471b1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs"
@@ -18,7 +18,9 @@
using WIDESEA_IStorageTaskRepository;
using WIDESEA_IStorageTaskServices;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.ERP;
using WIDESEA_Model.Models.Order;
+using WIDESEA_OrderRepository;
namespace WIDESEA_OrderServices
{
@@ -32,7 +34,8 @@
private readonly IDt_TaskService _taskService;
private readonly ILocationInfoRepository _locationRepository;
private readonly IDt_TaskRepository _taskRepository;
- private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
+ private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
+ private readonly IDt_OrderOutDetailsRepository _outDetailsRepository;
public Dt_ProductionOutboundOrderService(IDt_ProductionOutboundOrderRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -43,7 +46,8 @@
IDt_TaskService taskService,
ILocationInfoRepository locationRepository,
IDt_TaskRepository taskRepository,
- ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository) : base(BaseDal)
+ ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
+ IDt_OrderOutDetailsRepository outDetailsRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_productionoutboundOrderDetailRepository = productionoutboundOrderDetailRepository;
@@ -54,8 +58,8 @@
_locationRepository = locationRepository;
_taskRepository = taskRepository;
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
+ _outDetailsRepository = outDetailsRepository;
}
-
public WebResponseContent GetProductOutboundOrder(OutboundOrderGetDTO outboundOrderGetDTO)
{
WebResponseContent content = new WebResponseContent();
@@ -156,9 +160,9 @@
if (result.Item1.Count <= 0)
{
- return content.Error("鏈壘鍒板簱瀛樺垎閰嶏紝璇风‘璁ゆ槸鍚﹀瓨鍦ㄥ簱瀛樻垨鍗曟嵁鏁伴噺宸插嚭瀹�");
+ return content.Error($"璁㈠崟{outboundOrder.UpperOrderNo}鐗╂枡缂栫爜{outboundOrderdetail.MaterielCode}鏈壘鍒板簱瀛樺垎閰嶏紝璇风‘璁ゆ槸鍚﹀瓨鍦ㄥ簱瀛樻垨鍗曟嵁鏁伴噺宸插嚭瀹�");
}
-
+ List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
result.Item1.Distinct().ForEach(item =>
{
RequestTaskDto task = new RequestTaskDto
@@ -168,39 +172,64 @@
MaterielCode = outboundOrderdetail.MaterielCode,
Position = item.LocationCode,
PalletCode = item.PalletCode,
- AreaId = Convert.ToInt32(requestOut.AreaId),
+ AreaId = Convert.ToInt32(2),
};
taskDtos.Add(task);
item.StockInfoDetails.Where(x => x.MaterielCode == outboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.鍑哄簱閿佸畾;
item.StockStatus = (int)StockStateEmun.鍑哄簱閿佸畾;
+
+ item.StockInfoDetails.Where(x => x.OutboundQuantity > 0 && x.MaterielCode == outboundOrderdetail.MaterielCode).ForEach(x =>
+ {
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = outboundOrder.UpperOrderNo,
+ PalletCode = item.PalletCode,
+ OrderType = outboundOrder.OrderType,
+ ERPOrderId = outboundOrderdetail.ERPOrderId,
+ MaterielCode = outboundOrderdetail.MaterielCode,
+ MaterielName = outboundOrderdetail.MaterielName,
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ OutboundQuantity = x.OutboundQuantity,
+ });
+ });
});
List<Dt_Task> taskNews = new List<Dt_Task>();
List<WMSTaskDTO> taskDTOs = new List<WMSTaskDTO>();
foreach (var item in taskDtos)
{
taskNews.Add(await _taskService.RequestOutboundTaskAsync(item));
-
}
List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
List<DtLocationInfo> locations = new List<DtLocationInfo>();
+ if (taskNews.Count <= 0)
+ {
+ throw new Exception($"{outboundOrderdetail.MaterielCode}鏈壘鍒板彲鍑哄簱鎵樼洏");
+ }
foreach (var item in taskNews)
{
taskDTOs.Add(CreateTaskDTO(item));
var result1 = _taskService.UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
- var result2 = _taskService.UpdateLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
- locationStatusChangeRecords.AddRange(result1.Item1);
- locationStatusChangeRecords.AddRange(result2.Item1);
- locations.AddRange(result1.Item2);
- locations.AddRange(result2.Item2);
- }
+ var result2 = _taskService.UpdateEndLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, StatusChangeTypeEnum.AutomaticOutbound);
+ if (result2.Item1 != null && result2.Item2 != null)
+ {
+ locationStatusChangeRecords.AddRange(result2.Item1);
+ locations.AddRange(result2.Item2);
+ }
+ locationStatusChangeRecords.AddRange(result1.Item1);
+ locations.AddRange(result1.Item2);
+ }
+ outboundOrder.OrderStatus = (int)OrderStateEmun.寮�濮�;
await _unitOfWorkManage.UseTranAsync(async () =>
{
_taskRepository.AddData(taskNews);
_stockInfoRepository.UpdateDataNav(result.Item1);
await _locationStatusChangeRecordRepository.AddDataAsync(locationStatusChangeRecords);
await _locationRepository.UpdateDataAsync(locations);
+ BaseDal.UpdateData(outboundOrder);
_productionoutboundOrderDetailRepository.UpdateData(result.Item2);
+ _outDetailsRepository.AddData(outDetails);
});
content = await _taskService.SendWCSTask(taskDTOs);
}
@@ -227,7 +256,9 @@
Id = 0,
TaskType = task.TaskType,
AGVTaskNum = task.AGVTaskNum,
- Remark = task.Remark
+ Remark = task.Remark,
+ Floor =task.Floor,
+ DoubleTray = task.DoubleTray,
};
}
public (List<DtStockInfo>, Dt_ProductionOutboundOrderDetail) AssignStockOutbound(Dt_ProductionOutboundOrderDetail outboundOrderdetail, List<StockSelectViewDTO> stockSelectViews)
@@ -250,8 +281,7 @@
foreach (var item in outStocks)
{
- var stockDetail = item.StockInfoDetails
- .Where(d => d.MaterielCode == outboundOrderdetail.MaterielCode && d.Quantity > 0);
+ var stockDetail = item.StockInfoDetails.Where(d => d.MaterielCode == outboundOrderdetail.MaterielCode && d.Quantity > 0);
if (needQuantity <= 0)
{
continue;
@@ -284,11 +314,16 @@
}
outboundOrderdetail.OverOutQuantity = outboundOrderdetail.OrderQuantity - needQuantity;
+ outboundOrderdetail.NotOutQuantity = outboundOrderdetail.OrderQuantity - outboundOrderdetail.OverOutQuantity;
if (outboundOrderdetail.OverOutQuantity != 0)
{
outboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.寮�濮�;
}
+ if (outboundOrderdetail.OverOutQuantity == outboundOrderdetail.OrderQuantity)
+ {
+ outboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.宸插畬鎴�;
+ }
return (outStockNews, outboundOrderdetail);
}
--
Gitblit v1.9.3