From 78c49a591404ec32d7c2d2e9f4b9bf6010c51e07 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 12 九月 2024 16:39:28 +0800
Subject: [PATCH] Revert "读写代码测试，问题调整"
---
Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs | 79 +++++++++++----------------------------
1 files changed, 22 insertions(+), 57 deletions(-)
diff --git a/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs b/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs
index 988502b..7a8ff9c 100644
--- a/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs
+++ b/Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs
@@ -110,85 +110,50 @@
modDevice.Wcs = Convert.ToString(wcs);
//浠诲姟鍙�
var modPositionTask = listPosition.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
- if (modPositionTask != null)
- {
- (result, var taskNo) = modConn.GetPlcDBValue(modPositionTask.PosType, modDevice.DbNumber, modPositionTask.PlcPos, modPositionTask.StringLength);
- modDevice.TaskNo = Convert.ToString(taskNo);
- }
+ (result, var taskNo) = modConn.GetPlcDBValue(modPositionTask.PosType, modDevice.DbNumber, modPositionTask.PlcPos, modPositionTask.StringLength);
+ modDevice.TaskNo = Convert.ToString(taskNo);
//浠诲姟绫诲瀷
var modPositionTaskType = listPosition.FirstOrDefault(s => s.Text == "浠诲姟绫诲瀷");
- if (modPositionTaskType != null)
- {
- (result, var taskType) = modConn.GetPlcDBValue(modPositionTaskType.PosType, modDevice.DbNumber, modPositionTaskType.PlcPos);
- modDevice.TaskType = (TaskTypeEnum)Convert.ToInt32(taskType);
- }
+ (result, var taskType) = modConn.GetPlcDBValue(modPositionTaskType.PosType, modDevice.DbNumber, modPositionTaskType.PlcPos);
+ modDevice.TaskType = (TaskTypeEnum)Convert.ToInt32(taskType);
//璧峰宸ヤ綅
var modPositionStartLocatNo = listPosition.FirstOrDefault(s => s.Text == "璧峰宸ヤ綅");
- if (modPositionStartLocatNo != null)
- {
- (result, var startLocatNo) = modConn.GetPlcDBValue(modPositionStartLocatNo.PosType, modDevice.DbNumber, modPositionStartLocatNo.PlcPos);
- modDevice.StartLocatNo = Convert.ToString(startLocatNo);
- }
+ (result, var startLocatNo) = modConn.GetPlcDBValue(modPositionStartLocatNo.PosType, modDevice.DbNumber, modPositionStartLocatNo.PlcPos);
+ modDevice.StartLocatNo = Convert.ToString(startLocatNo);
//鐩殑宸ヤ綅
var modPositionEndLocatNo = listPosition.FirstOrDefault(s => s.Text == "鐩殑宸ヤ綅");
- if (modPositionEndLocatNo != null)
- {
- (result, var endLocatNo) = modConn.GetPlcDBValue(modPositionEndLocatNo.PosType, modDevice.DbNumber, modPositionEndLocatNo.PlcPos);
- modDevice.EndLocatNo = Convert.ToString(endLocatNo);
- }
+ (result, var endLocatNo) = modConn.GetPlcDBValue(modPositionEndLocatNo.PosType, modDevice.DbNumber, modPositionEndLocatNo.PlcPos);
+ modDevice.EndLocatNo = Convert.ToString(endLocatNo);
//鎵樼洏鐮�
var modPositionPalletNo = listPosition.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
- if (modPositionPalletNo != null)
- {
- (result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos, modPositionPalletNo.StringLength);
- modDevice.PalletNo = Convert.ToString(palletNo);
- Console.WriteLine(modDevice.DbNumber + "." + modPositionPalletNo.PlcPos + "----------");
- }
+ (result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos, modPositionPalletNo.StringLength);
+ modDevice.PalletNo = Convert.ToString(palletNo);
if (modPlc.Type == PLCTypeEnum.ConveyorLine)
{
//鏀捐揣鎺�
var modPositionReleaseRow = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
- if (modPositionReleaseRow != null)
- {
- (result, var releaseRow) = modConn.GetPlcDBValue(modPositionReleaseRow.PosType, modDevice.DbNumber, modPositionReleaseRow.PlcPos);
- modDevice.ReleaseRow = Convert.ToInt32(releaseRow);
- }
+ (result, var releaseRow) = modConn.GetPlcDBValue(modPositionReleaseRow.PosType, modDevice.DbNumber, modPositionReleaseRow.PlcPos);
+ modDevice.ReleaseRow = Convert.ToInt32(releaseRow);
//鏀捐揣鍒�
var modPositionReleaseCol = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
- if (modPositionReleaseCol != null)
- {
- (result, var releaseCol) = modConn.GetPlcDBValue(modPositionReleaseCol.PosType, modDevice.DbNumber, modPositionReleaseCol.PlcPos);
- modDevice.ReleaseCol = Convert.ToInt32(releaseCol);
- }
+ (result, var releaseCol) = modConn.GetPlcDBValue(modPositionReleaseCol.PosType, modDevice.DbNumber, modPositionReleaseCol.PlcPos);
+ modDevice.ReleaseCol = Convert.ToInt32(releaseCol);
//鏀捐揣灞�
var modPositionReleaseStorey = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
- if (modPositionReleaseStorey != null)
- {
- (result, var releaseStorey) = modConn.GetPlcDBValue(modPositionReleaseStorey.PosType, modDevice.DbNumber, modPositionReleaseStorey.PlcPos);
- modDevice.ReleaseStorey = Convert.ToInt32(releaseStorey);
- }
+ (result, var releaseStorey) = modConn.GetPlcDBValue(modPositionReleaseStorey.PosType, modDevice.DbNumber, modPositionReleaseStorey.PlcPos);
+ modDevice.ReleaseStorey = Convert.ToInt32(releaseStorey);
//鍙栬揣鎺�
var modPositionPickRow = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
- if (modPositionPickRow != null)
- {
- (result, var pickRow) = modConn.GetPlcDBValue(modPositionPickRow.PosType, modDevice.DbNumber, modPositionPickRow.PlcPos);
- modDevice.PickRow = Convert.ToInt32(pickRow);
- }
+ (result, var pickRow) = modConn.GetPlcDBValue(modPositionPickRow.PosType, modDevice.DbNumber, modPositionPickRow.PlcPos);
+ modDevice.PickRow = Convert.ToInt32(pickRow);
//鍙栬揣鍒�
var modPositionPickCol = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣鍒�");
- if (modPositionPickCol != null)
- {
- (result, var pickCol) = modConn.GetPlcDBValue(modPositionPickCol.PosType, modDevice.DbNumber, modPositionPickCol.PlcPos);
- modDevice.PickCol = Convert.ToInt32(pickCol);
- }
+ (result, var pickCol) = modConn.GetPlcDBValue(modPositionPickCol.PosType, modDevice.DbNumber, modPositionPickCol.PlcPos);
+ modDevice.PickCol = Convert.ToInt32(pickCol);
//鍙栬揣灞�
var modPositionPickStorey = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣灞�");
- if (modPositionPickStorey != null)
- {
- (result, var pickStorey) = modConn.GetPlcDBValue(modPositionPickStorey.PosType, modDevice.DbNumber, modPositionPickStorey.PlcPos);
- modDevice.PickStorey = Convert.ToInt32(pickStorey);
- }
-
+ (result, var pickStorey) = modConn.GetPlcDBValue(modPositionPickStorey.PosType, modDevice.DbNumber, modPositionPickStorey.PlcPos);
+ modDevice.PickStorey = Convert.ToInt32(pickStorey);
}
}
//else
--
Gitblit v1.8.0