From aed0f21b6345d10d94126b63f6bb4b854e0531a1 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期三, 28 一月 2026 09:49:03 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs | 348 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 280 insertions(+), 68 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
index d64f1ee..0734036 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
@@ -10,6 +10,7 @@
using WIDESEA_Core;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
+using WIDESEA_DTO.Stock;
using WIDESEA_Model.Models;
namespace WIDESEA_TaskInfoService
@@ -38,84 +39,134 @@
{
throw new Exception("鎵�閫夊嚭搴撳崟鏄庣粏瀛樺湪鍑哄簱涓垨宸插畬鎴�");
}
- 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)
+ if (outboundOrderDetails.FirstOrDefault()?.LPNNo == null)
{
- 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 && x.LocationCode != null);
- if (stockInfo == null)
+ try
{
- throw new Exception($"鏈壘鍒板簱瀛樹俊鎭紝鎵樼洏鍙穥lpn}");
+ List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
+ List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
+ foreach (int key in keys)
+ {
+
+ (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_NewOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = NEWOutboundTaskDataHandle(keys);
+ if (result.Item2 != null && result.Item2.Count > 0)
+ {
+ stockInfos.AddRange(result.Item2);
+ }
+ if (result.Item3 != null && result.Item3.Count > 0)
+ {
+ outboundOrderDetails.AddRange(result.Item3);
+ }
+ if (result.Item4 != null && result.Item4.Count > 0)
+ {
+ outStockLockInfos.AddRange(result.Item4);
+ }
+ if (result.Item5 != null && result.Item5.Count > 0)
+ {
+ locationInfos.AddRange(result.Item5);
+ }
+ if (result.Item1 != null && result.Item1.Count > 0)
+ {
+ tasks.AddRange(result.Item1);
+ }
+ if (locationInfos.First().RoadwayNo.Contains("DW") || locationInfos.First().RoadwayNo.Contains("YS"))
+ {
+ break;
+ }
+
+ }
+
+ WebResponseContent content = NEWGenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
+ return content;
}
- 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));
- _unitOfWorkManage.BeginTran();
- var Newtasks = GetTasks(stockInfos, TaskTypeEnum.OutProduct);
- List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => stockInfos.Select(x => x.Id).Contains(x.StockId));
- 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;
- Dt_StockInfoDetail? stockInfoDetail = stockInfoDetails.FirstOrDefault(x => x.StockId == stockInfo.Id && x.BatchNo == item.BatchNo);
- 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, 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);
- if (task != null && !palletcodelpn.Contains(item.LPNNo))
+ catch (Exception ex)
{
- 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);
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
}
- outStockLockInfo.TaskNum = task.TaskNum;
- outStockLockInfos.Add(outStockLockInfo);
}
- locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(stockInfos.Select(x => x.LocationCode).ToList()));
+ else
+ {
+ 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 && x.LocationCode != null);
+ 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));
+ _unitOfWorkManage.BeginTran();
+ var Newtasks = GetTasks(stockInfos, TaskTypeEnum.OutProduct);
+ List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => stockInfos.Select(x => x.Id).Contains(x.StockId));
+ 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;
+ Dt_StockInfoDetail? stockInfoDetail = stockInfoDetails.FirstOrDefault(x => x.StockId == stockInfo.Id && x.BatchNo == item.BatchNo);
+ 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, 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);
+ 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);
+ }
+ locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(stockInfos.Select(x => x.LocationCode).ToList()));
- BaseDal.AddData(tasks);
- _stockService.StockInfoService.Repository.UpdateData(stockInfos);
- _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetails);
- _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());
- _basicService.LocationInfoService.Repository.UpdateLocationStatus(locationInfos, LocationStatusEnum.Lock);
+ BaseDal.AddData(tasks);
+ _stockService.StockInfoService.Repository.UpdateData(stockInfos);
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetails);
+ _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());
+ _basicService.LocationInfoService.Repository.UpdateLocationStatus(locationInfos, LocationStatusEnum.Lock);
- _unitOfWorkManage.CommitTran();
+ _unitOfWorkManage.CommitTran();
+
+ }
//灏嗕换鍔℃帹閫佸埌WCS
return PushTasksWCS(tasks);
}
@@ -376,6 +427,167 @@
return WebResponseContent.Instance.OK();
}
+
+ public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_NewOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) NEWOutboundTaskDataHandle(int[] keys)
+ {
+ List<Dt_Task> tasks = new List<Dt_Task>();
+ List<Dt_NewOutboundOrderDetail> outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Repository.QueryData(x => keys.Contains(x.Id));
+
+ if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
+ {
+ throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
+ }
+ if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
+ {
+ throw new Exception("鎵�閫夊嚭搴撳崟鏄庣粏瀛樺湪鍑哄簱涓垨宸插畬鎴�");
+ }
+ List<Dt_StockInfo>? stockInfos = null;
+ List<Dt_NewOutboundOrderDetail>? orderDetails = null;
+ List<Dt_OutStockLockInfo>? outStockLockInfos = null;
+ List<Dt_LocationInfo>? locationInfos = null;
+ //if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
+ {
+ Dt_OutboundOrder dt_OutboundOrder = _outboundService.OutboundOrderService.Repository.QueryData(x => x.Id == outboundOrderDetails.First().OrderId).First();
+ (List<Dt_StockInfo>, List<Dt_NewOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = new();
+
+ result = _outboundService.NewOutboundOrderDetailService.CPAssignStockOutbound(outboundOrderDetails);
+
+ if (result.Item1 != null && result.Item1.Count > 0)
+ {
+ Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
+ TaskTypeEnum typeEnum = outboundOrder.OrderType switch
+ {
+ (int)OrderTypeEnum.鐢熶骇鍑哄簱鍗� => TaskTypeEnum.Outbound,
+ (int)OrderTypeEnum.璋冩嫧鍑哄簱鍗� => TaskTypeEnum.OutAllocate,
+ (int)OrderTypeEnum.鍙嶆嫞鍑哄簱鍗� => TaskTypeEnum.ReverseOut,
+ _ => new TaskTypeEnum()
+ };
+ tasks = GetTasks(result.Item1, typeEnum);
+ tasks.ForEach(x =>
+ {
+ x.OrderNo = outboundOrder.OrderNo;
+ });
+ if (dt_OutboundOrder.OutWareHouse.Contains("DW") || dt_OutboundOrder.OutWareHouse.Contains("YS"))
+ {
+ result.Item2.ForEach(x =>
+ {
+ if (x.LockQuantity == x.OrderQuantity)
+ {
+ x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ }
+ });
+ }
+ else
+ {
+ result.Item2.ForEach(x =>
+ {
+ x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ });
+ }
+
+ result.Item3.ForEach(x =>
+ {
+
+ x.Status = OutStockStatus.鍑哄簱涓�.ObjToInt();
+ });
+
+ stockInfos = result.Item1;
+ orderDetails = result.Item2;
+ outStockLockInfos = result.Item3;
+ locationInfos = result.Item4;
+ }
+ else
+ {
+ throw new Exception("鏃犲簱瀛�");
+ }
+ }
+ //else
+ //{
+ // List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetail.OrderId, OutLockStockStatusEnum.宸插垎閰�);
+ // if (stockLockInfos != null && stockLockInfos.Count > 0)
+ // {
+ // List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
+ // tasks = GetTasks(stocks);
+ // }
+ //}
+
+ return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
+ }
+
+
+ /// <summary>
+ /// 鐢熸垚鍑哄簱浠诲姟鍚庢暟鎹洿鏂板埌鏁版嵁搴�
+ /// </summary>
+ /// <param name="tasks"></param>
+ /// <param name="stockInfos"></param>
+ /// <param name="outboundOrderDetails"></param>
+ /// <param name="outStockLockInfos"></param>
+ /// <param name="locationInfos"></param>
+ /// <returns></returns>
+ public WebResponseContent NEWGenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_NewOutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
+ {
+ try
+ {
+ WebResponseContent content = new WebResponseContent();
+ _unitOfWorkManage.BeginTran();
+
+ BaseDal.AddData(tasks);
+ //鍒ゆ柇绉诲簱
+ //content = RelocationTasks(tasks.OrderBy(x => x.Depth).ToList());
+ //if (content.Status)
+ //{
+ // _unitOfWorkManage.CommitTran();
+ //}
+ //else
+ //{
+ // _unitOfWorkManage.RollbackTran();
+ // return content;
+ //}
+ //BaseDal.AddData(tasks);
+
+ if (stockInfos != null && outboundOrderDetails != null && outStockLockInfos != null && locationInfos != null)
+ {
+ Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
+ outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
+ _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);
+ content = _outboundService.NewOutboundOrderDetailService.CPLockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);
+
+ if (!content.Status)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content;
+ }
+ }
+ else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
+ {
+ outboundOrderDetails.ForEach(x =>
+ {
+ x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ });
+
+ _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
+ }
+ _unitOfWorkManage.CommitTran();
+ //灏嗕换鍔℃帹閫佸埌WCS
+
+ if (tasks.FirstOrDefault().Roadway.Contains("SC01_BC"))
+ {
+ PushTasksToWCS(tasks);
+ }
+ else
+ {
+ PushTasksWCS(tasks);
+ }
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+
+ }
+
public List<Dt_Task> GetTask(List<Dt_StockInfo> stockInfos, TaskTypeEnum taskType, string orderNo)
{
List<Dt_Task> tasks = new List<Dt_Task>();
--
Gitblit v1.9.3