Administrator 2 年 前
コミット
6c888f8f86

+ 1 - 1
DBHelper/DB.cs

@@ -143,7 +143,7 @@ namespace DBHelper
         {
             TransactionOptions transactionOptions = new TransactionOptions();
             transactionOptions.IsolationLevel = IsolationLevel.ReadCommitted;
-            transactionOptions.Timeout = new TimeSpan(0, 0, 60);
+            transactionOptions.Timeout = new TimeSpan(0, 0, 120);
             using (var trans = new TransactionScope(TransactionScopeOption.RequiresNew, transactionOptions))
             {
                 using (var db = new DB())

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

@@ -91,7 +91,7 @@ namespace WCS.Service.Works.SRM
                         //判断是否存在调整优先级任务,存在初始化isTransfer值 让本次执行优先任务
                         if (tasks.Any(v => v.TYPE != TaskType.移库 && v.STATUS < TaskStatus.堆垛机执行 && v.Priority > 0)) isTransfer = false;
                         enterPriority = tasks.Where(v => v.TYPE == TaskType.入库 && v.STATUS < TaskStatus.堆垛机执行).OrderByDescending(v => v.Priority).FirstOrDefault();
-                        outPriority = tasks.Where(v => v.TYPE == TaskType.出库 && v.STATUS < TaskStatus.堆垛机执行).OrderByDescending(v => v.Priority).FirstOrDefault();
+                        outPriority = tasks.Where(v => v.TYPE == TaskType.出库 && v.STATUS < TaskStatus.堆垛机执行 && v.STATUS!= TaskStatus.执行中).OrderByDescending(v => v.Priority).FirstOrDefault();
                     }
 
                     #endregion 没有倒库任务

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

@@ -491,7 +491,7 @@ namespace WCS.Service.Works.Station
                              }
                              catch (WarnException ex)
                              {
-                                 InfoLog.INFO_WarnDb($"{ex.Message}", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
+                                 InfoLog.INFO_WarnDb($"目标位置{tasking.Position.Replace("_OUT", "")}获取出库任务失败,原因:【{ex.Message}", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
                                  continue;
                              };