From b31d961a3f0bcd2e555ea12b76c30c453826deba Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 28 七月 2025 09:42:58 +0800
Subject: [PATCH] 代码提交
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 72 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 18 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 894c017..379dac1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -26,6 +26,8 @@
using WIDESEAWCS_Model.BasicInfo;
using WIDESEAWCS_Tasks.RGVJob;
using WIDESEAWCS_Tasks.ConveyorLineJob;
+using WIDESEAWCS_TaskInfoRepository;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
namespace WIDESEAWCS_Tasks
{
@@ -112,17 +114,32 @@
var userTokenIds = tokenInfos?.Select(x => x.Token_ID).ToList();
var userIds = tokenInfos?.Select(x => x.UserId).ToList();
+ string StackerCraneAutoStatus(bool AutoStatus) => AutoStatus switch
+ {
+ true => "鑱旀満妯″紡",
+ false => "鍗曟満妯″紡",
+ };
+ string StackerCraneWorkStatus(bool WorkStatus) => WorkStatus switch
+ {
+ true => "杩愯涓�",
+ false => "寰呮満",
+ };
+ string StackerCraneStatus(bool Status) => Status switch
+ {
+ true => "鏁呴殰",
+ false => "姝ｅ父",
+ };
object obj = new
{
- Automatic = commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Automatic),
- Fault = commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Fault),
- Running = commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Running),
- //commonStackerCrane.StackerCraneAutoStatusDes,
- //commonStackerCrane.StackerCraneWorkStatusDes,
- //commonStackerCrane.DeviceCode,
- //commonStackerCrane.DeviceName,
- //commonStackerCrane.CurrentTaskNum,
- //commonStackerCrane.LastTaskNum,
+ Automatic = StackerCraneAutoStatus(commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Automatic)),
+ Fault = StackerCraneStatus(commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Fault)),
+ Running = StackerCraneWorkStatus(commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Running)),
+ CurrentColumn = Convert.ToInt32(commonStackerCrane.GetValue<StackerCraneDBName, byte>(StackerCraneDBName.CurrentColumn)),
+ CurrentLayer = Convert.ToInt32(commonStackerCrane.GetValue<StackerCraneDBName, byte>(StackerCraneDBName.CurrentLayer)),
+ LevelPoint = commonStackerCrane.GetValue<StackerCraneDBName, int>(StackerCraneDBName.LevelPoint),
+ CurrentTaskNum = commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.CurrentTaskNum),
+ commonStackerCrane.DeviceCode,
+ commonStackerCrane.DeviceName,
};
_noticeService.StackerData(userIds?.FirstOrDefault(), userTokenIds, new { commonStackerCrane.DeviceName, data = obj });
@@ -169,18 +186,37 @@
{
if (commonStackerCrane != null)
{
- #region 鏃ュ織璁板綍
- ConsoleHelper.WriteColorLine($"銆恵commonStackerCrane.DeviceName}銆戝爢鍨涙満浣滀笟鐘舵�侊細銆愩�戞椂闂淬�恵DateTime.Now}銆�", ConsoleColor.Magenta);
-
- string str = $"銆恵commonStackerCrane.DeviceName}銆戜换鍔″畬鎴�,浠诲姟鍙凤細銆恵TaskNum}銆戞椂闂淬�恵DateTime.Now}銆�";
- WriteInfo(commonStackerCrane.DeviceName, str);
- ConsoleHelper.WriteColorLine(str, ConsoleColor.Blue);
-
- #endregion
-
var task = _taskRepository.QueryFirst(x => x.TaskNum == TaskNum);
if (task != null)
{
+ if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ {
+ if (Convert.ToInt32(task.TargetAddress) > 1999 && Convert.ToInt32(task.TargetAddress) < 3000)
+ {
+
+ Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.Roadway == task.Roadway && x.stationChildCode == task.TargetAddress);
+ if (stationManager != null)
+ {
+ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManager.stationPLC);
+ if (device != null)
+ {
+ CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
+
+ var InteractiveSignal = conveyorLine.GetValue<ConveyorLineDBName, byte>(ConveyorLineDBName.InteractiveSignal, stationManager.stationChildCode);
+
+ var structs = BitConverter.GetBytes(InteractiveSignal).ToArray().ToBoolArray();
+ if (structs[2])
+ {
+ conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, Convert.ToInt16(stationManager.stationNextChildCode), stationManager.stationChildCode);
+ Thread.Sleep(100);
+ conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, Convert.ToInt16(task.TaskNum), stationManager.stationChildCode);
+ Thread.Sleep(100);
+ conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, Convert.ToSByte(2), stationManager.stationChildCode);
+ }
+ }
+ }
+ }
+ }
var content = _taskService.StackCraneTaskCompleted(TaskNum);
}
}
--
Gitblit v1.9.3