From 29f20b28392d212c04c0c40a512894f8622cfa53 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 16 四月 2025 09:32:01 +0800
Subject: [PATCH] 合并
---
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 72 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
index 3f5ed0b..2cf031e 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
@@ -1,8 +1,7 @@
锘縰sing Mapster;
-using Newtonsoft.Json;
+using Masuit.Tools;
using Quartz;
using System.Diagnostics.CodeAnalysis;
-using System.Text;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
@@ -60,7 +59,6 @@
{
try
{
-
CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
if (commonStackerCrane != null)
{
@@ -75,7 +73,20 @@
if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
{
- Dt_Task? task = GetTask(commonStackerCrane);
+ Dt_Task? task = null;
+ if (commonStackerCrane.DeviceName.Contains("闈欑疆"))
+ {
+ if (StaticVariable.isLineRun)
+ {
+ StaticVariable.isStackerRun = false;
+ task = GetTask(commonStackerCrane);
+ }
+ }
+ else
+ {
+ task = GetTask(commonStackerCrane);
+ }
+
if (task != null)
{
StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
@@ -92,15 +103,15 @@
bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand);
if (sendFlag)
{
- StringBuilder builder = new StringBuilder();
- builder.AppendLine();
- builder.AppendLine($"銆恵commonStackerCrane.DeviceName}銆戝爢鍨涙満鐘舵�侊細銆恵commonStackerCrane.StackerCraneStatusDes}銆�,鏃堕棿锛氥�恵DateTime.Now}銆�");
- builder.AppendLine($"銆恵commonStackerCrane.DeviceName}銆戞墜鑷姩鐘舵�侊細銆恵commonStackerCrane.StackerCraneAutoStatusDes}銆�,鏃堕棿锛氥�恵DateTime.Now}銆�");
- builder.AppendLine($"銆恵commonStackerCrane.DeviceName}銆戜綔涓氱姸鎬侊細銆恵commonStackerCrane.StackerCraneWorkStatusDes}銆�,鏃堕棿锛氥�恵DateTime.Now}銆�");
- builder.AppendLine($"銆恵commonStackerCrane.DeviceName}銆戜笅鍙戜换鍔℃垚鍔�,銆恵JsonConvert.SerializeObject(stackerCraneTaskCommand, Formatting.Indented)}銆�");
- builder.AppendLine($"鏃堕棿锛氥�恵DateTime.Now}銆�");
- builder.AppendLine();
- ConsoleHelper.WriteColorLine(builder, ConsoleColor.Blue);
+ //StringBuilder builder = new StringBuilder();
+ //builder.AppendLine();
+ //builder.AppendLine($"銆恵commonStackerCrane.DeviceName}銆戝爢鍨涙満鐘舵�侊細銆恵commonStackerCrane.StackerCraneStatusDes}銆�,鏃堕棿锛氥�恵DateTime.Now}銆�");
+ //builder.AppendLine($"銆恵commonStackerCrane.DeviceName}銆戞墜鑷姩鐘舵�侊細銆恵commonStackerCrane.StackerCraneAutoStatusDes}銆�,鏃堕棿锛氥�恵DateTime.Now}銆�");
+ //builder.AppendLine($"銆恵commonStackerCrane.DeviceName}銆戜綔涓氱姸鎬侊細銆恵commonStackerCrane.StackerCraneWorkStatusDes}銆�,鏃堕棿锛氥�恵DateTime.Now}銆�");
+ //builder.AppendLine($"銆恵commonStackerCrane.DeviceName}銆戜笅鍙戜换鍔℃垚鍔�,銆恵JsonConvert.SerializeObject(stackerCraneTaskCommand, Formatting.Indented)}銆�");
+ //builder.AppendLine($"鏃堕棿锛氥�恵DateTime.Now}銆�");
+ //builder.AppendLine();
+ //ConsoleHelper.WriteColorLine(builder, ConsoleColor.Blue);
commonStackerCrane.LastTaskType = task.TaskType;
_taskService.UpdateTaskStatusToNext(task.TaskNum);
}
@@ -144,7 +155,10 @@
ConsoleHelper.WriteErrorLine($"{ex.Message}");
//Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
}
- //WriteDebug("CommonConveyorLineJob", "test");
+ finally
+ {
+ StaticVariable.isStackerRun = true;
+ }
return Task.CompletedTask;
}
@@ -192,12 +206,12 @@
}
var content = _taskService.StackCraneTaskCompleted(e.TaskNum);
- if (commonStackerCrane.DeviceCode.Contains("CH") && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ if ((commonStackerCrane.DeviceCode.Contains("CH") || commonStackerCrane.DeviceCode.Contains("JZ")) && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
task = _taskRepository.QueryFirst(x => x.TaskNum == e.TaskNum);
Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
}
- if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && (task.TargetAddress == "002-021-001" || task.TargetAddress == "001-021-001"))
+ if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && (task.TargetAddress == "002-071-001" || task.TargetAddress == "001-061-001"))
{
var TASKHTY = task.Adapt<Dt_Task_Hty>();
_taskRepository.DeleteData(task);
@@ -218,7 +232,7 @@
/// <returns></returns>
private Dt_Task? GetTask(CommonStackerCrane commonStackerCrane)
{
- Dt_Task task;
+ Dt_Task task = null;
if (commonStackerCrane.LastTaskType == null)
{
task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
@@ -266,6 +280,22 @@
return task;
}
+ #region 闈欑疆鍑哄簱鍒ゆ柇鏄惁鑳芥墽琛屼换鍔�
+
+ if (!task.IsNullOrEmpty() && task.Roadway.Contains("JZ") && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ {
+ // 鏌ヨ鏄惁瀛樺湪闈欑疆鍏ュ簱浠诲姟
+ var inJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway &&
+ (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting ||
+ x.TaskState == (int)TaskInStatusEnum.SC_InExecuting ||
+ x.TaskState == (int)TaskInStatusEnum.Line_InFinish));
+
+ ConsoleHelper.WriteErrorLine($"褰撳墠闈欑疆绾夸綋瀛樺湪鍏ュ簱浠诲姟{inJZTask.Count()}鏉�,{(inJZTask.Count() > 0 ? "鍙叆搴�" : "涓嶅彲鍏ュ簱")}");
+ if (!inJZTask.IsNullOrEmpty())
+ return null;
+ }
+
+ #endregion 闈欑疆鍑哄簱鍒ゆ柇鏄惁鑳芥墽琛屼换鍔�
}
else if (task == null)
{
@@ -309,7 +339,7 @@
IDevice? device = null;
if (task.Roadway.Contains("GW"))
{
- device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1015");
+ device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1004");
if (device != null)
{
CommonConveyorLine_GW conveyorLine = (CommonConveyorLine_GW)device;
@@ -328,7 +358,7 @@
}
else
{
- if ((task.NextAddress == ("002-021-001") || task.NextAddress == ("001-021-001")) && task.Roadway.Contains("JZ"))
+ if ((task.NextAddress == ("002-071-001") || task.NextAddress == ("001-061-001")) && (task.Roadway.Contains("CH")|| task.Roadway.Contains("JZ")))
{
return task;
}
@@ -414,7 +444,7 @@
{
var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
var valueList = value.Split(',').ToList();
- if ((valueList.Contains(task.SourceAddress)) && task.Roadway.Contains("CH")||task.Roadway.Contains("JZ"))
+ if ((valueList.Contains(task.SourceAddress)) && (task.Roadway.Contains("CH") || task.Roadway.Contains("JZ")))
{
string[] souredCodes = task.CurrentAddress.Split("-");
if (souredCodes.Length == 3)
@@ -488,7 +518,7 @@
}
else
{
- if ((task.TargetAddress == "002-021-001" || task.TargetAddress == "001-021-001") && task.Roadway.Contains("JZ"))
+ if ((task.TargetAddress == "002-071-001" || task.TargetAddress == "001-061-001") && (task.Roadway.Contains("JZ") || task.Roadway.Contains("CH")))
{
string[] endCodes = task.NextAddress.Split("-");
stackerCraneTaskCommand.EndRow = Convert.ToInt16(endCodes[0]);
--
Gitblit v1.9.3