From ce70974f99cd377579e9b07873c8ce79df6e05c3 Mon Sep 17 00:00:00 2001
From: zhangchengsong <zhangchengsong@hnkhzn.com>
Date: 星期二, 14 四月 2026 20:47:26 +0800
Subject: [PATCH] '完善二楼出库放货中屏蔽光栅'
---
项目代码/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 108 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 99 insertions(+), 9 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 0860808..a16b52a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -8,6 +8,8 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.Eventing.Reader;
+using System.DirectoryServices.Protocols;
+using System.IO.Ports;
using System.Linq;
using System.Net;
using System.Reflection.Metadata;
@@ -19,6 +21,7 @@
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Enums;
+using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
@@ -30,6 +33,7 @@
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
+using WIDESEAWCS_TaskInfoService;
using WIDESEAWCS_Tasks.StackerCraneJob;
namespace WIDESEAWCS_Tasks
@@ -57,8 +61,12 @@
try
{
CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
+
+
if (commonStackerCrane != null)
{
+
+ UpdateHandShake(commonStackerCrane.CurrentTaskNum, commonStackerCrane.StackerCraneWorkStatusDes);
//浠诲姟瀹屾垚StackerCraneWorkStatus
if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.WorkCompleted)
{
@@ -82,6 +90,7 @@
if (webResponse.Status)
{
WriteLog.Write_Log("鍫嗗灈鏈轰换鍔′笂鎶ュ畬鎴愪俊鎭�", "鍫嗗灈鏈轰换鍔′笂鎶ュ畬鎴愪俊鎭�", $"銆恵commonStackerCrane.DeviceCode}銆戝簱鍫嗗灈鏈轰笂鎶ヤ换鍔″彿:銆恵commonStackerCrane.CurrentTaskNum}銆戝畬鎴愪俊鍙凤紒");
+
bool ddjfk = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
}
}
@@ -91,6 +100,10 @@
$"鍫嗗灈鏈哄伐浣滄ā寮忓湴鍧�:銆怐B105.3.0銆�,璇诲彇鐨勬暟鎹細銆恵commonStackerCrane.StackerCraneStatusDes}銆慭n" +
$"鍫嗗灈鏈轰綔涓氱姸鎬佸湴鍧�:銆怐B105.22.0銆�,璇诲彇鐨勬暟鎹細銆恵commonStackerCrane.StackerCraneWorkStatusDes}銆慭n" +
$"鍫嗗灈鏈哄綋鍓嶄换鍔℃墽琛屼腑鍦板潃:銆怐B105.18.0銆�,璇诲彇鐨勬暟鎹細銆恵commonStackerCrane.CurrentTaskNum}銆慭n");
+
+
+
+
if (commonStackerCrane.StackerCraneAutoStatusValue == StackerCraneAutoStatus.Automatic && commonStackerCrane.StackerCraneStatusValue == StackerCraneStatus.Normal)
{
@@ -207,8 +220,10 @@
int StationNum = conveyorLine.Communicator.Read<ushort>(deviceProDTO.DeviceProAddress);
int HandShake = conveyorLine.Communicator.Read<ushort>(HandShakeprodto.DeviceProAddress);
- WriteLog.Write_Log("鍑哄簱搴撳彛鐘舵�佷俊鎭�", "鍑哄簱搴撳彛鐘舵�佷俊鎭�", $"搴撳彛鏄�恵NextAddress}銆戯紝鐢宠鐘舵�佸湴鍧�锛氥�恵HandShakeprodto.DeviceProAddress}銆慭n" +
- $"璇诲彇鐨勬暟鎹細銆恵HandShake}銆戯紱搴撳彛鏄惁鏈夎揣鐘舵�佸湴鍧�锛氥�恵deviceProDTO.DeviceProAddress}銆戯紝璇诲彇鐨勬暟鎹�恵StationNum}銆�");
+ conveyorLine.Communicator.Write<short>(HandShakeprodto.DeviceProAddress, 1);
+
+ WriteLog.Write_Log("鍑哄簱搴撳彛鐘舵�佷俊鎭�", "鍑哄簱搴撳彛鐘舵�佷俊鎭�", $"搴撳彛鏄�恵NextAddress}銆戯紝鐢宠鐘舵�佸湴鍧�锛氥�恵HandShakeprodto.DeviceProAddress}銆�,璇诲彇鐨勬暟鎹細銆恵HandShake}銆慭n" +
+ $"搴撳彛鏄惁鏈夎揣鐘舵�佸湴鍧�锛氥�恵deviceProDTO.DeviceProAddress}銆戯紝璇诲彇鐨勬暟鎹�恵StationNum}銆�");
if (StationNum == 0 && HandShake == 0 && Roadway == "C")
{
return true;
@@ -290,15 +305,34 @@
{
StackerCraneTaskCommand stackerCraneTaskCommand = new StackerCraneTaskCommand();
-
- stackerCraneTaskCommand.Barcode = task.PalletCode;
stackerCraneTaskCommand.TaskNum = task.TaskNum;
stackerCraneTaskCommand.WorkType = 1;
stackerCraneTaskCommand.TrayType = 0;
+ if (task.Roadway == "B" || task.Roadway == "C")
+ {
+ //鍒ゆ柇 task.PalletCode 鏄笉鏄竴涓湁鏁堢殑 GUID
+ stackerCraneTaskCommand.Barcode = stackerCraneTaskCommand.Barcode = Guid.TryParse(task.PalletCode, out var guid) ? guid.ToString("N")[0..6] : task.PalletCode;
+ }
+ else if (task.Roadway == "G" )
+ {
+ if (Guid.TryParse(task.PalletCode, out var palletGuid))
+ {
+ stackerCraneTaskCommand.Barcode = palletGuid.ToString("N")[0..6];
+
+ // 鏍囧噯GUID灏辨槸36浣嶏紝鎵�浠ョ洿鎺ュ垽鏂暱搴﹀嵆鍙�
+ stackerCraneTaskCommand.TrayType = (short)(task.PalletCode.Length == 36 ? 1 : 2);
+ }
+ else
+ {
+ stackerCraneTaskCommand.Barcode = task.PalletCode;
+ stackerCraneTaskCommand.TrayType = 2;
+ }
+ }
+
if (task.TaskType == (int)TaskTypeEnum.Inbound)//鍒ゆ柇鏄惁鏄叆搴撲换鍔�
{
//鑾峰彇绔欏彴缂栧彿
- Dt_PlatformStation dt_Platform=_DtPlatformStationService.getStatiomInfo(task.SourceAddress);
+ Dt_PlatformStation dt_Platform = _DtPlatformStationService.getStatiomInfo(task.SourceAddress);
string[] targetCodest = dt_Platform.Station_storey.Split("-");
if (targetCodest.Length == 3)
{
@@ -319,7 +353,7 @@
string EndRow = EndCodest[0].Substring(1);
string SCEndRow = LaneModification(task.Roadway, int.Parse(EndRow));
- stackerCraneTaskCommand.EndRow = Convert.ToInt16(SCEndRow );
+ stackerCraneTaskCommand.EndRow = Convert.ToInt16(SCEndRow);
stackerCraneTaskCommand.EndColumn = Convert.ToInt16(EndCodest[1]);
stackerCraneTaskCommand.EndLayer = Convert.ToInt16(EndCodest[2]);
}
@@ -377,7 +411,7 @@
if (EndCodest.Length == 3)
{
string EndRow = EndCodest[0].Substring(1);
- string SCEnRow=LaneModification(task.Roadway,int.Parse(EndRow));
+ string SCEnRow = LaneModification(task.Roadway, int.Parse(EndRow));
stackerCraneTaskCommand.EndRow = Convert.ToInt16(SCEnRow);
stackerCraneTaskCommand.EndColumn = (short)(Convert.ToInt16(EndCodest[1]) + 1);
@@ -385,13 +419,13 @@
}
else
{
-
+
//鏁版嵁閰嶇疆閿欒
_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"绉诲簱浠诲姟璧风偣閿欒锛岃捣鐐癸細銆恵task.CurrentAddress}銆�");
return null;
}
-
+
}
return stackerCraneTaskCommand;
}
@@ -410,5 +444,61 @@
return SCRow.ToString();
}
}
+ /// <summary>
+ /// 鐩戞祴G搴撱�丆搴撳嚭搴撴斁璐ф椂灞忚斀鍏夋爡
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="stackerCraneWorkStatusDes"></param>
+ public void UpdateHandShake(int taskNum, string stackerCraneWorkStatusDes)
+ {
+ // 1. 鏌ヨ浠诲姟锛岀┖鍊肩洿鎺ヨ繑鍥�
+ Dt_Task? dtTask = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
+ if (dtTask == null) return;
+
+ // 2. 瀹氫箟鍥哄畾鍦板潃
+ string[] targetAddresses = { "G03", "G04", "C02", "C01" };
+
+ // 3. 鏉′欢鍒ゆ柇 + 纭畾鍐欏叆鍊�
+ short writeValue = -1;
+ if (dtTask.TaskType == 100 && targetAddresses.Contains(dtTask.TargetAddress))
+ {
+ writeValue = stackerCraneWorkStatusDes switch
+ {
+ "鏀捐揣涓�" => 1,
+ "浠诲姟瀹屾垚" => 0,
+ _ => -1
+ };
+ }
+
+ // 4. 鑾峰彇璁惧缂栫爜
+ string deviceCode = dtTask.CurrentAddress.StartsWith("C") ? "1004" : "1003";
+
+ // 5. 鑾峰彇璁惧锛岀┖鍊肩洿鎺ヨ繑鍥�
+ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == deviceCode);
+ if (device != null && writeValue != -1)
+ {
+ CommonConveyorLine? conveyorLine = (CommonConveyorLine)device;
+
+ // 6. 鑾峰彇鎻℃墜鐐逛綅锛岀┖鍊肩洿鎺ヨ繑鍥�
+ DeviceProDTO? handShake = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == dtTask.TargetAddress && x.DeviceProParamName == "HandShake");
+ if (handShake == null)
+ {
+ WriteLog.Write_Log("鍑哄簱搴撳彛鍏夋爡鐘舵�侀敊璇俊鎭�", "鍑哄簱搴撳彛鍏夋爡鐘舵�侀敊璇俊鎭�", $"WCS鏈壘鍒板簱鍙d俊鎭槸銆恵dtTask.TargetAddress}銆戯紝浠诲姟鍙凤細銆恵dtTask.TaskNum}銆�,鍫嗗灈鏈轰綔涓氱姸鎬侊細銆恵stackerCraneWorkStatusDes}銆�");
+ return;
+ }
+ // 7. 鍐欏叆鍊�
+ conveyorLine.Communicator.Write<short>(handShake.DeviceProAddress, writeValue);
+ WriteLog.Write_Log("鍑哄簱搴撳彛鍏夋爡鐘舵�佹甯镐俊鎭�", "鍑哄簱搴撳彛鍏夋爡鐘舵�佹甯镐俊鎭�", $"搴撳彛鏄�恵dtTask.TargetAddress}銆戯紝鐢宠鐘舵�佸湴鍧�锛氥�恵handShake.DeviceProAddress}銆�,璇诲彇鐨勬暟鎹細銆恵conveyorLine.Communicator.Read<ushort>(handShake.DeviceProAddress)}銆慭n" +
+ $"浠诲姟鍙凤細銆恵dtTask.TaskNum}銆�,鍫嗗灈鏈轰綔涓氱姸鎬侊細銆恵stackerCraneWorkStatusDes}銆�");
+ return;
+ }
+ else
+ {
+ WriteLog.Write_Log("鍑哄簱搴撳彛鍏夋爡鐘舵�侀敊璇俊鎭�", "鍑哄簱搴撳彛鍏夋爡鐘舵�侀敊璇俊鎭�", $"搴撳彛鏄�恵dtTask.TargetAddress}銆戯紝浠诲姟鍙凤細銆恵dtTask.TaskNum}銆�,鍫嗗灈鏈轰綔涓氱姸鎬侊細銆恵stackerCraneWorkStatusDes}銆�");
+ return;
+ }
+
+ }
+
}
}
--
Gitblit v1.9.3