From 5efe8b388d1fcd0921d00b7cda68031fe3acb07e Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 27 May 2025 20:37:55 +0800
Subject: [PATCH] =?UTF-8?q?change-=E4=BC=98=E5=8C=96=E9=80=9F=E5=BA=A6?=
 =?UTF-8?q?=EF=BC=9A=E6=8F=90=E5=8D=87=E6=9C=BA=E5=BE=80=E4=B8=8B=E9=80=81?=
 =?UTF-8?q?=E6=96=99=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=B7=B2=E7=BB=8F?=
 =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E8=A1=A5=E7=A9=BA=E7=AE=B1=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E6=8E=A5=E5=88=B0=E7=A9=BA=E7=AE=B1=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E6=8E=A5=E9=A9=B3=E4=BD=8D=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E8=BF=98=E6=9C=89agv=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B2=E7=9A=84=E8=AF=9D=E8=BF=98=E5=8F=AF=E4=BB=A5=E5=86=8D?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=8B=E4=B8=80=E4=B8=AA=E8=A1=A5=E7=A9=BA?=
 =?UTF-8?q?=E7=AE=B1=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.WCS/WCS/BearAgv.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/SlnMesnac.WCS/WCS/BearAgv.cs b/SlnMesnac.WCS/WCS/BearAgv.cs
index cc834ca..a917f9e 100644
--- a/SlnMesnac.WCS/WCS/BearAgv.cs
+++ b/SlnMesnac.WCS/WCS/BearAgv.cs
@@ -1276,9 +1276,10 @@ namespace SlnMesnac.WCS.WCS
                 int suppleTaskCount = sqlSugarClient.Queryable<WcsTask>().Where(x => x.TaskType == StaticTaskType.SupplySmallPalletFromTonerTask || x.TaskType == StaticTaskType.SupplySmallPalletTask).Count();
                 int totalTaskCount = sqlSugarClient.Queryable<WcsTask>().Count();
                 int work2EmptyAmount = workShop2Plc.readInt16ByAddress(StaticData.GetPlcAddress("2#缓存链条线库存数"));
-                int work2BusyFlag = workShop2Plc.readInt16ByAddress(StaticData.GetPlcAddress("2#线体忙碌状态"));
-                if (work3EmptyAmount == 0 && totalTaskCount < 3 && suppleTaskCount == 1 && work2BusyFlag == 0 && work2EmptyAmount > 0)
+                int work2LineBusyFlag = workShop2Plc.readInt16ByAddress(StaticData.GetPlcAddress("2#缓存空箱线体状态"));
+                if (work3EmptyAmount == 0 && totalTaskCount < 3 && suppleTaskCount == 1 && work2LineBusyFlag == 0 && work2EmptyAmount > 0)
                 {
+                    workShop2Plc.writeInt16ByAddress(StaticData.GetPlcAddress("2#缓存空箱线体状态"), 1);
                     WcsTask task = new WcsTask();
                     task.TaskType = StaticTaskType.SupplySmallPalletTask;
                     task.CurrPointNo = "2DeliverMetrologyRoomPoint";
@@ -1295,11 +1296,11 @@ namespace SlnMesnac.WCS.WCS
                         wcsTaskLog.Id = id;
                         sqlSugarClient.Insertable(wcsTaskLog).ExecuteCommand();
                         sqlSugarClient.AsTenant().CommitTran();
-                        workShop2Plc.writeInt16ByAddress(StaticData.GetPlcAddress("2#线体忙碌状态"), 1);
                     }
                     catch (Exception ex)
                     {
                         sqlSugarClient.AsTenant().RollbackTran();
+                        workShop2Plc.writeInt16ByAddress(StaticData.GetPlcAddress("2#缓存空箱线体状态"), 0);
                         _logger.Error($"3#车间从2#接驳位补充小托盘任务生成提交事务异常{ex.Message}");
                     }
                     _logger.Agv($"生成{task.TaskName},起点:{task.CurrPointNo},终点:{task.EndPointNo}");