From 969aafa8bd335025da4caf5939a1626bad4f4236 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 19 六月 2025 16:54:03 +0800
Subject: [PATCH] Merge branch 'csc'
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 4c7b3f9..fa54401 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -385,7 +385,7 @@
if (waitTask.TaskType == TaskTypeEnum.In )
{
- //鍏ュ簱浠诲姟璧峰宸烽亾灏辨槸璧峰宸ヤ綅
+ //鍏ュ簱浠诲姟璧峰宸烽亾灏辨槸鍥涘悜杞﹀彇璐у伐浣�
if (string.IsNullOrWhiteSpace(waitTask.StartRoadway) || string.IsNullOrWhiteSpace(waitTask.EndLocate))
{
continue;
@@ -397,6 +397,7 @@
}
else if (waitTask.TaskType == TaskTypeEnum.Out)
{
+ //鍑哄簱浠诲姟鐩爣宸烽亾灏辨槸鍥涘悜杞︽斁璐у伐浣�
taskceng = int.Parse(waitTask.StartLocate.Substring(4, 2));
starLocate = waitTask.StartLocate;
endLocate = waitTask.EndRoadway;
@@ -497,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