From 28110912ca4803e5793f181517d7bf2d7a5ea2ad Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期五, 05 十二月 2025 00:32:49 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 107 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 90 insertions(+), 17 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 3e59d2f..6d401d7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -51,9 +51,11 @@
using WIDESEA_Common.Log;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Utilities;
+using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.Enum;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_ISystemServices;
@@ -65,6 +67,7 @@
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_TaskInfoRepository;
using static Microsoft.IO.RecyclableMemoryStreamManager;
using static System.Net.Mime.MediaTypeNames;
@@ -80,6 +83,7 @@
private readonly IMapper _mapper;
private readonly IEquipmentStatusService _equipmentStatus;
private readonly IAgvStationService _gvStationService;
+ private readonly IRepository<AbnormalTask> _abnormalTask;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -94,7 +98,7 @@
public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList();
- public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, IRouterRepository routerRepository, IEquipmentStatusService equipmentStatus, IAgvStationService agvStationService) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, IRouterRepository routerRepository, IEquipmentStatusService equipmentStatus, IAgvStationService agvStationService, IRepository<AbnormalTask> abnormalTask) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -104,6 +108,7 @@
_routerRepository = routerRepository;
_equipmentStatus = equipmentStatus;
_gvStationService = agvStationService;
+ _abnormalTask = abnormalTask;
}
/// <summary>
@@ -144,7 +149,7 @@
if (item.type == 1) //鍏ュ簱
{
Dt_Task dt_Task = new Dt_Task();
- dt_Task.TaskNum = item.taskNo;
+ dt_Task.TaskNum = BaseDal.GetTaskNo().Result;
dt_Task.PalletCode = item.containerNo; //鏆傛棤
dt_Task.Roadway = "RGV101";
dt_Task.TaskType = (int)TaskInboundTypeEnum.Inbound;
@@ -157,6 +162,7 @@
dt_Task.NextAddress = ""; //鐩墠鏆傛棤
dt_Task.Grade = item.priority;
dt_Task.WMSId = 0; //鐩墠鏆傛棤
+ dt_Task.LJTaskNum= item.taskNo;
BaseDal.AddData(dt_Task);
content.code = 0;
@@ -185,7 +191,7 @@
AGVStation gVStation = _gvStationService.Corridorequipment(roadway);
Dt_Task dt_Task = new Dt_Task();
- dt_Task.TaskNum = item.taskNo;
+ dt_Task.TaskNum = BaseDal.GetTaskNo().Result;
dt_Task.PalletCode = item.containerNo; //鏆傛棤
dt_Task.Roadway = roadway;
dt_Task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
@@ -198,6 +204,7 @@
dt_Task.NextAddress = gVStation.ZicheMotherinlaw.ToString(); //鐩墠鏆傛棤
dt_Task.Grade = item.priority;
dt_Task.WMSId = 0; //鐩墠鏆傛棤
+ dt_Task.LJTaskNum = item.taskNo;
BaseDal.AddData(dt_Task);
content.code = 0;
@@ -330,7 +337,13 @@
/// <param name="type">1锛氭煡鎵鹃渶瑕佸彇璐х殑浠诲姟</param>
public Dt_Task PickupWarehouse(string DeviceCode)
{
- return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InNew && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ Dt_Task _Task = BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskInStatusEnum.Inexcepjxz || x.TaskState == (int)TaskInStatusEnum.InAbnormalFinish || x.TaskState == (int)TaskInStatusEnum.InexceptionalSelection || x.TaskState == (int)TaskInStatusEnum.InFinish_exceptionalSelection
+ || x.TaskState == (int)TaskInStatusEnum.InAbnormalFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InPickupExecuting || x.TaskState == (int)TaskInStatusEnum.RGV_InPickupFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InReleaseExecuting || x.TaskState == (int)TaskInStatusEnum.RGV_InReleaseFinish));
+ if (_Task == null)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InNew && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ }
+ return null;
}
@@ -441,7 +454,7 @@
}
else
{
- dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskOutboundTypeEnum.Outbound && x.NextAddress == "");
+ dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskOutboundTypeEnum.Outbound && x.NextAddress == ""&&x.TaskState == (int)TaskOutStatusEnum.RGV_OutPickupFinish);
if (dt_Task == null) return webResponse.Error("鏈壘鍒伴渶瑕佷慨鏀圭殑浠诲姟锛屾棤闇�淇敼");
dt_Task.NextAddress = NextAddress;
BaseDal.UpdateData(dt_Task);
@@ -875,8 +888,10 @@
if (task.NextAddress == "1001" || task.NextAddress == "1002")
{
+ AbnormalTask abnormalTask = _abnormalTask.QueryFirst(x=> x.TaskNum == task.TaskNum);
+
//寮傚父鎺掗櫎浠诲姟鏃讹紝寮傚父涓婃姤
- TaskResultIn(task.TaskNum.ToString(), task.NextAddress, 3, "");
+ TaskResultIn(task.LJTaskNum.ToString(), task.NextAddress, 3,abnormalTask.ErrorContent);
AutomaticTaskCompleted(task); //浠诲姟瀹屾垚
BaseDal.DeleteData(task);
}
@@ -885,11 +900,13 @@
if(task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.NextAddress != "1001" && task.NextAddress != "1002")
{
- TaskResultIn(task.TaskNum.ToString(), "", 2, "");
+ TaskResultIn(task.LJTaskNum.ToString(), "", 2, "");
}
else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
- TaskResultOut(task.TaskNum.ToString(), task.NextAddress, 2, "");
+ TaskResultOut(task.LJTaskNum.ToString(), task.NextAddress, 2, "");
+ AutomaticTaskCompleted(task); //浠诲姟瀹屾垚
+ BaseDal.DeleteData(task);
}
}
@@ -1286,7 +1303,7 @@
}
else if (item.type == "put") //鏀捐揣
{
-/* if (item.status == 2) //鍫嗗灈鏈烘墽琛屼腑
+/* if (item.status == 2) //鍫嗗灈鏈烘墽琛屼腑
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskOutboundTypeEnum.Outbound && x.TaskState == (int)TaskOutStatusEnum.OutNewLj && x.Roadway == item.rgvTag);
if (dt_Task != null)
@@ -1389,7 +1406,7 @@
_task_HtyService.AddTaskHty(dt_Task);
BaseDal.DeleteData(dt_Task);
expoReverse.code = 0;
- WriteLog.Write_Log("浠诲姟鍙栨秷淇℃伅", "浠诲姟鍙栨秷", "淇℃伅", $"浠诲姟鍙凤細{dt_Task.TaskNum}锛屽凡鍙栨秷");
+ WriteLog.Write_Log("鍏板墤璋冨彇浠诲姟鍙栨秷淇℃伅", "浠诲姟鍙栨秷", "淇℃伅", $"浠诲姟鍙凤細{dt_Task.TaskNum}锛屽凡鍙栨秷");
}
else
{
@@ -1464,11 +1481,13 @@
StkRunStatusReturns LJReturns = HttpHelper.Post<StkRunStatusReturns>(urlLanJianWCSAPI + LanJiantaskResult, reception, "浠诲姟鍙嶉鎺ュ彛");
if (LJReturns.code == 0)
{
+ WriteLog.Write_Log("鍏ュ簱浠诲姟涓婁紶鎯呭喌", "姝ｅ父涓婁紶", "鍐呭淇℃伅", $"浠诲姟缂栧彿锛歿taskNo},鐩爣鍦板潃锛歿finalAddress}锛屼笂浼犵姸鎬侊細{status}锛屼俊鎭唴瀹癸細{remark}");
responseContent.OK("涓婁紶鎴愬姛");
}
else
{
- responseContent.OK("涓婁紶澶辫触锛屽師鍥狅細" + LJReturns.msg);
+ WriteLog.Write_Log("鍏ュ簱浠诲姟涓婁紶鎯呭喌", "涓婁紶澶辫触", "鍐呭淇℃伅", $"浠诲姟缂栧彿锛歿taskNo},鐩爣鍦板潃锛歿finalAddress}锛屼笂浼犵姸鎬侊細{status}锛屼俊鎭唴瀹癸細{remark}=====銆嬩笂浼犲け璐ワ紝鍘熷洜锛歿LJReturns.msg}");
+ responseContent.Error("涓婁紶澶辫触锛屽師鍥狅細" + LJReturns.msg);
}
// 鍒涘缓骞惰祴鍊�
return responseContent;
@@ -1487,10 +1506,12 @@
StkRunStatusReturns LJReturns = HttpHelper.Post<StkRunStatusReturns>(urlLanJianWCSAPI + LanJiantaskResult, reception, "浠诲姟鍙嶉鎺ュ彛");
if (LJReturns.code == 0)
{
+ WriteLog.Write_Log("鍑哄簱浠诲姟涓婁紶鎯呭喌", "姝ｅ父涓婁紶", "鍐呭淇℃伅", $"浠诲姟缂栧彿锛歿taskNo},鐩爣鍦板潃锛歿finalAddress}锛屼笂浼犵姸鎬侊細{status}锛屼俊鎭唴瀹癸細{remark}");
responseContent.OK("涓婁紶鎴愬姛");
}
else
{
+ WriteLog.Write_Log("鍑哄簱浠诲姟涓婁紶鎯呭喌", "涓婁紶澶辫触", "鍐呭淇℃伅", $"浠诲姟缂栧彿锛歿taskNo},鐩爣鍦板潃锛歿finalAddress}锛屼笂浼犵姸鎬侊細{status}锛屼俊鎭唴瀹癸細{remark}=====銆嬩笂浼犲け璐ワ紝鍘熷洜锛歿LJReturns.msg}");
responseContent.OK("涓婁紶澶辫触锛屽師鍥狅細" + LJReturns.msg);
}
// 鍒涘缓骞惰祴鍊�
@@ -1584,18 +1605,18 @@
if (dt_task.NextAddress == "1001" || dt_task.NextAddress == "1002")
{
//寮傚父鎺掗櫎浠诲姟鏃讹紝寮傚父涓婃姤
- TaskResultIn(dt_task.TaskNum.ToString(), dt_task.NextAddress, 3, "鎵嬪姩瀹屾垚");
+ TaskResultIn(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 3, "鎵嬪姩瀹屾垚");
}
else
{
if (dt_task.TaskType == (int)TaskInboundTypeEnum.Inbound && dt_task.NextAddress != "1001" && dt_task.NextAddress != "1002")
{
- TaskResultIn(dt_task.TaskNum.ToString(), "", 2, "鎵嬪姩瀹屾垚");
+ TaskResultIn(dt_task.LJTaskNum.ToString(), "", 2, "鎵嬪姩瀹屾垚");
}
else if(dt_task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
- TaskResultOut(dt_task.TaskNum.ToString(), dt_task.NextAddress, 2, "鎵嬪姩瀹屾垚");
+ TaskResultOut(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 2, "鎵嬪姩瀹屾垚");
}
}
@@ -1673,18 +1694,18 @@
if (dt_task.NextAddress == "1001" || dt_task.NextAddress == "1002")
{
//寮傚父鎺掗櫎浠诲姟鏃讹紝寮傚父涓婃姤
- TaskResultIn(dt_task.TaskNum.ToString(), dt_task.NextAddress, 3, "浠诲姟鍙栨秷");
+ TaskResultIn(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 3, "浠诲姟鍙栨秷");
}
else
{
if (dt_task.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
- TaskResultIn(dt_task.TaskNum.ToString(), "", 3, "浠诲姟鍙栨秷");
+ TaskResultIn(dt_task.LJTaskNum.ToString(), "", 3, "浠诲姟鍙栨秷");
}
else
{
- TaskResultOut(dt_task.TaskNum.ToString(), dt_task.NextAddress, 3, "浠诲姟鍙栨秷");
+ TaskResultOut(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 3, "浠诲姟鍙栨秷");
}
}
@@ -1767,6 +1788,58 @@
}
+ /// <summary>
+ /// 浠诲姟寮傚父瀹屾垚锛堝啓鍏ュ紓甯镐俊鎭悗锛屾爣璁板紓甯稿畬鎴愶級
+ /// </summary>
+ public WebResponseContent AbnormalComplete(AbnormalCompleteDTO completeDTO)
+ {
+ try
+ {
+ Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskNum == completeDTO.taskNum).FirstOrDefault();
+ if (dt_task == null) return WebResponseContent.Instance.Error($"鏈煡璇㈠埌浠诲姟");
+ dt_task.NextAddress = completeDTO.station;
+ dt_task.TargetAddress = completeDTO.station;
+
+ //寮傚父鎺掗櫎浠诲姟鏃讹紝寮傚父涓婃姤
+ WebResponseContent webResponse = TaskResultIn(dt_task.LJTaskNum.ToString(), completeDTO.station, 3, completeDTO.message);
+ if (webResponse.Status == false)
+ {
+ return webResponse;
+ }
+
+ var db = BaseDal.Db as SqlSugarClient;
+
+ db.Ado.BeginTran();
+ BaseDal.DeleteData(dt_task);
+ var res = _task_HtyService.AddData(new Dt_Task_hty
+ {
+ TaskNum = dt_task.TaskNum,
+ PalletCode = dt_task.PalletCode,
+ Roadway = dt_task.Roadway,
+ TaskType = dt_task.TaskType,
+ TaskState = dt_task.TaskState,
+ SourceAddress = dt_task.SourceAddress,
+ TargetAddress = dt_task.TargetAddress,
+ CurrentAddress = dt_task.CurrentAddress,
+ NextAddress = dt_task.NextAddress,
+ WMSId = dt_task.WMSId,
+ Dispatchertime = dt_task.Dispatchertime,
+ Remark = "浜哄伐鎵嬪姩寮傚父鎺掑嚭",
+ Creater = App.User.UserName,
+ CreateDate = DateTime.Now,
+ RGVTaskType = dt_task.RGVTaskType,
+ RGVCurrentexecution = dt_task.RGVCurrentexecution
+ });
+ //鎻愪氦浜嬪姟
+ db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK("浜哄伐鎵嬪姩鎺掑嚭鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.ToString());
+ }
+ }
+
}
--
Gitblit v1.9.3