From 08eb1d72105662b301275fefd876be18df1b9fec Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期二, 29 四月 2025 15:12:47 +0800
Subject: [PATCH] 修改小车充电流程

---
 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 08712ca..ab3e7b4 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -417,11 +417,11 @@
                                 {
                                     var modCarDl = plcPosition.FirstOrDefault(s => s.Text == "鐢垫睜鐢甸噺");
                                     var (resultDl, valueDl) = modbusUtil.GetDBValue(modCarDl.PosType, modCarDl.PlcPos);
-                                    if (resultDl.IsSucceed && valueDl> FourWayCarDLEnum.Dl) 
+                                    if (resultDl.IsSucceed && valueDl> (int)FourWayCarDLEnum.Dl3) 
                                     {
                                         //鍐欏叆缁撴潫鍏呯數鍛戒护
                                         var modCdEnd = plcPosition.FirstOrDefault(s => s.Text == "鍏呯數鍛戒护");
-                                        modbusUtil.SetDBValue(modCdEnd.PosType, modCdEnd.PlcPos.ToString(), "2") ;
+                                        var resultDl22 = modbusUtil.SetDBValue(modCdEnd.PosType, modCdEnd.PlcPos.ToString(), "3") ;
                                         carErr = true;
                                         break; //鏆傜紦鍒嗛厤锛岄槻姝㈠悓灞傚皬杞﹀叧鏈烘垨澶辫仈瀵艰嚧闃绘尅璺緞
                                     }
@@ -505,13 +505,15 @@
                         }
                     }
                     var typeStr = "1";
+                    var typeStr2 = 1;
                     if (waitTask.Levels  == 888 )
                     {
                         typeStr = "0";//灏忚溅浠诲姟鏄厖鐢典换鍔�
+                        typeStr2 = 0;
                     }
                     //鑾峰彇灏忚溅鍘绘斁璐у偍浣嶄换鍔¤矾寰�
                     var data2 = FourWayCarUtil.GetCarPath(waitTask.StartLocate, waitTask.EndLocate, typeStr);
-                    var datas2 = FourWayCarUtil.GetCarPathUp(data2, 1);
+                    var datas2 = FourWayCarUtil.GetCarPathUp(data2, typeStr2);
                     
                     if (datas2 == null) 
                     { 

--
Gitblit v1.8.0