From c455612b03e6ecac994884dde5b5f4bc4909c181 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 11 三月 2025 17:12:52 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 292 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 242 insertions(+), 50 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 1c40c2f..bcf6a63 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -29,6 +29,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Transactions;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
@@ -48,6 +49,7 @@
using WIDESEA_ITaskInfoRepository;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
+using WIDESEA_OutboundRepository;
using WIDESEA_TaskInfoRepository;
using WIDESEAWCS_DTO.WCSInfo;
@@ -63,10 +65,11 @@
private readonly IInboundService _inboundService;
private readonly IRecordService _recordService;
private readonly IStockService _stockService;
+ private readonly IBasicRepository _basicRepository;
public ITaskRepository Repository => BaseDal;
- public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, IBasicRepository basicRepository) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -75,6 +78,7 @@
_inboundService = inboundService;
_recordService = recordService;
_stockService = stockService;
+ _basicRepository = basicRepository;
}
/// <summary>
@@ -108,7 +112,11 @@
}
}
-
+ /// <summary>
+ /// 鍏ュ簱浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
public WebResponseContent InboundTaskCompleted(Dt_Task task)
{
Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
@@ -188,7 +196,11 @@
return (true, "鎴愬姛");
}
-
+ /// <summary>
+ /// 鍑哄簱浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
public WebResponseContent OutboundTaskCompleted(Dt_Task task)
{
Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
@@ -212,6 +224,11 @@
return OnOutboundTaskCompleted?.Invoke(task) ?? WebResponseContent.Instance.OK();
}
+ /// <summary>
+ /// 鎵樼洏鍑哄簱浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
public WebResponseContent PalletOutboundTaskCompleted(Dt_Task task)
{
Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
@@ -247,30 +264,41 @@
if (task == null) return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭�");
if (task.TaskType == (int)TaskTypeEnum.Inbound)
{
- int nextStatus = task.TaskStatus.GetNextNotCompletedStatus<TaskInStatusEnum>();
- if (WMStask.TaskState != nextStatus) return WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佹湁璇�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskStatus}銆�");
- task.TaskStatus = nextStatus;
- switch (nextStatus)
- {
- case (int)TaskInStatusEnum.SC_InFinish:
- content = UpdateTaskStatusInFinish(task);
- break;
- default:
- break;
- }
+ int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
+ if (WMStask.TaskState != nextStatus) return WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佹湁璇�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
+ //task.TaskState = nextStatus;
+ task.TaskState = TaskInStatusEnum.InFinish.ObjToInt();
+ content = UpdateTaskStatusInFinish(task);
}
else if (task.TaskType == (int)TaskTypeEnum.Outbound)
{
- int nextStatus = task.TaskStatus.GetNextNotCompletedStatus<TaskOutStatusEnum>();
- if (WMStask.TaskState != nextStatus) return WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佹湁璇�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskStatus}銆�");
- task.TaskStatus = nextStatus;
- switch (nextStatus)
+ //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
+ //if (WMStask.TaskState != nextStatus) return WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佹湁璇�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
+ //task.TaskState = nextStatus;
+ task.TaskState = WMStask.TaskState;
+ switch (task.TaskState)
{
- case (int)TaskOutStatusEnum.SC_OutFinish:
+ case (int)TaskOutStatusEnum.SC_OutFinish://鏇存柊璐т綅搴撳瓨淇℃伅
+ UpdateTaskStatusSC_OutFinish(task);
+ break;
+ //case (int)TaskOutStatusEnum.Line_OutFinish:
+
+ //break;
+ case (int)TaskOutStatusEnum.OutFinish:
+ UpdateTaskStatusOutFinish(task);
break;
default:
+ UpdateData(task);
break;
}
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.Relocation)
+ {
+ task.TaskState = WMStask.TaskState;
+ if (task.TaskState == (int)WIDESEA_Core.Enums.TaskRelocationStatusEnum.RelocationFinish)
+ content = UpdateTaskStatusRelocationCarFinish(task);
+ else
+ content = UpdateData(task);
}
}
catch (Exception ex)
@@ -280,7 +308,149 @@
return content;
}
/// <summary>
- /// 鏇存柊浠诲姟鐘舵�佸畬鎴�
+ /// 淇敼浠诲姟鐘舵�佷负鍫嗗灈鏈哄嚭搴撳畬鎴�
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ public WebResponseContent UpdateTaskStatusSC_OutFinish(Dt_Task task)
+ {
+ try
+ {
+ Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
+ Dt_LocationInfo Sourcelocation = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+ Dt_OutStockLockInfo outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryFirst(x => x.TaskNum == task.TaskNum);
+ Db.Ado.BeginTran();
+ if (stockInfo != null)
+ {
+ _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ }
+ if (Sourcelocation != null)
+ {
+ Sourcelocation.CurrentQty--;
+ if (Sourcelocation.CurrentQty == 0)
+ {
+ Sourcelocation.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ Sourcelocation.EnableStatus = EnableStatusEnum.Normal.ObjToInt();
+ }
+ if (Sourcelocation.Row == 1 && Sourcelocation.LocationStatus == LocationStatusEnum.Free.ObjToInt())
+ {
+ Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.Row == 2 && x.Column == Sourcelocation.Column && x.Layer == Sourcelocation.Layer);
+ if (locationInfo.CurrentQty == 0 && locationInfo.LocationStatus == LocationStatusEnum.Free.ObjToInt())
+ {
+ locationInfo.EnableStatus = EnableStatusEnum.Normal.ObjToInt();
+ _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+ }
+ }
+ _basicService.LocationInfoService.Repository.UpdateData(Sourcelocation);
+ }
+ if (outStockLockInfo != null)
+ {
+ outStockLockInfo.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
+ _outboundService.OutboundStockLockInfoService.Repository.UpdateData(outStockLockInfo);
+ }
+ UpdateData(task);
+ Db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鏇存柊鍑哄簱浠诲姟鐘舵�佸畬鎴�
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ public WebResponseContent UpdateTaskStatusOutFinish(Dt_Task task)
+ {
+ try
+ {
+ Dt_OutStockLockInfo outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryFirst(x => x.TaskNum == task.TaskNum);
+ if (outStockLockInfo != null)
+ {
+ Dt_OutboundOrder outboundOrder = null;
+ int overCount = 0;
+ Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == outStockLockInfo.OrderDetailId);
+ if (outboundOrderDetail != null)
+ {
+ outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == outboundOrderDetail.OrderId).Includes(x => x.Details).First();
+ if (outboundOrder == null) throw new Exception("鍑哄簱鍗曚笉瀛樺湪");
+ outboundOrderDetail.OverOutQuantity++;
+ overCount = outboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
+ if (outboundOrderDetail.OverOutQuantity == outboundOrderDetail.OrderQuantity)
+ {
+ outboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ overCount++;
+ }
+ }
+ outStockLockInfo.Status = OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ Db.Ado.BeginTran();
+ if (outboundOrder != null && outboundOrder.Details.Count == overCount)
+ {
+ outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ _outboundService.OutboundOrderService.Repository.DeleteAndMoveIntoHty(outboundOrder, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ _outboundService.OutboundOrderDetailService.Repository.DeleteAndMoveIntoHty(outboundOrder.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ }
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ _outboundService.OutboundStockLockInfoService.Repository.UpdateData(outStockLockInfo);
+ Db.Ado.CommitTran();
+ }
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鏇存柊绉诲簱浠诲姟鐘舵�佸畬鎴�
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ public WebResponseContent UpdateTaskStatusRelocationCarFinish(Dt_Task task)
+ {
+ try
+ {
+ Dt_LocationInfo Sourcelocation = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);//璧峰璐т綅
+ Dt_LocationInfo Targetlocation = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);//鐩爣璐т綅
+ Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);//鎵樼洏搴撳瓨
+ Sourcelocation.CurrentQty--;
+ Targetlocation.CurrentQty++;
+ stockInfo.LocationCode = Targetlocation.LocationCode;
+ stockInfo.SerialNumber = Targetlocation.CurrentQty;
+ if (Sourcelocation.CurrentQty == 0) Sourcelocation.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ Dt_Task _Task = BaseDal.QueryFirst(x => x.TaskNum != task.TaskNum && x.TaskType == task.TaskType && x.SourceAddress == Sourcelocation.LocationCode && x.TargetAddress == Targetlocation.LocationCode);
+ if (_Task == null)
+ {
+ if (Targetlocation.CurrentQty == Targetlocation.MaxQty) Targetlocation.LocationStatus = LocationStatusEnum.Fullload.ObjToInt();
+ else Targetlocation.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ if (Sourcelocation.CurrentQty == 0) Sourcelocation.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ }
+ task.CurrentAddress = task.NextAddress;
+ task.NextAddress = string.Empty;
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+ Db.Ado.BeginTran();
+ _basicService.LocationInfoService.Repository.UpdateData(Sourcelocation);
+ _basicService.LocationInfoService.Repository.UpdateData(Targetlocation);
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ //BaseDal.DeleteAndMoveIntoHty(task, OperateType.鑷姩瀹屾垚);
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ Db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鏇存柊鍏ュ簱浠诲姟鐘舵�佸畬鎴�
/// </summary>
/// <param name="WMStask"></param>
/// <returns></returns>
@@ -289,42 +459,64 @@
WebResponseContent content = new WebResponseContent().OK();
try
{
- Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
- Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
+ Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);//缁勭洏搴撳瓨
+ Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);//璐т綅
var result = CheckCompleted(stockInfo, locationInfo);
if (!result.Item1) throw new Exception(result.Item2);
- if (stockInfo.StockStatus != StockStatusEmun.鍏ュ簱涓�.ObjToInt()) throw new Exception($"鎵樼洏[{task.PalletCode}],璇ョ粍鐩樼姸鎬佷笉鍙叆搴�");
- stockInfo.StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt();
- locationInfo.CurrentQty++;
- locationInfo.LocationStatus = locationInfo.MaxQty - locationInfo.CurrentQty == 0 ? LocationStatusEnum.Fullload.ObjToInt() : LocationStatusEnum.InStock.ObjToInt();
- using (TransactionScope scope = new TransactionScope())
- {
- BaseDal.UpdateData(task);
- _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
- scope.Complete();
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鏇存柊浠诲姟鐘舵�佹墽琛�
- /// </summary>
- /// <param name="WMStask"></param>
- /// <returns></returns>
- public WebResponseContent UpdateTaskStatusExecuting(Dt_Task task)
- {
- WebResponseContent content = new WebResponseContent().OK();
- try
- {
+
+ if (stockInfo.StockStatus != StockStatusEmun.鍏ュ簱涓�.ObjToInt()) throw new Exception($"鎵樼洏[{task.PalletCode}],璇ョ粍鐩樼姸鎬佷笉鍙叆搴�");
+ Dt_StockInfoDetail stockInfoDetail = stockInfo.Details.FirstOrDefault(x => x.StockId == stockInfo.Id);
+
+ #region 鍏ュ簱鍗�
+ Dt_InboundOrder inboundOrder = _inboundService.InbounOrderService.GetInboundOrder(stockInfoDetail.OrderNo);
+ if (inboundOrder == null || inboundOrder.Details == null) throw new Exception($"鏈壘鍒版墭鐩榌{task.PalletCode}]鐨勫叆搴撳崟鏄庣粏淇℃伅");
+ Dt_InboundOrderDetail inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfoDetail.BatchNo && x.MaterielCode == stockInfoDetail.MaterielCode);
+ inboundOrderDetail.OverInQuantity++;
+ inboundOrderDetail.OrderDetailStatus = inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity ? OrderDetailStatusEnum.Over.ObjToInt() : OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
+
+ if (inboundOrder.Details.FirstOrDefault(x => x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) == null)
+ {
+ inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ else if (inboundOrder.OrderStatus == InboundStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt();
+ }
+ #endregion
+
+ List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.Repository.LocationCodesGetStockInfos(new List<string> { stockInfo.LocationCode }).Where(x => x.StockStatus == StockStatusEmun.宸插叆搴�.ObjToInt()).ToList();
+ stockInfo.SerialNumber = stockInfos.Count + 1;
+ stockInfo.InDate = DateTime.Now;
+ stockInfo.StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt();
+ stockInfoDetail.Status = StockStatusEmun.宸插叆搴�.ObjToInt();
+ int beforeStatus = locationInfo.LocationStatus;
+ locationInfo.LocationStatus = locationInfo.MaxQty - locationInfo.CurrentQty == 0 ? LocationStatusEnum.Fullload.ObjToInt() : LocationStatusEnum.InStock.ObjToInt();
+ task.CurrentAddress = task.NextAddress;
+ task.NextAddress = string.Empty;
+ Db.Ado.BeginTran();
+ #region 浠诲姟鍜屽叆搴撳崟
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ if (inboundOrder.OrderStatus != InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ {
+ _inboundService.InbounOrderService.Repository.UpdateData(inboundOrder);
+ _inboundService.InboundOrderDetailService.Repository.UpdateData(inboundOrderDetail);
+ }
+ else
+ {
+ _inboundService.InbounOrderService.Repository.DeleteAndMoveIntoHty(inboundOrder, OperateType.鑷姩瀹屾垚);
+ _inboundService.InboundOrderDetailService.Repository.DeleteAndMoveIntoHty(inboundOrder.Details, OperateType.鑷姩瀹屾垚);
+ }
+ #endregion
+ _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
+ //_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
+ Db.Ado.CommitTran();
}
catch (Exception ex)
{
+ Db.Ado.RollbackTran();
content.Error(ex.Message);
}
return content;
--
Gitblit v1.9.3