From dea22f4759b5c8a4f79a3e93e5af1741f5e00ae4 Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期四, 26 三月 2026 19:51:02 +0800
Subject: [PATCH] 接口更新
---
项目代码/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 211 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 155 insertions(+), 56 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 85dc7f1..322d591 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"
@@ -12,13 +12,16 @@
using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
+using System.Transactions;
using WIDESEA_Common.Log;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Enums;
+using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_Model.Models.System;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.DeviceBase;
using WIDESEAWCS_QuartzJob.DTO;
@@ -36,13 +39,15 @@
private readonly ITaskExecuteDetailService _taskExecuteDetailService;
private readonly ITaskRepository _taskRepository;
private readonly IRouterService _routerService;
+ private readonly IDt_PlatformStationService _DtPlatformStationService;
- public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService)
+ public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IDt_PlatformStationService dt_PlatformStationService)
{
_taskService = taskService;
_taskExecuteDetailService = taskExecuteDetailService;
_taskRepository = taskRepository;
_routerService = routerService;
+ _DtPlatformStationService= dt_PlatformStationService;
}
public Task Execute(IJobExecutionContext context)
@@ -52,10 +57,36 @@
CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
if (commonStackerCrane != null)
{
- if (!commonStackerCrane.IsEventSubscribed)
+ //浠诲姟瀹屾垚StackerCraneWorkStatus
+ if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.WorkCompleted)
{
- commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//璁㈤槄浠诲姟瀹屾垚浜嬩欢
+ //鍒ゆ柇褰撳墠浠诲姟鏄惁鏄洏鐐�
+ Dt_Task? currtask = _taskService.CurrtaskInfo(commonStackerCrane.CurrentTaskNum);
+ if(currtask != null)
+ {
+ //鍒ゆ柇浠诲姟绫诲瀷
+ if(currtask.TaskType== (int)TaskTypeEnum.Inventorybound)
+ {
+ //璇诲彇鏉＄爜锛岃繘琛岄厤瀵�
+
+ DeviceProDTO? deviceProDTO = commonStackerCrane.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == "SCBarcode");
+ byte[] bytes = commonStackerCrane.Communicator.Read(deviceProDTO.DeviceProAddress, 64);
+ string result = Encoding.ASCII.GetString(bytes).Replace(" ", "");
+
+ bool pandianBort = false;
+ if(currtask.PalletCode== result) pandianBort= true;
+
+ }
+
+ WebResponseContent webResponse = _taskService.StackCraneTaskCompleted(commonStackerCrane.CurrentTaskNum);
+ if (webResponse.Status)
+ {
+
+ bool ddjfk = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
+ }
+ }
}
+
if (commonStackerCrane.StackerCraneAutoStatusValue == StackerCraneAutoStatus.Automatic && commonStackerCrane.StackerCraneStatusValue == StackerCraneStatus.Normal)
{
@@ -70,6 +101,8 @@
bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand);
if (sendFlag)
{
+ commonStackerCrane.Communicator.Write("DB105.52", 1);
+
WebResponseContent webResponseContent=_taskService.UpdateTaskStatusToNext(task.TaskNum);
}
}
@@ -113,20 +146,23 @@
{
try
{
- List<Dt_Task> task;
- task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
+ //鍒ゆ柇褰撳墠鍫嗗灈鏈烘槸鍚︽湁鍦ㄦ墽琛岀殑浠诲姟
+ if (_taskService.CutStackerCraneTask(commonStackerCrane.DeviceCode) != null) return null;
+
+
+ List<Dt_Task> task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
if (task.Count > 0)
{
foreach (Dt_Task taskItem in task)
{
- if (taskItem.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ if (taskItem.TaskType == (int)TaskTypeEnum.Outbound)
{
- if (OutTaskStationIsOccupied(taskItem.NextAddress))
+ if (OutTaskStationIsOccupied(taskItem.NextAddress,taskItem.Roadway))
{
return taskItem;
}
}
- else if (taskItem.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ else if (taskItem.TaskType == (int)TaskTypeEnum.Inbound || taskItem.TaskType == (int)TaskTypeEnum.Inventorybound)
{
return taskItem;
}
@@ -147,14 +183,49 @@
/// </summary>
/// <param name="task">浠诲姟瀹炰綋</param>
/// <returns>濡傛灉鏈鍗犵敤锛岃繑鍥炰紶鍏ョ殑浠诲姟淇℃伅锛屽惁鍒欙紝杩斿洖null</returns>
- private bool OutTaskStationIsOccupied(string NextAddress)
+ private bool OutTaskStationIsOccupied(string NextAddress,string Roadway)
{
- IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1002");
- if (device == null) return false;
- CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
- DeviceProDTO? deviceProDTO = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == NextAddress && x.DeviceProParamName == "StationFree");
- if (deviceProDTO == null) return false;
- return conveyorLine.Communicator.Read<bool>(deviceProDTO.DeviceProAddress);
+ try
+ {
+ if (Roadway == "C")
+ {
+ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1004");
+ if (device == null) return false;
+ CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
+ DeviceProDTO? deviceProDTO = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == NextAddress && x.DeviceProParamName == "StationNum");
+ DeviceProDTO? HandShakeprodto = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == NextAddress && x.DeviceProParamName == "HandShake");
+ if (deviceProDTO == null || HandShakeprodto == null) return false;
+
+ int StationNum = conveyorLine.Communicator.Read<ushort>(deviceProDTO.DeviceProAddress);
+ int HandShake = conveyorLine.Communicator.Read<ushort>(HandShakeprodto.DeviceProAddress);
+ if (StationNum == 0 && HandShake == 0 && Roadway == "C")
+ {
+ return true;
+ }
+ }
+ else
+ {
+ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1003");
+ if (device == null) return false;
+ CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
+ DeviceProDTO? deviceProDTO = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == NextAddress && x.DeviceProParamName == "StationNum");
+ DeviceProDTO? HandShakeprodto = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == NextAddress && x.DeviceProParamName == "HandShake");
+ if (deviceProDTO == null || HandShakeprodto == null) return false;
+
+ int StationNum = conveyorLine.Communicator.Read<ushort>(deviceProDTO.DeviceProAddress);
+ int HandShake = conveyorLine.Communicator.Read<ushort>(HandShakeprodto.DeviceProAddress);
+ if ((StationNum == 1 && HandShake == 0 && Roadway == "B") || (StationNum == 0 && HandShake == 0 && Roadway != "B"))
+ {
+ return true;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("璇诲彇绔欏彴淇℃伅閿欒锛�"+ex.Message);
+ }
+
+ return false;
}
@@ -168,18 +239,23 @@
{
StackerCraneTaskCommand stackerCraneTaskCommand = new StackerCraneTaskCommand();
- stackerCraneTaskCommand.Barcode = ""; /*task.PalletCode;*/
+
+ stackerCraneTaskCommand.Barcode = task.PalletCode;
stackerCraneTaskCommand.TaskNum = task.TaskNum;
stackerCraneTaskCommand.WorkType = 1;
stackerCraneTaskCommand.TrayType = 0;
- if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)//鍒ゆ柇鏄惁鏄叆搴撲换鍔�
+ if (task.TaskType == (int)TaskTypeEnum.Inbound)//鍒ゆ柇鏄惁鏄叆搴撲换鍔�
{
- string[] targetCodest = task.SourceAddress.Split("-");
- if (targetCodest.Length == 5)
+ //鑾峰彇绔欏彴缂栧彿
+ Dt_PlatformStation dt_Platform=_DtPlatformStationService.getStatiomInfo(task.SourceAddress);
+
+ string[] targetCodest = dt_Platform.Station_storey.Split("-");
+ if (targetCodest.Length == 3)
{
- stackerCraneTaskCommand.StartRow = Convert.ToInt16(targetCodest[1]);
- stackerCraneTaskCommand.StartColumn = Convert.ToInt16(targetCodest[2]);
- stackerCraneTaskCommand.StartLayer = Convert.ToInt16(targetCodest[3]);
+ string StartRow = targetCodest[0].Substring(1);
+ stackerCraneTaskCommand.StartRow = Convert.ToInt16(StartRow);
+ stackerCraneTaskCommand.StartColumn = Convert.ToInt16(targetCodest[1]);
+ stackerCraneTaskCommand.StartLayer = Convert.ToInt16(targetCodest[2]);
}
else
{
@@ -187,12 +263,15 @@
_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鍏ュ簱璧风偣閿欒锛岃捣鐐癸細銆恵task.SourceAddress}銆�");
return null;
}
- string[] targetCodes = task.NextAddress.Split("-");
- if (targetCodes.Length == 5)
+ string[] EndCodest = task.NextAddress.Split("-");
+ if (EndCodest.Length == 3)
{
- stackerCraneTaskCommand.EndRow = Convert.ToInt16(targetCodes[1]);
- stackerCraneTaskCommand.EndColumn = Convert.ToInt16(targetCodes[2]);
- stackerCraneTaskCommand.EndLayer = Convert.ToInt16(targetCodes[3]);
+ string EndRow = EndCodest[0].Substring(1);
+ string SCEndRow = LaneModification(task.Roadway, int.Parse(EndRow));
+
+ stackerCraneTaskCommand.EndRow = Convert.ToInt16(SCEndRow );
+ stackerCraneTaskCommand.EndColumn = Convert.ToInt16(EndCodest[1]);
+ stackerCraneTaskCommand.EndLayer = Convert.ToInt16(EndCodest[2]);
}
else
{
@@ -201,14 +280,16 @@
return null;
}
}
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ else if (task.TaskType == (int)TaskTypeEnum.Outbound)
{
string[] sourceCodes = task.CurrentAddress.Split("-");
- if (sourceCodes.Length == 5)
+ if (sourceCodes.Length == 3)
{
- stackerCraneTaskCommand.StartRow = Convert.ToInt16(sourceCodes[1]);
- stackerCraneTaskCommand.StartColumn = Convert.ToInt16(sourceCodes[2]);
- stackerCraneTaskCommand.StartLayer = Convert.ToInt16(sourceCodes[3]);
+ string StartRow = sourceCodes[0].Substring(1);
+ string SCStartRow = LaneModification(task.Roadway, int.Parse(StartRow));
+ stackerCraneTaskCommand.StartRow = Convert.ToInt16(SCStartRow);
+ stackerCraneTaskCommand.StartColumn = Convert.ToInt16(sourceCodes[1]);
+ stackerCraneTaskCommand.StartLayer = Convert.ToInt16(sourceCodes[2]);
}
else
{
@@ -216,12 +297,16 @@
_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鍑哄簱浠诲姟璧风偣閿欒锛岃捣鐐癸細銆恵task.CurrentAddress}銆�");
return null;
}
- string[] sourceCodest = task.TargetAddress.Split("-");
- if (sourceCodest.Length == 5)
+
+ //鑾峰彇绔欏彴缂栧彿
+ Dt_PlatformStation dt_Platform = _DtPlatformStationService.getStatiomInfo(task.NextAddress);
+ string[] EndCodest = dt_Platform.Station_storey.Split("-");
+ if (EndCodest.Length == 3)
{
- stackerCraneTaskCommand.EndRow = Convert.ToInt16(sourceCodest[1]);
- stackerCraneTaskCommand.EndColumn = Convert.ToInt16(sourceCodest[2]);
- stackerCraneTaskCommand.EndLayer = Convert.ToInt16(sourceCodest[3]);
+ string EndRow = EndCodest[0].Substring(1);
+ stackerCraneTaskCommand.EndRow = Convert.ToInt16(EndRow);
+ stackerCraneTaskCommand.EndColumn = Convert.ToInt16(EndCodest[1]);
+ stackerCraneTaskCommand.EndLayer = Convert.ToInt16(EndCodest[2]);
}
else
{
@@ -230,36 +315,50 @@
return null;
}
}
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
+ else if (task.TaskType == (int)TaskTypeEnum.Inventorybound)
{
- string[] targetCodes = task.NextAddress.Split("-");
- if (targetCodes.Length == 5)
+ stackerCraneTaskCommand.WorkType = 6;
+
+ stackerCraneTaskCommand.StartRow = Convert.ToInt16(0);
+ stackerCraneTaskCommand.StartColumn = Convert.ToInt16(0);
+ stackerCraneTaskCommand.StartLayer = Convert.ToInt16(0);
+
+ string[] EndCodest = task.NextAddress.Split("-");
+ if (EndCodest.Length == 3)
{
- stackerCraneTaskCommand.EndRow = Convert.ToInt16(targetCodes[1]);
- stackerCraneTaskCommand.EndColumn = Convert.ToInt16(targetCodes[2]);
- stackerCraneTaskCommand.EndLayer = Convert.ToInt16(targetCodes[3]);
+ string EndRow = EndCodest[0].Substring(1);
+ string SCEnRow=LaneModification(task.Roadway,int.Parse(EndRow));
+
+ stackerCraneTaskCommand.EndRow = Convert.ToInt16(SCEnRow);
+ stackerCraneTaskCommand.EndColumn = (short)(Convert.ToInt16(EndCodest[1]) + 1);
+ stackerCraneTaskCommand.EndLayer = Convert.ToInt16(EndCodest[2]);
}
else
{
- //鏁版嵁閰嶇疆閿欒
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"绉诲簱浠诲姟缁堢偣閿欒锛岃捣鐐癸細銆恵task.NextAddress}銆�");
- return null;
- }
- string[] sourceCodes = task.CurrentAddress.Split("-");
- if (sourceCodes.Length == 5)
- {
- stackerCraneTaskCommand.StartRow = Convert.ToInt16(sourceCodes[1]);
- stackerCraneTaskCommand.StartColumn = Convert.ToInt16(sourceCodes[2]);
- stackerCraneTaskCommand.StartLayer = Convert.ToInt16(sourceCodes[3]);
- }
- else
- {
+
//鏁版嵁閰嶇疆閿欒
_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"绉诲簱浠诲姟璧风偣閿欒锛岃捣鐐癸細銆恵task.CurrentAddress}銆�");
return null;
}
+
+
}
return stackerCraneTaskCommand;
}
+
+ public string LaneModification(string Roadway,int SCRow)
+ {
+ if (Roadway == "F")
+ {
+ return SCRow == 1 ? "3" : "4";
+ }else if(Roadway == "C")
+ {
+ return SCRow == 1 ? "5" : "6";
+ }
+ else
+ {
+ return SCRow.ToString();
+ }
+ }
}
}
--
Gitblit v1.9.3