From 74d6e3882b7d20291ad566b2d5703d0e703f5d27 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期三, 21 八月 2024 17:33:20 +0800
Subject: [PATCH] 1
---
WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 66 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs b/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
index d75ee2a..770d78a 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
@@ -1,4 +1,5 @@
-锘縰sing Quartz;
+锘縰sing Microsoft.AspNetCore.Components.Routing;
+using Quartz;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -81,7 +82,11 @@
/// <param name="e"></param>
private void CommonStackerCrane_StackerCraneTaskCompletedEventHandler(object? sender, WIDESEAWCS_QuartzJob.StackerCrane.StackerCraneTaskCompletedEventArgs e)
{
- _taskService.TaskCompleted(e.TaskNum);
+ Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
+ _taskService.StackCraneTaskCompleted(e.TaskNum);
+
+ CommonStackerCrane commonStackerCrane = sender as CommonStackerCrane;
+ commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
}
/// <summary>
@@ -108,23 +113,23 @@
task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
if (task != null)
{
- if (OutTaskStationIsOccupied(task) != null)
+ //if (OutTaskStationIsOccupied(task) != null)
{
return task;
}
- else
- {
- List<string> otherOutStaionCodes = _routerService.QueryRoutes(commonStackerCrane.DeviceCode, task.NextAddress).Select(x => x.ChildPosi).ToList();
- List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode, otherOutStaionCodes);
- foreach (var item in tasks)
- {
- if (OutTaskStationIsOccupied(task) != null)
- {
- return task;
- }
- }
- task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
- }
+ //else
+ //{
+ // List<string> otherOutStaionCodes = _routerService.QueryRoutes(commonStackerCrane.DeviceCode, task.NextAddress).Select(x => x.ChildPosi).ToList();
+ // List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode, otherOutStaionCodes);
+ // foreach (var item in tasks)
+ // {
+ // if (OutTaskStationIsOccupied(task) != null)
+ // {
+ // return task;
+ // }
+ // }
+ // task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
+ //}
}
}
}
@@ -138,10 +143,10 @@
/// <returns>濡傛灉鏈鍗犵敤锛岃繑鍥炰紶鍏ョ殑浠诲姟淇℃伅锛屽惁鍒欙紝杩斿洖null</returns>
private Dt_Task? OutTaskStationIsOccupied(Dt_Task task)
{
- Dt_Router? router = _routerService.QueryRoutes(task.Roadway, task.NextAddress).FirstOrDefault();
+ Dt_Router? router = _routerService.QueryNextRoutes(task.Roadway, task.NextAddress).FirstOrDefault();
if (router != null)
{
- IDevice? device = DevicesStorage.Devices.FirstOrDefault(x => x.DeviceCode == router.ChildPosiDeviceCode);
+ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == router.ChildPosiDeviceCode);
if (device != null)
{
CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
@@ -176,12 +181,11 @@
stackerCraneTaskCommand.TaskNum = task.TaskNum;
stackerCraneTaskCommand.WorkType = 1;
stackerCraneTaskCommand.TrayType = 0;
- if (Enum.TryParse(typeof(TaskInboundTypeEnum), task.TaskType.ToString(), out object? result))//鍒ゆ柇鏄惁鏄叆搴撲换鍔�
+ if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result))//鍒ゆ柇鏄惁鏄叆搴撲换鍔�
{
- List<Dt_Router> routers = _routerService.QueryRoutes(task.CurrentAddress, task.Roadway);
+ List<Dt_Router> routers = _routerService.QueryNextRoutes(task.CurrentAddress, task.Roadway);
if (routers.Count > 0)
{
-
stackerCraneTaskCommand.StartRow = Convert.ToInt16(routers.FirstOrDefault().SrmRow);
stackerCraneTaskCommand.StartColumn = Convert.ToInt16(routers.FirstOrDefault().SrmColumn);
stackerCraneTaskCommand.StartLayer = Convert.ToInt16(routers.FirstOrDefault().SrmLayer);
@@ -196,7 +200,8 @@
else
{
//鏁版嵁閰嶇疆閿欒
- throw new Exception();
+ _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鍏ュ簱浠诲姟缁堢偣閿欒锛岃捣鐐癸細銆恵task.NextAddress}銆�");
+ return null;
}
}
else
@@ -205,9 +210,9 @@
return null;
}
}
- else if (Enum.TryParse(typeof(TaskOutboundTypeEnum), task.TaskType.ToString(), out result))
+ else if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out result))
{
- List<Dt_Router> routers = _routerService.QueryRoutes(task.Roadway, task.TargetAddress);
+ List<Dt_Router> routers = _routerService.QueryNextRoutes(task.Roadway, task.TargetAddress);
if (routers.Count > 0)
{
stackerCraneTaskCommand.EndRow = Convert.ToInt16(routers.FirstOrDefault().SrmRow);
@@ -224,7 +229,8 @@
else
{
//鏁版嵁閰嶇疆閿欒
- throw new Exception();
+ _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鍑哄簱浠诲姟璧风偣閿欒锛岃捣鐐癸細銆恵task.CurrentAddress}銆�");
+ return null;
}
}
else
@@ -233,7 +239,7 @@
return null;
}
}
- else if (Enum.TryParse(typeof(TaskRelocationTypeEnum), task.TaskType.ToString(), out result))
+ else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result))
{
string[] targetCodes = task.NextAddress.Split("-");
if (targetCodes.Length == 3)
@@ -245,7 +251,8 @@
else
{
//鏁版嵁閰嶇疆閿欒
- throw new Exception();
+ _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"绉诲簱浠诲姟缁堢偣閿欒锛岃捣鐐癸細銆恵task.NextAddress}銆�");
+ return null;
}
string[] sourceCodes = task.CurrentAddress.Split("-");
if (sourceCodes.Length == 3)
@@ -257,10 +264,11 @@
else
{
//鏁版嵁閰嶇疆閿欒
- throw new Exception();
+ _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"绉诲簱浠诲姟璧风偣閿欒锛岃捣鐐癸細銆恵task.CurrentAddress}銆�");
+ return null;
}
}
- else if (Enum.TryParse(typeof(TaskOtherTypeEnum), task.TaskType.ToString(), out result))
+ else if (!int.TryParse(Enum.Parse<TaskOtherTypeEnum>(task.TaskType.ToString()).ToString(), out result))
{
}
--
Gitblit v1.9.3