fix

WCS.WorkEngineering/Systems/一楼入库工位处理系统.cs

@@ -36,40 +36,46 @@ namespace WCS.WorkEngineering.Systems
             obj.入库站点是否满足执行条件();
 
             WCS_TaskInfo task = null;//处理完成的任务
-            SqlSugarHelper.Do(_db =>
-           {
-               var db = _db.Default;
-               //获取RFID
-               var barcode = BCRS.GetBCRCode(obj.Entity.Code);
-               //跟据RFID获取对应的任务
-               var taskInfo = db.Queryable<WCS_TaskInfo>().First(v => v.BarCode == barcode) ?? throw new KnownException($"未找到RFID:{barcode}对应WCS任务", LogLevelEnum.Mid);
-               if (taskInfo.Status != Entity.TaskStatus.AGVExecution)
-               {
-                   if (db.Queryable<WCS_TaskDtl>().SplitTable(v => v.Take(2)).Any(v => v.ParentTaskCode == taskInfo.ID && v.Desc.Contains("等待分配货位后堆垛机进行取货"))) return;
-                   else throw new KnownException($"任务:{taskInfo.ID}不是AGV执行状态，请检查异常原因", LogLevelEnum.High);
-               }
+            try
+            {
+                SqlSugarHelper.Do(_db =>
+                {
+                    var db = _db.Default;
+                    //获取RFID
+                    var barcode = BCRS.GetBCRCode(obj.Entity.Code);
+                    //跟据RFID获取对应的任务
+                    var taskInfo = db.Queryable<WCS_TaskInfo>().First(v => v.BarCode == barcode) ?? throw new KnownException($"未找到RFID:{barcode}对应WCS任务", LogLevelEnum.Mid);
+                    if (taskInfo.Status != Entity.TaskStatus.AGVExecution)
+                    {
+                        if (db.Queryable<WCS_TaskDtl>().SplitTable(v => v.Take(2)).Any(v => v.ParentTaskCode == taskInfo.ID && v.Desc.Contains("等待分配货位后堆垛机进行取货"))) return;
+                        else throw new KnownException($"任务:{taskInfo.ID}不是AGV执行状态，请检查异常原因", LogLevelEnum.High);
+                    }
 
-               if (!obj.Data3.Status.HasFlag(StatusEunm.ManualStorage)) //不是手动入库
-               {
-                   //判断AGV任务目标地址是否是当前地址
-                   var agv = db.Queryable<WCS_AgvTaskInfo>().SplitTable(v => v.Take(2)).First(v => v.ID == taskInfo.AgvTaskID) ?? throw new KnownException($"任务{taskInfo.ID}未找到对应AGV任务", LogLevelEnum.Mid);
-                   if (taskInfo.AddrNext != obj.Entity.Code) throw new KnownException($"任务{taskInfo.ID}不是货架上的任务，请检查RFID是否正确", LogLevelEnum.Mid);
-                   if (agv.Position != obj.Entity.Code) throw new KnownException($"任务{taskInfo.ID}对应AGV任务目标地址不是当前站台", LogLevelEnum.Mid);
-               }
+                    if (!obj.Data3.Status.HasFlag(StatusEunm.ManualStorage)) //不是手动入库
+                    {
+                        //判断AGV任务目标地址是否是当前地址
+                        var agv = db.Queryable<WCS_AgvTaskInfo>().SplitTable(v => v.Take(2)).First(v => v.ID == taskInfo.AgvTaskID) ?? throw new KnownException($"任务{taskInfo.ID}未找到对应AGV任务", LogLevelEnum.Mid);
+                        if (taskInfo.AddrNext != obj.Entity.Code) throw new KnownException($"任务{taskInfo.ID}不是货架上的任务，请检查RFID是否正确", LogLevelEnum.Mid);
+                        if (agv.Position != obj.Entity.Code) throw new KnownException($"任务{taskInfo.ID}对应AGV任务目标地址不是当前站台", LogLevelEnum.Mid);
+                    }
 
-               //获取称重
-               var dev91 = Device.All.Where(v => v.Code == obj.Entity.Code).Select(v => new Device<IStation91>(v, this.World)).FirstOrDefault();
-               taskInfo.Weight = dev91.Data.Weight;
-               if (taskInfo.Weight < 200) throw new KnownException($"称重结果错误:{taskInfo.Weight}", LogLevelEnum.Mid);
-               //上抛重量
-               try { WmsApi.WcsUploadInfo(taskInfo.ID, (decimal)taskInfo.Weight, taskInfo.BarCode); } catch (Exception ex) { World.Log(ex.Message, LogLevelEnum.Mid); }
+                    //获取称重
+                    var dev91 = Device.All.Where(v => v.Code == obj.Entity.Code).Select(v => new Device<IStation91>(v, this.World)).FirstOrDefault();
+                    taskInfo.Weight = dev91.Data.Weight;
+                    if (taskInfo.Weight < 200) throw new KnownException($"称重结果错误:{taskInfo.Weight}", LogLevelEnum.Mid);
+                    //上抛重量
+                    try { WmsApi.WcsUploadInfo(taskInfo.ID, (decimal)taskInfo.Weight, taskInfo.BarCode); } catch (Exception ex) { World.Log(ex.Message, LogLevelEnum.Mid); }
 
-               taskInfo.Status = Entity.TaskStatus.ConveyorExecution;
-               db.Updateable(taskInfo).ExecuteCommand();
-               taskInfo.AddWCS_TASK_DTL(_db, obj.Entity.Code, "SRM", $"状态更新为{Entity.TaskStatus.ConveyorExecution},等待分配货位后堆垛机进行取货");
-               task = taskInfo;
-           });
-            if (task == null) throw new KnownException("数据更新错误", LogLevelEnum.High);
+                    taskInfo.Status = Entity.TaskStatus.ConveyorExecution;
+                    db.Updateable(taskInfo).ExecuteCommand();
+                    taskInfo.AddWCS_TASK_DTL(_db, obj.Entity.Code, "SRM", $"状态更新为{Entity.TaskStatus.ConveyorExecution},等待分配货位后堆垛机进行取货");
+                    task = taskInfo;
+                });
+            }
+            catch (Exception ex)
+            {
+                throw new KnownException(ex.Message, LogLevelEnum.High);
+            }
             obj.Data.TaskNumber = task.ID;
             obj.Data.VoucherNo++;
         }

WCS.WorkEngineering/WebApi/Controllers/WcsController.cs

@@ -78,7 +78,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                                         break;
 
                                     case TaskType.EnterDepot:
-                                        if (task.Status != Entity.TaskStatus.WaitingToExecute)
+                                        if (task.Status > Entity.TaskStatus.WaitingToExecute)
                                         {
                                             response.ResDataList.Add(new HandleTaskResponse()
                                             {