From 70cbc3af5300fe44b48215f8520f465ffa231df6 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期二, 22 七月 2025 09:55:17 +0800
Subject: [PATCH] 修改问题

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

diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 043b404..14cb836 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -432,7 +432,7 @@
                             if (!plcResult.IsSucceed || Convert.ToInt32(palletVal) != 720)
                             {
                                 continue;//鏀捐揣宸ヤ綅娌℃湁璇诲彇鎴愬姛鎴栦笉鏄┖闂�
-                            } 
+                            }
 
                             var gongwei = carcon.conveyorRuKu[endLocate];
                             //鍒ゆ柇浠诲姟
@@ -498,7 +498,13 @@
                                 }
                                 var modCarPall = plcPosition.FirstOrDefault(s => s.Text == "鎵樼洏妫�娴�");
                                 var (resultPall, valuePall) = modbusUtil.GetDBValue(modCarPall.PosType, modCarPall.PlcPos);
-                                if (resultPall.IsSucceed && valuePall  == 1)  //1鏈夋墭鐩� 2鏃犳墭鐩�
+                                //var modCarju = plcPosition.FirstOrDefault(s => s.Text == "涓惧崌浣嶇疆");
+                                //var (resultju, valueju) = modbusUtil.GetDBValue(modCarju.PosType, modCarju.PlcPos);
+                                //if (resultPall.IsSucceed && valuePall == 1  && resultPall.IsSucceed && valuePall != 1)  //1椤惰揣 2瀛愰�氶亾  3涓婚�氶亾
+                                //{
+                                //    break; //鏆傜紦鍒嗛厤 
+                                //}
+                                if (resultPall.IsSucceed && valuePall == 1)  //1鏈夋墭鐩� 2鏃犳墭鐩�
                                 {
                                     break; //鏆傜紦鍒嗛厤 
                                 }

--
Gitblit v1.8.0