From 8a1377922fb3320b7a2ff359ee7e006163fcff47 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 12 九月 2024 08:17:30 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index d1253f1..63371cd 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -902,7 +902,7 @@
var djMod = PLCTaskAction.plcDevices.First(m => m.StationNum == modTask.EndRoadway
&& m.DeviceType == DeviceTypeEnum.Business && m.IsDelete == false);
- var djInfos = PLCTaskAction.plcStation.Where(m => m.IsDelete == false && m.DeviceId == djMod.Id).ToList();
+ var djInfos = PLCTaskAction.plcPositions.Where(m => m.IsDelete == false && m.DeviceId == djMod.Id).ToList();
var djInfo = djInfos.First(m => m.Text == "PLC娴佺▼瀛�");
// 鑾峰彇璺烘満褰撳墠鐘舵��
--
Gitblit v1.8.0