Administrator 2 سال پیش
والد
کامیت
74a6a80263
2فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 1 1
      Projects/永冠/WCS.Service/Works/RGV/RGVWork.cs
  2. 1 1
      Projects/永冠/WCS.Service/Works/Stations/AGV交互.cs

+ 1 - 1
Projects/永冠/WCS.Service/Works/RGV/RGVWork.cs

@@ -382,7 +382,7 @@ namespace WCS.Service.Works
             {
                 short outTemp = 3060;
                 var arr = Device.Find("3006", "3060", "3001", "3005", "3004").Select(v => v.Device<IStation521, IStation520>()).ToArray();
-                if (arr.Where(v => v.Data.GOODSEND == outTemp).Any())
+                if (arr.Where(v => v.Data.GOODSEND is 3060 or 3013).Any())
                     throw new Exception("交通管制,提升机被入库任务占用");
                 if (arr.Where(v => v.Data.PH_STATUS && v.Data.TASKNUM == 0).Any()) throw new Exception("有光电无任务,交通管制,提升机被入库任务占用");
 

+ 1 - 1
Projects/永冠/WCS.Service/Works/Stations/AGV交互.cs

@@ -259,7 +259,7 @@ namespace WCS.Service.Works.Stations
 
                                 //3060没有出库任务
                                 var con3060 = Device.Find("3060").Device<IStation521, IStation523>();
-                                if (con3060.Data.PH_STATUS || con3060.Data.GOODSEND is 3001 or 0 || con3060.Data2.Status.HasFlag(StationStatus.运行状态位)) return;
+                                if ((con3060.Data.PH_STATUS && con3060.Data.GOODSEND is 3001 or 0 )|| con3060.Data2.Status.HasFlag(StationStatus.运行状态位)) return;
 
                                 agvtask.Status = agvtask.AGVStatus;
                                 agvtask.UpdateTime = DateTime.Now;