From 36d872855097bc1d76b96b850a72d7749500e272 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期四, 26 二月 2026 16:26:51 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs | 538 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 468 insertions(+), 70 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
index 28bdeab..94278e9 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,131 @@
{
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 || outboundOrderDetails.FirstOrDefault()?.LPNNo == "")
{
- 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)
+ outboundOrderDetails.Clear();
+ 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.DistinctBy(x => x.LocationCode));
+ }
+ if (result.Item1 != null && result.Item1.Count > 0)
+ {
+ tasks.AddRange(result.Item1);
+ }
+ 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);
}
@@ -226,8 +274,8 @@
throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
}
}
-
- var Newtasks = GetTasks(stockInfos, TaskTypeEnum.OutInventory);
+ string orderNo = takeStockOrderCPs.FirstOrDefault().OrderNo;
+ var Newtasks = GetTask(stockInfos, TaskTypeEnum.OutInventory, orderNo);
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => stockInfos.Select(x => x.Id).Contains(x.StockId));
foreach (var item in stockInfos)
{
@@ -277,12 +325,38 @@
List<Dt_StockInfoDetail> stockdetail = new List<Dt_StockInfoDetail>();
foreach (var item in houseAdjustment.DetailList)
{
+ Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == item.LPNNo);
+ if (stockInfo == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒版鎵樼洏搴撳瓨");
+ }
var dt_StockInfo = BaseDal.Db.Queryable<Dt_StockInfoDetail>().LeftJoin<Dt_StockInfo>((stockdetail, stock) => stockdetail.StockId == stock.Id)
.Where((stockdetail, stock) => stockdetail.MaterielCode == item.MaterielCode && stockdetail.BatchNo == item.BatchNo && stock.PalletCode == item.LPNNo).Select((stockdetail, stock) => stockdetail).First();
if (dt_StockInfo != null)
{
dt_StockInfo.StockQuantity = item.OrderQuantity;
stockdetail.Add(dt_StockInfo);
+ }
+ else
+ {
+ Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
+ {
+ StockId = stockInfo.Id,
+ MaterielCode = item.MaterielCode,
+ MaterielName = item.MaterielName,
+ OrderNo = dt_StockInfo.OrderNo,
+ BatchNo = item.BatchNo,
+ SupplierBatch = dt_StockInfo.SupplierBatch,
+ LinId = item.LinId,
+ StockQuantity = item.OrderQuantity,
+ Status = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ Id = item.LinId.ObjToInt(),
+ MaterieSpec = dt_StockInfo.MaterieSpec,
+ OrinalLocation = dt_StockInfo.OrinalLocation
+ };
+ stockdetail.Add(stockInfoDetail);
}
}
@@ -297,5 +371,329 @@
}
return WebResponseContent.Instance.OK();
}
+
+ /// <summary>
+ /// SMOM鍙戣揣鍚庢垚鍝佺搴撳瓨璋冩暣
+ /// </summary>
+ /// <param name="houseStockDetail"></param>
+ /// <returns></returns>
+ public WebResponseContent SMOMStock(HouseStockDetail houseStockDetail)
+ {
+ WebResponseContent responseContent = new WebResponseContent();
+ try
+ {
+ if (houseStockDetail.DetailList.Count == 0)
+ {
+ return WebResponseContent.Instance.Error("鏃犳槑缁嗕俊鎭�");
+ }
+ List<Dt_StockInfoDetail> stockdetail = new List<Dt_StockInfoDetail>();
+ var allBoxCodes = new List<string>();
+ _unitOfWorkManage.BeginTran();
+ foreach (var item in houseStockDetail.DetailList)
+ {
+ // 妫�鏌ユ槑缁嗗垪琛ㄦ槸鍚﹀瓨鍦ㄤ笖鏈夋晥
+ if (item.LabelList == null || item.LabelList.Count == 0)
+ {
+ return WebResponseContent.Instance.Error($"鎵樼洏{item.LPNNo}鏃犵鐮佹槑缁嗕俊鎭�");
+ }
+ allBoxCodes.AddRange(item.LabelList);
+
+ //Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == item.LPNNo);
+ //if (stockInfo == null)
+ //{
+ // return WebResponseContent.Instance.Error("鏈壘鍒版鎵樼洏搴撳瓨");
+ //}
+
+ var stockdetailbox = BaseDal.Db.Queryable<Dt_StockInfo>().LeftJoin<Dt_StockInfoDetail>((s, d) => s.Id == d.StockId).LeftJoin<Dt_StockInfoDetailCP>((s, d, cp) => d.Id == cp.StockDetailId).Where((s, d, cp) => allBoxCodes.Contains(cp.BoxCode)).Select((s, d, cp) => cp.BoxCode)
+ .Distinct()
+ .ToList();
+
+ var stockInfoDetailCPList = _stockInfoDetailCPRepository.QueryData(x => stockdetailbox.Contains(x.BoxCode)).ToList();
+ if (stockInfoDetailCPList != null)
+ {
+ _stockInfoDetailCPRepository.DeleteAndMoveIntoHty(stockInfoDetailCPList, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+
+ for (int i = 0; i < stockInfoDetailCPList.Count(); i++)
+ {
+ Dt_StockInfo dt_StockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == item.LPNNo).Includes(x => x.Details).First();
+ if (dt_StockInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鎵樼洏{item.LPNNo}鏃犵鐮佹槑缁嗕俊鎭�");
+ }
+ List<Dt_StockInfoDetail> stockdetails = dt_StockInfo.Details;
+
+ var matchedDetail = stockdetails.FirstOrDefault(d => d.MaterielCode.Contains(stockInfoDetailCPList[i].PartNum) && d.BatchNo.Contains(item.BatchNo));
+ if (matchedDetail != null)
+ {
+ matchedDetail.StockQuantity -= (decimal)stockInfoDetailCPList[i].QtyOfpcs;
+ matchedDetail.OutboundQuantity += (decimal)stockInfoDetailCPList[i].QtyOfpcs;
+ _stockInfoDetailRepository.UpdateData(matchedDetail);
+
+ if (matchedDetail.StockQuantity == 0)
+ {
+ _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(matchedDetail, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ }
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error($"鎵樼洏{item.LPNNo}涓湭鎵惧埌鐗╂枡{stockInfoDetailCPList[i].PartNum}鍜屾壒娆item.BatchNo}鐨勬槑缁�");
+ }
+ if (dt_StockInfo.Details.Sum(x => x.StockQuantity) == 0)
+ {
+ _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(dt_StockInfo, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ }
+ }
+ }
+
+ }
+ _unitOfWorkManage.CommitTran();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error($"Error: {ex.Message}");
+ }
+ 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_NewOutboundOrder dt_OutboundOrder = _outboundService.NewOutboundOrderService.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_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.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;
+ });
+ result.Item2.ForEach(x =>
+ {
+ foreach (var item in result.Item2)
+ {
+ if (item.LockQuantity > 0)
+ {
+ item.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>();
+ for (int i = 0; i < stockInfos.Count; i++)
+ {
+ Dt_StockInfo stockInfo = stockInfos[i];
+
+ if (stockInfo != null)
+ {
+ Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
+ if (locationInfo == null)
+ {
+ throw new Exception("鏈壘鍒板嚭搴撳簱浣�");
+ }
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.SourceAddress == locationInfo.LocationCode || x.TargetAddress == locationInfo.LocationCode);
+ if (dt_Task != null)
+ {
+ throw new Exception("璇ヨ揣浣嶅凡瀛樺湪璧风偣浠诲姟鎴栫粓鐐逛换鍔�");
+ }
+ Dt_Task dt_Task1 = BaseDal.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
+ if (dt_Task1 != null)
+ {
+ throw new Exception("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ }
+ Dt_RoadwayInfo roadwayInfo = _basicService.RoadwayInfoService.Repository.QueryFirst(x => x.RoadwayNo == locationInfo.RoadwayNo);
+ Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == stockInfo.Id);
+ if (roadwayInfo != null)
+ {
+ if (roadwayInfo.RoadwayNo.Contains("CP"))
+ {
+ Dt_Task task = new()
+ {
+ PalletType = stockInfo.PalletType,
+ OrderNo = orderNo,
+ CurrentAddress = locationInfo.LocationCode,
+ Grade = 0,
+ Creater = "WMS",
+ PalletCode = stockInfo.PalletCode,
+ NextAddress = roadwayInfo.OutSCStationCode,
+ Roadway = locationInfo.RoadwayNo,
+ SourceAddress = locationInfo.LocationCode,
+ TargetAddress = "",
+ TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
+ TaskType = taskType.ObjToInt(),
+ Depth = locationInfo.Depth,
+ WarehouseId = stockInfo.WarehouseId,
+ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
+ MaterielCode = stockInfoDetail.MaterielCode,
+ Quantity = (float)stockInfoDetail.StockQuantity
+ };
+ tasks.Add(task);
+ }
+ else
+ {
+ Dt_Task task = new()
+ {
+ PalletType = stockInfo.PalletType,
+ OrderNo = stockInfoDetail.OrderNo,
+ CurrentAddress = locationInfo.LocationCode,
+ Grade = 0,
+ Creater = "WMS",
+ PalletCode = stockInfo.PalletCode,
+ NextAddress = roadwayInfo.OutSCStationCode,
+ Roadway = locationInfo.RoadwayNo,
+ SourceAddress = locationInfo.LocationCode,
+ TargetAddress = "",
+ TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
+ TaskType = taskType.ObjToInt(),
+ Depth = locationInfo.Depth,
+ WarehouseId = stockInfo.WarehouseId,
+ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
+ };
+ if (taskType != TaskTypeEnum.OutEmpty)
+ {
+ task.MaterielCode = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
+ task.Quantity = (float)stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
+ }
+ tasks.Add(task);
+ }
+
+ }
+ }
+
+ }
+ return tasks;
+ }
}
}
--
Gitblit v1.9.3