From d3e1346d52806f00d21eba23cabf9cfa4f61d7d4 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 05 九月 2024 16:34:00 +0800
Subject: [PATCH] 测试页面,修复bug

---
 Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
index 7b91e7e..165dd6c 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
@@ -219,7 +219,9 @@
                     //璇诲彇plc鐨勫��
                     var modConn = PLCTaskAction.listPlcConn.FirstOrDefault(s => s != null && s.PlcId == modDevice.PlcId);
                     if (modConn == null)
-                        break;
+                    {
+                        continue;
+                    }
                     try
                     {
                         var listPosition = await _wcsDeviceRep.Context.Queryable<WcsPosition>().Where(s => s.DeviceId == modDevice.Id).ToListAsync();
@@ -229,7 +231,7 @@
                         modDevice.Wcs = Convert.ToString(wcs);
                         //浠诲姟鍙�
                         var modPositionTask = listPosition.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
-                        (result, var taskNo) = modConn.GetPlcDBValue(modPositionTask.PosType, modDevice.DbNumber, modPositionTask.PlcPos);
+                        (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 == "浠诲姟绫诲瀷");
@@ -245,7 +247,7 @@
                         modDevice.EndLocatNo = Convert.ToString(endLocatNo);
                         //鎵樼洏鐮�
                         var modPositionPalletNo = listPosition.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
-                        (result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos);
+                        (result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos, modPositionPalletNo.StringLength);
                         modDevice.PalletNo = Convert.ToString(palletNo);
                     }
                     catch (Exception)
@@ -288,7 +290,7 @@
                 .Select(u => new
                 {
                     id = u.Id,
-                    name = u.Text                    
+                    name = u.Text
                 }
                 ).ToListAsync();
     }

--
Gitblit v1.8.0