From 4f39dcc195f28fa275fc2d065fbf1bf6a46c21b7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 00:41:18 +0800
Subject: [PATCH] 优化出入库逻辑
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 bf711bf..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"
@@ -49,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>
/// 鑾峰彇鍫嗗灈鏈鸿澶囩姸鎬�
@@ -104,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("鏈幏鍙栧埌鍗忚淇℃伅");
@@ -113,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;
@@ -214,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