From dda095e27b535d5748340f127c5f83c0d1324226 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 29 十月 2025 17:30:58 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs"
index 26b43f4..bf48961 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs"
@@ -18,6 +18,7 @@
using WIDESEA_IStorageTaskRepository;
using WIDESEA_IStorageTaskServices;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.ERP;
using WIDESEA_Model.Models.Order;
using WIDESEA_OrderRepository;
using WIDESEA_StorageTaskRepository;
@@ -36,6 +37,7 @@
private readonly ILocationInfoRepository _locationRepository;
private readonly IDt_TaskRepository _taskRepository;
private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
+ private readonly IDt_OrderOutDetailsRepository _outDetailsRepository;
public Dt_AllocateOutboundOrderService(IDt_AllocateOutboundOrderRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -46,7 +48,8 @@
IDt_TaskService taskService,
ILocationInfoRepository locationRepository,
IDt_TaskRepository taskRepository,
- ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository) : base(BaseDal)
+ ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
+ IDt_OrderOutDetailsRepository outDetailsRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_allocateoutboundOrderDetailRepository = allocateoutboundOrderDetailRepository;
@@ -57,8 +60,8 @@
_locationRepository = locationRepository;
_taskRepository = taskRepository;
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
+ _outDetailsRepository = outDetailsRepository;
}
-
public WebResponseContent GetAllocateOutboundOrder(OutboundOrderGetDTO outboundOrderGetDTO)
{
WebResponseContent content = new WebResponseContent();
@@ -161,7 +164,7 @@
{
return content.Error($"璁㈠崟{outboundOrder.UpperOrderNo}鐗╂枡缂栫爜{allocateoutboundOrderdetail.MaterielCode}鏈壘鍒板簱瀛樺垎閰嶏紝璇风‘璁ゆ槸鍚﹀瓨鍦ㄥ簱瀛樻垨鍗曟嵁鏁伴噺宸插嚭瀹�");
}
-
+ List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
result.Item1.Distinct().ForEach(item =>
{
RequestTaskDto task = new RequestTaskDto
@@ -177,7 +180,20 @@
item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.鍑哄簱閿佸畾;
item.StockStatus = (int)StockStateEmun.鍑哄簱閿佸畾;
item.Remark = requestOut.Warehouse;
- item.OrderNo = allocateoutboundOrderdetail.Id.ToString();
+ item.OrderNo = outboundOrder.UpperOrderNo;
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = outboundOrder.UpperOrderNo,
+ PalletCode = item.PalletCode,
+ OrderType = outboundOrder.OrderType,
+ ERPOrderId = allocateoutboundOrderdetail.ERPOrderId,
+ MaterielCode = allocateoutboundOrderdetail.MaterielCode,
+ MaterielName = allocateoutboundOrderdetail.MaterielName,
+ AllocateWarehouse = requestOut.Warehouse == null ? item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).FirstOrDefault().Warehouse : requestOut.Warehouse,
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = allocateoutboundOrderdetail.WareHouseId,
+ OutboundQuantity = item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).Sum(x => x.Quantity),
+ });
});
List<Dt_Task> taskNews = new List<Dt_Task>();
List<WMSTaskDTO> taskDTOs = new List<WMSTaskDTO>();
@@ -206,6 +222,7 @@
await _locationStatusChangeRecordRepository.AddDataAsync(locationStatusChangeRecords);
await _locationRepository.UpdateDataAsync(locations);
_allocateoutboundOrderDetailRepository.UpdateData(result.Item2);
+ _outDetailsRepository.AddData(outDetails);
});
content = await _taskService.SendWCSTask(taskDTOs);
}
--
Gitblit v1.9.3