From 5da3a276b7847187a7c155ee069d3cd4c9e58074 Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期日, 07 十二月 2025 23:28:14 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 281 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 233 insertions(+), 48 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 0852ea6..7ba3fa4 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,12 +149,12 @@
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;
dt_Task.RGVTaskType = (int)RGVTaskTypeEnum.PickingUp; //鍙栬揣
- dt_Task.RGVCurrentexecution = "0"; //鐩墠鏆傛棤
+ dt_Task.RGVCurrentexecution = ""; //鐩墠鏆傛棤
dt_Task.TaskState = (int)TaskInStatusEnum.RGV_InNew; //鐩墠鏆傛棤
dt_Task.SourceAddress = item.startAddress;
dt_Task.TargetAddress = item.endAddress;
@@ -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,19 +191,20 @@
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;
dt_Task.RGVTaskType = (int)RGVTaskTypeEnum.TravelingOnly; //鍙栬揣
- dt_Task.RGVCurrentexecution = "0"; //鐩墠鏆傛棤
+ dt_Task.RGVCurrentexecution = ""; //鐩墠鏆傛棤
dt_Task.TaskState = (int)TaskOutStatusEnum.OutNew; //鐩墠鏆傛棤
dt_Task.SourceAddress = item.startAddress;
- dt_Task.TargetAddress = "0";
+ dt_Task.TargetAddress = "";
dt_Task.CurrentAddress = gVStation.Motherinlaw.ToString();
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;
@@ -285,6 +292,8 @@
public Dt_Task ChildVehicleMission(AGVStation aGVStation)
{
+ Dt_Task dt_TasksUP = BaseDal.QueryFirst(x => x.Roadway == aGVStation.ChildPosiDeviceCode && (x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheExecuting || x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheFinish || x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheReleaseExecuting), TaskOrderBy);
+ if (dt_TasksUP != null) return null;
Dt_Task dt_Tasks2 = BaseDal.QueryFirst(x => x.Roadway == aGVStation.ChildPosiDeviceCode && x.CurrentAddress == aGVStation.MotherCardeputy.ToString() && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
if (dt_Tasks2 != null) return dt_Tasks2;
@@ -300,6 +309,11 @@
public Dt_Task GetFinhuoTask(string DeviceCode)
{
return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing, TaskOrderBy);
+ }
+
+ public Dt_Task ChacheGetFinhuoTask(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskOutStatusEnum.RGV_OutPickupExecuting, TaskOrderBy);
}
public Dt_Task GetOutkouFinhuoTask(string DeviceCode, string curraderr)
@@ -325,7 +339,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;
}
@@ -336,7 +356,7 @@
/// <param name="type">1锛氭煡鎵鹃渶瑕佸彇璐х殑浠诲姟 2锛氭煡鎵鹃渶瑕佹斁璐х殑浠诲姟</param>
public Dt_Task GetInkouFinhuoTask(string DeviceCode)
{
- return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.NextAddress != "" && x.TaskState == (int)TaskInStatusEnum.RGV_InPickupFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing, TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.NextAddress != "" && (x.TaskState == (int)TaskInStatusEnum.RGV_InPickupFinish || x.TaskState == (int)TaskInStatusEnum.InexceptionalSelection) && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing, TaskOrderBy);
}
/// <summary>
@@ -355,7 +375,7 @@
/// <returns></returns>
public Dt_Task MothermachinemovementTask2(string DeviceCode)
{
- return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarExecuting && x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly), TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarExecuting || x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish || x.TaskState == (int)TaskInStatusEnum.SC_InExecuting || x.TaskState == (int)TaskInStatusEnum.InFinish), TaskOrderBy);
}
/// <summary>
@@ -363,7 +383,7 @@
/// </summary>
public Dt_Task MothermacTask(string DeviceCode)
{
- return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarExecuting || x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish || x.TaskState == (int)TaskInStatusEnum.SC_InExecuting || x.TaskState == (int)TaskInStatusEnum.InFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly), TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarExecuting || x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish || x.TaskState == (int)TaskInStatusEnum.SC_InExecuting || x.TaskState == (int)TaskInStatusEnum.InFinish ), TaskOrderBy);
}
/// <summary>
@@ -411,8 +431,9 @@
/// <param name="DeviceCode"></param>
public Dt_Task ViceChariotPickupTask2(string DeviceCode)
{
- return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskInStatusEnum.RGV_InReleaseFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InZicheExecuting || x.TaskState == (int)TaskInStatusEnum.RGV_InZicheFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting || x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish) && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskInStatusEnum.RGV_InReleaseFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InZicheExecuting || x.TaskState == (int)TaskInStatusEnum.RGV_InZicheFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting || x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish), TaskOrderBy);
}
+
@@ -428,15 +449,20 @@
{
dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskInboundTypeEnum.Inbound && x.TaskState== (int)TaskInStatusEnum.InexceptionalSelection);
+ if (dt_Task == null) return webResponse.Error("鏈壘鍒伴渶瑕佷慨鏀圭殑浠诲姟锛屾棤闇�淇敼");
+ dt_Task.NextAddress = NextAddress;
+ BaseDal.UpdateData(dt_Task);
+ return webResponse.OK("浠诲姟鏀捐揣鍦板潃淇敼鎴愬姛");
}
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);
+ return webResponse.OK("浠诲姟鏀捐揣鍦板潃淇敼鎴愬姛");
}
- if (dt_Task == null) return webResponse.Error("鏈壘鍒伴渶瑕佷慨鏀圭殑浠诲姟锛屾棤闇�淇敼");
- dt_Task.NextAddress = NextAddress;
- BaseDal.UpdateData(dt_Task);
- return webResponse.OK("浠诲姟鏀捐揣鍦板潃淇敼鎴愬姛");
+
}
catch (Exception ex)
{
@@ -528,7 +554,7 @@
try
{
int oldState = task.TaskState;
- if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ if (task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.TaskState != (int)TaskInStatusEnum.InexceptionalSelection)
{
if (task.TaskState >= (int)TaskInStatusEnum.InFinish)
{
@@ -538,11 +564,6 @@
int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
task.TaskState = nextStatus;
- /*if (task.TaskState == (int)TaskInStatusEnum.RGV_InPickupExecuting) //褰撲笅鍙戝叆搴撳彛鍙栬揣涓紝鍒欒皟鍙栧叞鍓戞帴鍙�
- {
- TaskResultIn(task.TaskNum.ToString(),"",1,"");
- }*/
-
}
else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
@@ -552,6 +573,12 @@
}
int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
+
+ task.TaskState = nextStatus;
+ }
+ else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.TaskState== (int)TaskInStatusEnum.InexceptionalSelection)
+ {
+ int nextStatus = (int)TaskInStatusEnum.Inexcepjxz;
task.TaskState = nextStatus;
}
@@ -570,14 +597,15 @@
task.Modifier = "System";
BaseDal.UpdateData(task);
+
+
string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //鍓嶄竴涓姸鎬�
string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //鍚庝竴涓姸鎬�
string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //鍚庝竴涓姸鎬�
-
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ?
- $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣烦杞埌銆恵afterstaterem}銆�"
- : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣浆鍒般�恵afterstaterem}銆�");
+ $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣烦杞埌銆恵afterstaterem}銆�"
+ : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣浆鍒般�恵afterstaterem}銆�");
content = WebResponseContent.Instance.OK();
}
@@ -656,15 +684,56 @@
int oldState = task.TaskState;
Dt_TaskExecuteDetail taskExecuteDetail = null;
- if (task.NextAddress == "1061")
+ if(task.TaskState == (int)TaskInStatusEnum.RGV_InReleaseFinish && task.CurrentAddress == "1061" && (task.NextAddress == "1091" || task.NextAddress == "1081"))
{
- taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState > task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting && x.NextAddress== "1061" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else if (task.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting && task.CurrentAddress == "1021" && task.NextAddress == "1061")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheFinish && x.CurrentAddress == "1021" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else if (task.TaskState == (int)TaskInStatusEnum.RGV_InZicheFinish && task.CurrentAddress == "1021" && task.NextAddress == "1061")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheExecuting && x.CurrentAddress == "1021" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else if (task.TaskState == (int)TaskInStatusEnum.RGV_InZicheExecuting && task.CurrentAddress == "1021" && task.NextAddress == "1061")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskInStatusEnum.RGV_InReleaseFinish && x.CurrentAddress == "1021" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+
+
+ //鍑哄簱鍐呭
+ else if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutMothercarFinish && task.CurrentAddress == "1131" && task.NextAddress == "1171")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheReleaseExecuting && x.NextAddress == "1131" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheReleaseExecuting && (task.CurrentAddress == "1101" || task.CurrentAddress == "1121") && task.NextAddress == "1131")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheFinish && x.NextAddress == "1131" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheFinish && (task.CurrentAddress == "1101" || task.CurrentAddress == "1121") && task.NextAddress == "1131")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheExecuting && x.NextAddress == "1131" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheExecuting && (task.CurrentAddress == "1101" || task.CurrentAddress == "1121") && task.NextAddress == "1131")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState == (int)TaskOutStatusEnum.RGV_OutMothercarFinish && x.NextAddress == "1131" && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
}
else
{
taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
-
}
+
+
+
+ /*if (task.TaskState== (int)TaskInStatusEnum.RGV_InReleaseFinish && task.CurrentAddress == "1021" && task.NextAddress == "1061")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+
+ }else if(task.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting && task.CurrentAddress == "1021")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }*/
@@ -673,6 +742,15 @@
task.TaskState = taskExecuteDetail.TaskState;
task.CurrentAddress = taskExecuteDetail.CurrentAddress;
task.NextAddress = taskExecuteDetail.NextAddress;
+ task.RGVTaskType = taskExecuteDetail.RGVTaskType;
+ task.Roadway=taskExecuteDetail.Roadway;
+ }else if(task.TaskState == (int)TaskInStatusEnum.RGV_InPickupExecuting)
+ {
+ task.TaskState = (int)TaskInStatusEnum.RGV_InNew;
+ }
+ else if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutMothercarExecuting)
+ {
+ task.TaskState = (int)TaskOutStatusEnum.OutNew;
}
else
{
@@ -690,6 +768,7 @@
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId,
$"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldstaterem}銆戝洖褰掑埌銆恵afterstaterem}銆�");
+
content = WebResponseContent.Instance.OK();
}
@@ -773,13 +852,17 @@
try
{
- if (task.TaskType == (int)TaskInboundTypeEnum.Inbound) //姝ｅ父娴佺▼
+ if (task.TaskType == (int)TaskInboundTypeEnum.Inbound ) //姝ｅ父娴佺▼
{
- HandleInboundTask(task);
- }
- else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound && (task.NextAddress == "1001" || task.NextAddress == "1002"))
- {
- task.TaskState = (int)TaskInStatusEnum.RGV_InMothercarFinish;
+ if(task.NextAddress == "1001" || task.NextAddress == "1002")
+ {
+ task.TaskState = (int)TaskInStatusEnum.InFinish_exceptionalSelection;
+ }
+ else
+ {
+ HandleInboundTask(task);
+ }
+
}
else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
@@ -802,20 +885,31 @@
: $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣浆鍒般�恵afterstaterem}銆�");
- if (task.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish || task.TaskState == (int)TaskOutStatusEnum.OutFinish) //鍏ュ簱浠诲姟瀹屾垚
+ if (task.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish || task.TaskState == (int)TaskOutStatusEnum.OutFinish || task.TaskState == (int)TaskInStatusEnum.InFinish_exceptionalSelection) //鍏ュ簱浠诲姟瀹屾垚
{
if (task.NextAddress == "1001" || task.NextAddress == "1002")
{
+ AbnormalTask abnormalTask = _abnormalTask.QueryFirst(x=> x.TaskNum == task.TaskNum);
+
//寮傚父鎺掗櫎浠诲姟鏃讹紝寮傚父涓婃姤
+ TaskResultIn(task.LJTaskNum.ToString(), task.NextAddress, 3,abnormalTask.ErrorContent);
+ AutomaticTaskCompleted(task); //浠诲姟瀹屾垚
+ BaseDal.DeleteData(task);
}
else
{
- //姝ｅ父浠诲姟锛屾甯镐笂鎶�
- TaskResultIn(task.TaskNum.ToString(), "", 2, "");
- /*AutomaticTaskCompleted(task); //浠诲姟瀹屾垚
- BaseDal.DeleteData(task);*/
+ if(task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.NextAddress != "1001" && task.NextAddress != "1002")
+ {
+ TaskResultIn(task.LJTaskNum.ToString(), "", 2, "");
+ }
+ else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ {
+ TaskResultOut(task.LJTaskNum.ToString(), task.NextAddress, 2, "");
+ AutomaticTaskCompleted(task); //浠诲姟瀹屾垚
+ BaseDal.DeleteData(task);
+ }
}
}
@@ -1211,7 +1305,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)
@@ -1219,7 +1313,7 @@
dt_Task.TaskState = (int)TaskOutStatusEnum.OutNew;
BaseDal.UpdateData(dt_Task);
}
- }
+ }*/
expoReverse.code = 0;
}
else
@@ -1314,7 +1408,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
{
@@ -1389,11 +1483,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;
@@ -1412,10 +1508,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);
}
// 鍒涘缓骞惰祴鍊�
@@ -1506,6 +1604,26 @@
return WebResponseContent.Instance.Error($"{Remark}澶辫触锛�");
}
+ if (dt_task.NextAddress == "1001" || dt_task.NextAddress == "1002")
+ {
+ //寮傚父鎺掗櫎浠诲姟鏃讹紝寮傚父涓婃姤
+ 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.LJTaskNum.ToString(), "", 2, "鎵嬪姩瀹屾垚");
+ }
+ else if(dt_task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ {
+ TaskResultOut(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 2, "鎵嬪姩瀹屾垚");
+ }
+
+ }
+
+
var deletetask = BaseDal.DeleteData(dt_task);
if (deletetask == false)
{
@@ -1574,11 +1692,26 @@
db.Ado.RollbackTran();
return WebResponseContent.Instance.Error("鍙栨秷浠诲姟澶辫触锛�");
}
- /*int oldState = dt_task.TaskState;
- _taskExecuteDetailService.AddTaskExecuteDetail(
- dt_task.TaskId,
- $"鑷姩浠诲姟鐘舵�佷粠銆恵oldState}銆戣繘鍏ュ埌銆恵dt_Task_Hty.TaskState}銆�"
-);*/
+
+ if (dt_task.NextAddress == "1001" || dt_task.NextAddress == "1002")
+ {
+ //寮傚父鎺掗櫎浠诲姟鏃讹紝寮傚父涓婃姤
+ TaskResultIn(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 3, "浠诲姟鍙栨秷");
+ }
+ else
+ {
+
+ if (dt_task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ {
+ TaskResultIn(dt_task.LJTaskNum.ToString(), "", 3, "浠诲姟鍙栨秷");
+ }
+ else
+ {
+ TaskResultOut(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 3, "浠诲姟鍙栨秷");
+ }
+
+ }
+
bool deletetask = BaseDal.DeleteData(dt_task);
if (!deletetask)
@@ -1657,6 +1790,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