From a296223898d61a9838bbd35ed75c87575e308a36 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 07 十一月 2025 17:19:38 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs | 72 +++++++++++-------------------------
1 files changed, 22 insertions(+), 50 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 ed6916f..f6b0229 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"
@@ -40,6 +40,7 @@
private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
private readonly IDt_OrderOutDetailsRepository _outDetailsRepository;
private readonly IDt_AreaInfoRepository _areaInfoRepository;
+ private readonly IDt_WareAreaInfoRepository _wareAreaInfoRepository;
public Dt_AllocateOutboundOrderService(IDt_AllocateOutboundOrderRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -52,7 +53,8 @@
IDt_TaskRepository taskRepository,
ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
IDt_OrderOutDetailsRepository outDetailsRepository,
- IDt_AreaInfoRepository areaInfoRepository) : base(BaseDal)
+ IDt_AreaInfoRepository areaInfoRepository,
+ IDt_WareAreaInfoRepository wareAreaInfoRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_allocateoutboundOrderDetailRepository = allocateoutboundOrderDetailRepository;
@@ -65,6 +67,7 @@
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
_outDetailsRepository = outDetailsRepository;
_areaInfoRepository = areaInfoRepository;
+ _wareAreaInfoRepository = wareAreaInfoRepository;
}
public WebResponseContent GetAllocateOutboundOrder(OutboundOrderGetDTO outboundOrderGetDTO)
{
@@ -153,12 +156,14 @@
{
foreach (var orderId in requestOut.orderIds)
{
- Dt_AreaInfo areaInfo = null;
- if (requestOut.AreaId != null)
- areaInfo = _areaInfoRepository.QueryFirst(x => x.AreaID == Convert.ToInt32(requestOut.AreaId));
+ Dt_WareAreaInfo? wareAreaInfo = null;
+ if (requestOut.Warehouse != "")
+ wareAreaInfo = _wareAreaInfoRepository.QueryFirst(x => x.WareAreaCode == requestOut.Warehouse);
+ else
+ return content.Error("璇烽�夋嫨璋冩嫧浠撳簱");
- List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
+ 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);
@@ -183,12 +188,11 @@
MaterielCode = allocateoutboundOrderdetail.MaterielCode,
Position = item.LocationCode,
PalletCode = item.PalletCode,
- AreaId = Convert.ToInt32(requestOut.AreaId),
+ //AreaId = Convert.ToInt32(requestOut.AreaId),
+ AreaId = Convert.ToInt32(2),
};
taskDtos.Add(task);
- item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.鍑哄簱閿佸畾;
item.StockStatus = (int)StockStateEmun.鍑哄簱閿佸畾;
- item.Remark = requestOut.Warehouse;
item.OrderNo = outboundOrder.UpperOrderNo;
item.StockInfoDetails.Where(x => x.OutboundQuantity > 0 && x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).ForEach(x =>
@@ -201,50 +205,12 @@
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,
+ AllocateWarehouse = wareAreaInfo.WareAreaName,
+ AllocateWarehouseId = wareAreaInfo.WareAreaCode,
Warehouse = "鏅鸿兘绔嬪簱",
WareHouseId = "107",
- OutboundQuantity = item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).Sum(x => x.Quantity),
+ OutboundQuantity = x.OutboundQuantity,
});
- });
-
- 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>();
@@ -269,9 +235,10 @@
locations.AddRange(result1.Item2);
locations.AddRange(result2.Item2);
}
-
+ outboundOrder.OrderStatus = (int)OrderStateEmun.寮�濮�;
await _unitOfWorkManage.UseTranAsync(async () =>
{
+ BaseDal.UpdateData(outboundOrder);
_taskRepository.AddData(taskNews);
_stockInfoRepository.UpdateDataNav(result.Item1);
await _locationStatusChangeRecordRepository.AddDataAsync(locationStatusChangeRecords);
@@ -361,11 +328,16 @@
}
allocateoutboundOrderdetail.OverOutQuantity = allocateoutboundOrderdetail.OrderQuantity - needQuantity;
+ allocateoutboundOrderdetail.NotOutQuantity = allocateoutboundOrderdetail.OrderQuantity - allocateoutboundOrderdetail.OverOutQuantity;
if (allocateoutboundOrderdetail.OverOutQuantity != 0)
{
allocateoutboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.寮�濮�;
}
+ if (allocateoutboundOrderdetail.OverOutQuantity == allocateoutboundOrderdetail.OrderQuantity)
+ {
+ allocateoutboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.宸插畬鎴�;
+ }
return (outStockNews, allocateoutboundOrderdetail);
}
--
Gitblit v1.9.3