From b7a89c248b9dcbbe99d4d7a84f4677c73e46dd93 Mon Sep 17 00:00:00 2001 From: chengsc <11752@DESKTOP-DS49RCP> Date: 星期二, 29 四月 2025 15:14:33 +0800 Subject: [PATCH] 修改测试问题 --- Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 2 +- Admin.NET/WCS.Application/Enum/FourWayCarEnum.cs | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Admin.NET/WCS.Application/Enum/FourWayCarEnum.cs b/Admin.NET/WCS.Application/Enum/FourWayCarEnum.cs index 34fc097..b618686 100644 --- a/Admin.NET/WCS.Application/Enum/FourWayCarEnum.cs +++ b/Admin.NET/WCS.Application/Enum/FourWayCarEnum.cs @@ -76,16 +76,12 @@ /// 鏋侀檺鐢甸噺 浣庝簬姝ょ數閲忎笉鎵ц浠诲姟 /// </summary> [Description("鏋侀檺鐢甸噺")] - Dl = 60, + Dl = 30, /// <summary> /// 鍋ュ悍鐢甸噺 浣庝簬姝ょ數閲� 涓旀棤浠诲姟鏃跺幓鍏呯數 /// </summary> [Description("鍋ュ悍鐢甸噺")] - Dl2 = 90, - /// <summary> - /// 鏋侀檺鐢甸噺 浣庝簬姝ょ數閲忎笉鎵ц浠诲姟 - /// </summary> - [Description("鏋侀檺鐢甸噺")] - Dl3 = 50, + Dl2 = 80, + } diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs index ab3e7b4..6e57018 100644 --- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs +++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs @@ -417,7 +417,7 @@ { var modCarDl = plcPosition.FirstOrDefault(s => s.Text == "鐢垫睜鐢甸噺"); var (resultDl, valueDl) = modbusUtil.GetDBValue(modCarDl.PosType, modCarDl.PlcPos); - if (resultDl.IsSucceed && valueDl> (int)FourWayCarDLEnum.Dl3) + if (resultDl.IsSucceed && valueDl> (int)FourWayCarDLEnum.Dl) { //鍐欏叆缁撴潫鍏呯數鍛戒护 var modCdEnd = plcPosition.FirstOrDefault(s => s.Text == "鍏呯數鍛戒护"); -- Gitblit v1.8.0