From e755a1c79f29b42f9344e6ab87475e9a4d6c7dc6 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期四, 15 一月 2026 13:52:25 +0800
Subject: [PATCH] 合托功能
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs | 103 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 93 insertions(+), 10 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
index 0f9506a..1ab57a2 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
@@ -20,7 +20,7 @@
List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
- List<Dt_NewOutboundOrderDetail> outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Repository.QueryData(x => keys.Contains(x.OrderId));
+ List<Dt_NewOutboundOrderDetail> outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Repository.QueryData(x => keys.Contains(x.Id));
if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
{
throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
@@ -29,15 +29,37 @@
{
throw new Exception("鎵�閫夊嚭搴撳崟鏄庣粏瀛樺湪鍑哄簱涓垨宸插畬鎴�");
}
- List<Dt_NewOutboundOrder> outboundOrders = _outboundService.NewOutboundOrderService.Repository.QueryData(x => keys.Contains(x.Id));
- List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.Repository.QueryData(x => outboundOrderDetails.Select(s => s.LPNNo).Contains(x.PalletCode));
- if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
+ var lpngroup = outboundOrderDetails.GroupBy(x => x.LPNNo);
+
+
+ List<Dt_NewOutboundOrderDetail> newOutboundOrderDetails = new List<Dt_NewOutboundOrderDetail>();
+ List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
+
+ foreach (var lpngroups in lpngroup)
+ {
+ string lpn = lpngroups.Key;
+ List<Dt_NewOutboundOrderDetail> detailsForThisLPN = _outboundService.NewOutboundOrderDetailService.Repository.QueryData(x => x.LPNNo == lpn && x.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt());
+ if (detailsForThisLPN.Count == 0) continue;
+ newOutboundOrderDetails.AddRange(detailsForThisLPN);
+ Dt_StockInfo? stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == lpn);
+ if (stockInfo == null)
+ {
+ throw new Exception($"鏈壘鍒板簱瀛樹俊鎭紝鎵樼洏鍙穥lpn}");
+ }
+ stockInfos.Add(stockInfo);
+
+ }
+
+ if (stockInfos == null || stockInfos.Count == 0)
{
throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
}
+ List<int> orderId = newOutboundOrderDetails.Select(x => x.OrderId).Distinct().ToList();
+ List<Dt_NewOutboundOrder> outboundOrders = _outboundService.NewOutboundOrderService.Repository.QueryData(x => orderId.Contains(x.Id));
var Newtasks = GetTasks(stockInfos, TaskTypeEnum.OutProduct);
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => stockInfos.Select(x => x.Id).Contains(x.StockId));
- foreach (var item in outboundOrderDetails)
+ List<string> palletcodelpn = new List<string>();
+ foreach (var item in newOutboundOrderDetails)
{
Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.PalletCode == item.LPNNo);
if (stockInfo == null) continue;
@@ -45,14 +67,28 @@
if (stockInfoDetail == null) continue;
stockInfoDetail.OutboundQuantity += item.OrderQuantity;
item.LockQuantity += item.OrderQuantity;
+ item.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
var outboundOrder = outboundOrders.FirstOrDefault(x => x.Id == item.OrderId);
- Dt_OutStockLockInfo outStockLockInfo = _outboundService.OutboundStockLockInfoService.GetOutStockLockInfo(outboundOrder, item, stockInfo, item.OrderQuantity);
+ Dt_OutStockLockInfo outStockLockInfo = _outboundService.OutboundStockLockInfoService.GetOutStockLockInfo(outboundOrder, item, stockInfo, stockInfoDetail, item.OrderQuantity);
outStockLockInfo.Status = OutStockStatus.鍑哄簱涓�.ObjToInt();
item.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
+ stockInfo.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
var task = Newtasks.FirstOrDefault(x => x.PalletCode == item.LPNNo);
- task.OrderNo = outboundOrder.OrderNo;
- tasks.Add(task);
+ if (task != null && !palletcodelpn.Contains(item.LPNNo))
+ {
+ if (outboundOrder.OrderType == 1)
+ {
+ task.TaskType = TaskTypeEnum.OutProduct.ObjToInt();
+ }
+ else if (outboundOrder.OrderType == 2)
+ {
+ task.TaskType = TaskTypeEnum.OutAllocate.ObjToInt();
+ }
+ task.OrderNo = outboundOrder.OrderNo;
+ tasks.Add(task);
+ palletcodelpn.Add(task.PalletCode);
+ }
outStockLockInfo.TaskNum = task.TaskNum;
outStockLockInfos.Add(outStockLockInfo);
}
@@ -63,7 +99,7 @@
BaseDal.AddData(tasks);
_stockService.StockInfoService.Repository.UpdateData(stockInfos);
_stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetails);
- _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
+ _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(newOutboundOrderDetails);
_outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrders);
_outboundService.OutboundStockLockInfoService.Repository.AddData(outStockLockInfos);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.Lock.ObjToInt(), StockChangeType.Outbound.ObjToInt(), "", tasks?.Select(x => x.TaskNum).ToList());
@@ -71,7 +107,54 @@
_unitOfWorkManage.CommitTran();
//灏嗕换鍔℃帹閫佸埌WCS
- return PushTasksToWCS(tasks);
+ return PushTasksWCS(tasks);
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ //鍚堟墭鍑哄簱
+ public WebResponseContent WMSGenerateSTOutboundTask(int[] keys)
+ {
+ try
+ {
+ List<Dt_Task> tasks = new List<Dt_Task>();
+ List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
+ List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
+
+ List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.Repository.QueryData(x => keys.Contains(x.Id) && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt());
+ if (stockInfos == null || stockInfos.Count == 0)
+ {
+ throw new Exception("鏈壘鍒板簱瀛樹俊鎭�,鎴栧簱瀛樼姸鎬佷笉涓哄叆搴撳畬鎴�");
+ }
+
+ var Newtasks = GetTasks(stockInfos, TaskTypeEnum.OutSyncretism);
+ List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => stockInfos.Select(x => x.Id).Contains(x.StockId));
+ foreach (var item in stockInfos)
+ {
+ Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.PalletCode == item.PalletCode);
+ if (stockInfo == null) continue;
+
+ stockInfo.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ var task = Newtasks.FirstOrDefault(x => x.PalletCode == item.PalletCode);
+ tasks.Add(task);
+ }
+ locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(stockInfos.Select(x => x.LocationCode).ToList()));
+
+ _unitOfWorkManage.BeginTran();
+
+ BaseDal.AddData(tasks);
+ _stockService.StockInfoService.Repository.UpdateData(stockInfos);
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetails);
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.Lock.ObjToInt(), StockChangeType.Outbound.ObjToInt(), "", tasks?.Select(x => x.TaskNum).ToList());
+ _basicService.LocationInfoService.Repository.UpdateLocationStatus(locationInfos, LocationStatusEnum.Lock);
+
+ _unitOfWorkManage.CommitTran();
+ //灏嗕换鍔℃帹閫佸埌WCS
+ return PushTasksWCS(tasks);
}
catch (Exception ex)
{
--
Gitblit v1.9.3