From cf1d3c24ed1ca4596d950a4dace9550bdaf8252c Mon Sep 17 00:00:00 2001
From: Zhang-Hong-Lin <a3219986988@163.com>
Date: 星期五, 07 三月 2025 10:10:55 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 140 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 117 insertions(+), 23 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index b2a0237..b89f4b0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -19,6 +19,7 @@
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
using WIDESEAWCS_Common.LocationEnum;
using WIDESEAWCS_Common.StockEnum;
using WIDESEAWCS_Common.TaskEnum;
@@ -46,7 +47,8 @@
private readonly IRepository<dt_batchInfo> _batchinfoRepository;
private readonly IRepository<Dt_Task_hty> _taskhtyRepository;
private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IRepository<dt_errorInfo> _errorinfoRepository;
+ private readonly IRepository<dt_errormsgInfo> _errorinfoRepository;
+ private readonly Idt_ErrormsginfoService _ErrormsginfoService;
private readonly IMapper _mapper;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -75,7 +77,8 @@
IRepository<Dt_LocationInfo> locationRepository,
IRepository<dt_batchInfo> batchRepository,
IRepository<Dt_Task_hty> taskhtyRepository,
- IRepository<dt_errorInfo> errorinfoRepository,
+ IRepository<dt_errormsgInfo> errorinfoRepository,
+ Idt_ErrormsginfoService errormsginfoService,
IUnitOfWorkManage unitOfWorkManage,
IMapper mapper) : base(BaseDal)
{
@@ -88,6 +91,7 @@
_taskhtyRepository = taskhtyRepository;
_unitOfWorkManage = unitOfWorkManage;
_errorinfoRepository = errorinfoRepository;
+ _ErrormsginfoService = errormsginfoService;
_mapper = mapper;
}
@@ -181,6 +185,17 @@
}
/// <summary>
+ /// 鏍规嵁浠诲姟鐘舵�佹煡璇换鍔�
+ /// </summary>
+ /// <param name="deviceNo">璁惧缂栧彿</param>
+ /// <param name="currentAddress">褰撳墠鍦板潃</param>
+ /// <returns></returns>
+ public Dt_Task QueryTaskState()
+ {
+ return BaseDal.QueryFirst(x => x.TaskState== (int)TaskInStatusEnum.InNew );
+ }
+
+ /// <summary>
/// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟
/// </summary>
/// <param name="deviceNo">璁惧缂栧彿</param>
@@ -248,19 +263,30 @@
//浼樺厛杩斿洖鎵ц鍒颁竴鍗婄殑浠诲姟缁х画鎵ц
return task;
}
+ else {
+ //鏌ヨ澶╄溅绉诲姩浠诲姟
+ task = BaseDal.QueryFirst(v => v.TaskType == (int)TaskMoveEnum.Mowe && v.TaskState == (int)TaskMoveStatusEnum.OutNewMove);
+ if (task!=null)
+ {
+ return task;
+ }
+ }
//鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁瀛樺湪鐘舵�佷负闈炴柊寤虹殑
- task= BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew || v.TaskState != (int)TaskOutStatusEnum.OutNew);
- if (task != null)
+ //task= BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew || v.TaskState != (int)TaskOutStatusEnum.OutNew);
+ //if (task != null)
+ //{
+ // throw new Exception($"褰撳墠浠诲姟姹犱腑瀛樺湪鎵ц涓殑浠诲姟,浠诲姟鍙�:銆恵task.TaskNum}銆�");
+ //}
+ if (task.TaskState!= (int)TaskMoveStatusEnum.OutNewMove)
{
- throw new Exception($"褰撳墠浠诲姟姹犱腑瀛樺湪鎵ц涓殑浠诲姟,浠诲姟鍙�:銆恵task.TaskNum}銆�");
- }
- if (workTpe.Equals("In"))
- {
- task = BaseDal.QueryData(v=>v.TaskType==(int)TaskInboundTypeEnum.Inbound && v.TaskState==(int)TaskInStatusEnum.InNew).OrderBy(v=>v.CreateDate).First();
- }
- else if (workTpe.Equals("Out"))
- {
- task = BaseDal.QueryData(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
+ if (workTpe.Equals("In"))
+ {
+ task = BaseDal.QueryData(v => v.TaskType == (int)TaskInboundTypeEnum.Inbound && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
+ }
+ else if (workTpe.Equals("Out"))
+ {
+ task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
+ }
}
}
catch (Exception)
@@ -307,7 +333,7 @@
/// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
public Dt_Task QueryTakNnmTask(int taskNum)
{
- return BaseDal.QueryFirst(v=>v.TaskNum== taskNum);
+ return BaseDal.QueryFirst(v=>v.TaskId== taskNum);
}
/// <summary>
/// 淇敼澶╄溅浠诲姟鐘舵�侊紝灏嗗叆搴撳彇璐ф墽琛屼腑淇敼涓哄叆搴撳彇璐у畬鎴�
@@ -325,6 +351,7 @@
catch (Exception ex)
{
content = WebResponseContent.Instance.Error(ex.Message);
+ UpdateTaskExceptionMessage(task.TaskNum, ex.Message);
}
return content;
}
@@ -345,6 +372,7 @@
catch (Exception ex)
{
content = WebResponseContent.Instance.Error(ex.Message);
+ UpdateTaskExceptionMessage(task.TaskNum, ex.Message);
}
return content;
}
@@ -409,7 +437,7 @@
{
task.TaskState = (int)TaskInStatusEnum.Line_InGrabExecuting;
}
- else if (status == 2 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
{
task.TaskState = (int)TaskOutStatusEnum.Line_OutGrabExecuting;
}
@@ -417,16 +445,20 @@
{
task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting;
}
- else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
{
task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
+ }
+ else if(status == 4 && task.TaskType == (int)TaskMoveEnum.Mowe)
+ {
+ task.TaskState = (int)TaskMoveStatusEnum.Line_OutMove;
}
task.ModifyDate = DateTime.Now;
BaseDal.UpdateData(task);
}
catch (Exception ex)
{
-
+ UpdateTaskExceptionMessage(taskNum, ex.Message);
}
}
@@ -560,7 +592,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- var nawtask = BaseDal.QueryFirst(v=>v.TaskNum== taskNum);
+ var nawtask = BaseDal.QueryFirst(v=>v.TaskId== taskNum);
if (nawtask == null)
{
throw new Exception(string.Format("澶╄溅鏀捐揣瀹屾垚浠诲姟鏈煡璇㈠埌浠诲姟鍙穥0}", taskNum));
@@ -572,11 +604,35 @@
Dt_StockInfo stock = new Dt_StockInfo();
stock.LocationCode = nawtask.TargetAddress;
stock.Weight = (decimal)weight;
- stock.StockStatus = (int)stockEnum.Lock;
- stock.BatchNo = batck.Batch;
+ stock.StockStatus = (int)stockEnum.Free;
+ stock.BatchNo = batck.InBatch;
+ if (nawtask.Remark== (int)MateTypeEnum.ZiChan)
+ {
+ stock.Remark = (int)MateTypeEnum.ZiChan;
+ }
+ else
+ {
+ stock.Remark = (int)MateTypeEnum.WaiGou;
+ }
+ Dt_StockInfo stockTow = new Dt_StockInfo();
+ stockTow.LocationCode = nawtask.NextAddress;
+ stockTow.Weight = (decimal)weight;
+ stockTow.StockStatus = (int)stockEnum.Free;
+ stockTow.BatchNo = batck.InBatch;
+ if (nawtask.Remark == (int)MateTypeEnum.ZiChan)
+ {
+ stockTow.Remark = (int)MateTypeEnum.ZiChan;
+ }
+ else
+ {
+ stockTow.Remark = (int)MateTypeEnum.WaiGou;
+ }
//淇敼璐т綅淇℃伅
var location = _locationRepository.QueryFirst(v=>v.LocationCode==nawtask.TargetAddress);
location.LocationStatus = (int)LocationStatusEnum.InStock;
+ //淇敼璐т綅淇℃伅
+ var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+ locationtow.LocationStatus = (int)LocationStatusEnum.InStock;
//澶勭悊浠诲姟淇℃伅
Dt_Task_hty taskhty = new Dt_Task_hty();
taskhty.TaskNum = nawtask.TaskNum;
@@ -589,10 +645,15 @@
taskhty.Grade = nawtask.Grade;
taskhty.Dispatchertime = nawtask.Dispatchertime;
taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
//寮�濮嬫暟鎹簱浜嬪姟
_unitOfWorkManage.BeginTran();
_stockRepository.AddData(stock);
+ _stockRepository.AddData(stockTow);
_locationRepository.UpdateData(location);
+ _locationRepository.UpdateData(locationtow);
_taskhtyRepository.AddData(taskhty);
BaseDal.DeleteData(nawtask);
//鎻愪氦浜嬪姟
@@ -601,30 +662,63 @@
else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
//鏌ユ壘搴撳瓨
- var stock = _stockRepository.QueryFirst(v=>v.LocationCode== nawtask.TargetAddress);
+ var stock = _stockRepository.QueryFirst(v=>v.LocationCode== nawtask.SourceAddress);
if (stock == null)
{
throw new Exception($"鏈壘鍒板簱瀛樹俊鎭揣浣嶅彿:銆恵nawtask.TargetAddress}銆�");
}
+ var Towstock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
//淇敼璐т綅鐘舵��
- var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.TargetAddress);
+ var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
location.LocationStatus = (int)LocationStatusEnum.Free;
+ //淇敼璐т綅鐘舵��
+ var locationTow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+ locationTow.LocationStatus = (int)LocationStatusEnum.Free;
//鍑嗗鍘嗗彶浠诲姟鏁版嵁
Dt_Task_hty taskhty = new Dt_Task_hty();
taskhty.TaskNum = nawtask.TaskNum;
taskhty.Roadway = nawtask.Roadway;
taskhty.TaskType = nawtask.TaskType;
- taskhty.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
taskhty.SourceAddress = nawtask.SourceAddress;
taskhty.TargetAddress = nawtask.TargetAddress;
taskhty.ExceptionMessage = nawtask.ExceptionMessage;
taskhty.Grade = nawtask.Grade;
taskhty.Dispatchertime = nawtask.Dispatchertime;
taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
//寮�濮嬫暟鎹簱浜嬪姟
_unitOfWorkManage.BeginTran();
_stockRepository.DeleteData(stock);
+ _stockRepository.DeleteData(Towstock);
_locationRepository.UpdateData(location);
+ _locationRepository.UpdateData(locationTow);
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
+ }
+ else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe)
+ {
+ //澶勭悊浠诲姟淇℃伅
+ Dt_Task_hty taskhty = new Dt_Task_hty();
+ taskhty.TaskNum = nawtask.TaskNum;
+ taskhty.Roadway = nawtask.Roadway;
+ taskhty.TaskType = nawtask.TaskType;
+ taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ taskhty.SourceAddress = nawtask.SourceAddress;
+ taskhty.TargetAddress = nawtask.TargetAddress;
+ taskhty.ExceptionMessage = nawtask.ExceptionMessage;
+ taskhty.Grade = nawtask.Grade;
+ taskhty.Dispatchertime = nawtask.Dispatchertime;
+ taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
+ //寮�濮嬫暟鎹簱浜嬪姟
+ _unitOfWorkManage.BeginTran();
_taskhtyRepository.AddData(taskhty);
BaseDal.DeleteData(nawtask);
//鎻愪氦浜嬪姟
--
Gitblit v1.9.3