From 4dfe8ece141f05a163cf7d290b6fe4c520d89909 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 31 十月 2025 17:28:33 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs | 82 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 77 insertions(+), 5 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..ed6916f 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"
@@ -11,6 +11,7 @@
using WIDESEA_DTO.Order;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.WMS;
+using WIDESEA_IBusinessesRepository;
using WIDESEA_IOrderRepository;
using WIDESEA_IOrderServices;
using WIDESEA_IStorageBasicRepository;
@@ -18,6 +19,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 +38,8 @@
private readonly ILocationInfoRepository _locationRepository;
private readonly IDt_TaskRepository _taskRepository;
private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
+ private readonly IDt_OrderOutDetailsRepository _outDetailsRepository;
+ private readonly IDt_AreaInfoRepository _areaInfoRepository;
public Dt_AllocateOutboundOrderService(IDt_AllocateOutboundOrderRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -46,7 +50,9 @@
IDt_TaskService taskService,
ILocationInfoRepository locationRepository,
IDt_TaskRepository taskRepository,
- ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository) : base(BaseDal)
+ ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
+ IDt_OrderOutDetailsRepository outDetailsRepository,
+ IDt_AreaInfoRepository areaInfoRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_allocateoutboundOrderDetailRepository = allocateoutboundOrderDetailRepository;
@@ -57,8 +63,9 @@
_locationRepository = locationRepository;
_taskRepository = taskRepository;
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
+ _outDetailsRepository = outDetailsRepository;
+ _areaInfoRepository = areaInfoRepository;
}
-
public WebResponseContent GetAllocateOutboundOrder(OutboundOrderGetDTO outboundOrderGetDTO)
{
WebResponseContent content = new WebResponseContent();
@@ -146,6 +153,11 @@
{
foreach (var orderId in requestOut.orderIds)
{
+ Dt_AreaInfo areaInfo = null;
+ if (requestOut.AreaId != null)
+ areaInfo = _areaInfoRepository.QueryFirst(x => x.AreaID == Convert.ToInt32(requestOut.AreaId));
+
+
List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
Dt_AllocateOutboundOrderDetail allocateoutboundOrderdetail = _allocateoutboundOrderDetailRepository.QueryFirst(x => x.Id == orderId);
Dt_AllocateOutboundOrder outboundOrder = BaseDal.QueryFirst(x => x.Id == allocateoutboundOrderdetail.OrderId);
@@ -161,7 +173,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,17 +189,76 @@
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;
+
+ item.StockInfoDetails.Where(x => x.OutboundQuantity > 0 && x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).ForEach(x =>
+ {
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = outboundOrder.UpperOrderNo,
+ PalletCode = item.PalletCode,
+ OrderType = outboundOrder.OrderType,
+ ERPOrderId = allocateoutboundOrderdetail.ERPOrderId,
+ MaterielCode = allocateoutboundOrderdetail.MaterielCode,
+ MaterielName = allocateoutboundOrderdetail.MaterielName,
+ AllocateWarehouse = areaInfo == null ? item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).FirstOrDefault().Warehouse : areaInfo.AreaName,
+ AllocateWarehouseId = areaInfo == null ? item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).FirstOrDefault().WareHouseId : areaInfo.AreaCode,
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ OutboundQuantity = item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).Sum(x => x.Quantity),
+ });
+ });
+
+ item.StockInfoDetails.Where(x => x.OutboundQuantity == 0 || (x.Quantity - x.OutboundQuantity) > 0).ForEach(x =>
+ {
+ if (x.MaterielCode == allocateoutboundOrderdetail.MaterielCode)
+ {
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = "",
+ PalletCode = item.PalletCode,
+ OrderType = (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = "WMS鍑哄簱缂撳瓨鍖�",
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ AllocateWarehouseId = "205",
+ OutboundQuantity = x.Quantity - x.OutboundQuantity,
+ });
+ }
+ else
+ {
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = "",
+ PalletCode = item.PalletCode,
+ OrderType = (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = "WMS鍑哄簱缂撳瓨鍖�",
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ AllocateWarehouseId = "205",
+ OutboundQuantity = x.Quantity,
+ });
+ }
+ });
});
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($"{allocateoutboundOrderdetail.MaterielCode}鏈壘鍒板彲鍑哄簱鎵樼洏");
+ }
foreach (var item in taskNews)
{
taskDTOs.Add(CreateTaskDTO(item));
@@ -206,6 +277,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