Browse Source

fix_涂布入库

xu.lu 3 years ago
parent
commit
2fb9056ca9
1 changed files with 9 additions and 2 deletions
  1. 9 2
      Projects/永冠OPP/WCS.Service/Works/Station/涂布入库.cs

+ 9 - 2
Projects/永冠OPP/WCS.Service/Works/Station/涂布入库.cs

@@ -135,6 +135,13 @@ namespace WCS.Service.Works.Station
                                     InfoLog.INFO_WarnDb("上一个允许放货的AGV任务未完成", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
                                     continue;
                                 }
+                                
+                                var judge = Device.Find("1435").Device<IStation521>();
+                                if (judge.Data.Status.HasFlag(IstationStatus.光电状态)&& obj.Entity.CODE=="G1394")
+                                {
+                                    InfoLog.INFO_WarnDb("前方有光电,不可放货", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
+                                    continue;
+                                }
 
                                 agvtask.Status = agvtask.AGVStatus;
                                 agvtask.UpdateTime = DateTime.Now;
@@ -213,7 +220,7 @@ namespace WCS.Service.Works.Station
                 //设备组无论单卷还是双卷都必须满足的条件
                 if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) throw new WarnException($"等待任务执行--凭证号不一致");
                 if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new WarnException($"设备运行中");
-                if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.低位))) throw new DoException("不在低位");
+                //if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.低位))) throw new DoException("不在低位");
 
                 //成功创建的任务
                 var finishTaskList = new List<FinishTaskList<int>>();
@@ -297,7 +304,7 @@ namespace WCS.Service.Works.Station
 
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            return dev.CODE == "G1386" || dev.CODE == "G1394";
+            return dev.CODE == "G1386" || dev.CODE == "G1435";
         }
     }