fix

Projects/永冠OPP/WCS.Entity.Protocol/SRM/SRMEnum.cs

@@ -130,8 +130,8 @@ namespace WCS.Entity.Protocol.SRM
         货物左后坍塌 = 1L << 54,
         货物右后坍塌 = 1L << 55,
         登梯口急停 = 1L << 56,
-        货物左超高1M9 = 1L << 57,
-        货物右超高1M9 = 1L << 58,
+        货物左超高70CM = 1L << 57,
+        货物右超高70CM = 1L << 58,
         松绳限位触发2 = 1L << 59,
         货叉右侧超行程 = 1L << 60,
         取放货托盘总数超限 = 1L << 61,

Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

@@ -1,6 +1,7 @@
 using DBHelper;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using WCS.Core;
 using WCS.Entity;
@@ -157,8 +158,7 @@ namespace WCS.Service.Extensions
         /// <returns></returns>
         public List<FinishTaskList<string>> GetBcrValid()
         {
-            var list = new List<FinishTaskList<string>>();
-
+            var list = new List<FinishTaskList<string>>();           
             //获取需要执行的设备信息
             foreach (var dev in Items)
             {
@@ -178,6 +178,7 @@ namespace WCS.Service.Extensions
                     continue;
                 }
 
+
                 var bcr = dev.Entity.BCR();
                 var barcode = bcr.Content.Trim('\r');
                 if (barcode == "")
@@ -187,6 +188,7 @@ namespace WCS.Service.Extensions
                 };
 
                 list.Add(new FinishTaskList<string>(barcode, dev.Entity.Create<StationDevice>()));
+                               
             }
             return list;
         }

Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -33,7 +33,7 @@ namespace WCS.Service.Works.SRM
                     InfoLog.INFO_SRMALARM($"{deviceCode}-{srmDevice.Data3.SCAlarm}");
                     return;
                 }
-                if (srmDevice.Data.FinishedACK_1 == 1 || srmDevice.Data.FinishedACK_2 == 1) throw new WarnException($"堆垛机完成任务WCS反馈信号未清除");
+                if (srmDevice.Data.FinishedACK_1 == 1 || srmDevice.Data.FinishedACK_2 == 1) throw new WarnException($"WCS反馈任务完成信号PLC未清除");
                 if (srmDevice.Data2.VoucherNo_1 != srmDevice.Data.VoucherNo_1 || srmDevice.Data2.VoucherNo_2 != srmDevice.Data.VoucherNo_2)
                 {
                     DB.Do(db =>
@@ -41,7 +41,7 @@ namespace WCS.Service.Works.SRM
                         WCS_TASK task;
                         if (srmDevice.Data2.VoucherNo_1 != srmDevice.Data.VoucherNo_1)
                         {
-                            task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == srmDevice.Data.TaskID_1) ?? throw new WarnException($"未好到对应的WCS任务--{srmDevice.Data.TaskID_1}");
+                            task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == srmDevice.Data.TaskID_1) ?? throw new WarnException($"未找到对应的WCS任务--{srmDevice.Data.TaskID_1}");
                             if (task.STATUS == TaskStatus.新建)
                             {
                                 srmDevice.Data.VoucherNo_1 = srmDevice.Data2.VoucherNo_1;
@@ -49,7 +49,7 @@ namespace WCS.Service.Works.SRM
                         }
                         if (srmDevice.Data2.VoucherNo_2 != srmDevice.Data.VoucherNo_2)
                         {
-                            task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == srmDevice.Data.TaskID_2) ?? throw new WarnException($"未好到对应的WCS任务--{srmDevice.Data.TaskID_2}");
+                            task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == srmDevice.Data.TaskID_2) ?? throw new WarnException($"未找到对应的WCS任务--{srmDevice.Data.TaskID_2}");
                             if (task.STATUS == TaskStatus.新建)
                             {
                                 srmDevice.Data.VoucherNo_2 = srmDevice.Data2.VoucherNo_2;

Projects/永冠OPP/WCS.Service/Works/Station/涂布出库.cs

@@ -521,7 +521,7 @@ namespace WCS.Service.Works.Station
                                  task.CreateStatusLog(db, $"创建任务", this.GetType());
                                  db.Default.Set<WCS_TASK>().Add(task);
                                  tasking.Status = AGVTaskStatus.确认;
-                                 tasking.UpdateTime = DateTime.Now;
+                                 tasking.UpdateTime = DateTime.Now;                                
                                  db.Default.SaveChanges();
                                  tasking.AGVStatusChange(AGVTaskStatus.确认, "获取出库任务");
                              });

Projects/永冠OPP/WCS.Service/Works/Station/连廊车间入库.cs

@@ -129,6 +129,7 @@ namespace WCS.Service.Works.Station
             obj.EX(stationDeviceGroup =>
             {
                 var station = stationDeviceGroup.Entity.CODE;
+                var isJudge = obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) || v.Data2.Tasknum>10000);
 
                 #region 处理新增AGV任务
 
@@ -184,7 +185,7 @@ namespace WCS.Service.Works.Station
                         #endregion
                         else if (tasking.Status < tasking.AGVStatus)
                         {
-                            if (tasking.AGVStatus == AGVTaskStatus.请求_允许)
+                            if (tasking.AGVStatus == AGVTaskStatus.请求_允许 && !isJudge)
                             {
                                 if (stationDeviceGroup.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.自动)))
                                 {