From 72390e0230b64cd43fedf0ba8e17aba097568a4a Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 26 六月 2025 16:36:13 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs"
index d806122..cd1f3a1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs"
@@ -1,17 +1,10 @@
锘縰sing HslCommunication;
-using System;
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Linq;
using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
using WIDESEAWCS_Communicator;
using WIDESEAWCS_QuartzJob;
-using WIDESEAWCS_QuartzJob.DeviceBase;
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.StackerCrane;
-using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
namespace WIDESEAWCS_Tasks.StackerCraneJob
{
@@ -56,7 +49,7 @@
/// </summary>
/// <param name="speStackerCrane"></param>
/// <returns></returns>
- public int WorkCommandValue() => _speStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkCommand);
+ //public int WorkCommandValue() => _speStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkCommand);
/// <summary>
/// 鑾峰彇鍫嗗灈鏈鸿澶囩姸鎬�
@@ -111,7 +104,7 @@
private string GetStatus(string protocolParamType)
{
- List<DeviceProDTO> devicePros = _speStackerCrane.DeviceProDTOs.Where(x => x.DeviceProParamType == protocolParamType).ToList();
+ List<DeviceProDTO> devicePros = _speStackerCrane.DeviceProDTOs.Where(x => x.DeviceProParamName == protocolParamType).ToList();
if (devicePros.Count == 0)
{
throw new Exception("鏈幏鍙栧埌鍗忚淇℃伅");
@@ -120,7 +113,7 @@
{
object readStatus = _speStackerCrane.Communicator.ReadAsObj(devicePros[i].DeviceProAddress, devicePros[i].DeviceDataType);
DeviceProtocolDetailDTO? deviceProtocolDetail = _speStackerCrane.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == devicePros[i].DeviceProParamName) ?? throw new Exception();
- deviceProtocolDetail = _speStackerCrane.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == devicePros[i].DeviceProParamType && x.ProtocalDetailValue.Equals(readStatus.ToString()));
+ deviceProtocolDetail = _speStackerCrane.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == devicePros[i].DeviceProParamName && x.ProtocalDetailValue.Equals(readStatus.ToString()));
if (deviceProtocolDetail != null)
{
return deviceProtocolDetail.ProtocolDetailType;
@@ -221,9 +214,9 @@
_speStackerCrane.SetValue(StackerCraneDBName.EndRow, command.EndRow);
_speStackerCrane.SetValue(StackerCraneDBName.EndColumn, command.EndColumn);
_speStackerCrane.SetValue(StackerCraneDBName.EndLayer, command.EndLayer);
- _speStackerCrane.SetValue(StackerCraneDBName.Barcode, command.Barcode);
+ //_speStackerCrane.SetValue(StackerCraneDBName.Barcode, command.Barcode);
_speStackerCrane.SetValue(StackerCraneDBName.WorkType, command.WorkType);
- _speStackerCrane.SetValue(StackerCraneDBName.TrayType, command.TrayType);
+ //_speStackerCrane.SetValue(StackerCraneDBName.WorkType, command.TrayType);
return true;
}
return false;
--
Gitblit v1.9.3