From f9e8a2d52fe52fb2389892a46c12d4d262ee9aaf Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 29 十一月 2025 16:53:28 +0800
Subject: [PATCH] 增加提升机可进行一次进俩托物料出入库
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 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 d0b82aa..fe1cbe1 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"
@@ -172,52 +172,55 @@
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.鍑哄簱閿佸畾;
- outDetails.Add(new Dt_OrderOutDetails()
+ item.StockInfoDetails.Where(x => x.OutboundQuantity > 0 && x.MaterielCode == outboundOrderdetail.MaterielCode).ForEach(x =>
{
- OrderNo = outboundOrder.UpperOrderNo,
- PalletCode = item.PalletCode,
- OrderType = outboundOrder.OrderType,
- ERPOrderId = outboundOrderdetail.ERPOrderId,
- MaterielCode = outboundOrderdetail.MaterielCode,
- MaterielName = outboundOrderdetail.MaterielName,
- Warehouse = "鏅鸿兘绔嬪簱",
- WareHouseId = "107",
- OutboundQuantity = item.StockInfoDetails.Where(x => x.MaterielCode == outboundOrderdetail.MaterielCode).Sum(x => x.Quantity),
+ 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);
}
-
+ 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);
});
@@ -246,7 +249,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)
@@ -269,8 +274,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;
@@ -303,11 +307,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