gkj 2 anos atrás
pai
commit
5a5a7ff061

+ 1 - 1
WCS.WorkEngineering/Systems/AgvSystems.cs

@@ -169,8 +169,8 @@ namespace WCS.WorkEngineering.Systems
                             task.Device = srm.Entity.Code;
                             task.Tunnel = task.Device.GetLastDigit().ToString();
                             task.AddrNext = agv.Position;
-                            task.AddWCS_TASK_DTL(db, "AGV巷道分配点", nextPos.Entity.Code, $"任务分配至堆垛机:{srm.Entity.Code}");
                             db.Default.Updateable(task).ExecuteCommand();
+                            task.AddWCS_TASK_DTL(db, "AGV巷道分配点", nextPos.Entity.Code, $"任务分配至堆垛机:{srm.Entity.Code}");
                             //调继续执行任务接口
                             AgvApi.ContinueTask(agv.AgvID, nextPos.Entity.Code);
                         }

+ 8 - 8
WCS.WorkEngineering/Systems/二楼入库工位处理系统.cs

@@ -58,9 +58,9 @@ namespace WCS.WorkEngineering.Systems
 
                  if (task == null)
                  {
-                     taskInfo = db.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data.TaskNumber && task.Type == TaskType.EnterDepot);
+                     taskInfo = db.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data.TaskNumber && v.Type == TaskType.EnterDepot);
                      if (taskInfo == null) throw new KnownException($"未找到任务[{obj.Data.TaskNumber}],或该任务不是入库任务", LogLevelEnum.Mid);
-                     if (task.Status != Entity.TaskStatus.AGVExecution)
+                     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("等待分配货位后堆垛机进行取货")))
                          {
@@ -74,15 +74,15 @@ namespace WCS.WorkEngineering.Systems
                  if (obj.Entity.Code == "1025")//获取称重
                  {
                      var dev91 = Device.All.Where(v => v.Code == obj.Entity.Code).Select(v => new Device<IStation91>(v, this.World)).FirstOrDefault();
-                     task.Weight = dev91.Data.Weight;
-                     if (task.Weight <= 100) throw new KnownException($"称重结果错误:{task.Weight}", LogLevelEnum.Mid);
+                     taskInfo.Weight = dev91.Data.Weight;
+                     if (taskInfo.Weight <= 100) throw new KnownException($"称重结果错误:{taskInfo.Weight}", LogLevelEnum.Mid);
                      //上抛重量
-                     try { WmsApi.WcsUploadInfo(task.ID, (decimal)task.Weight, task.BarCode); } catch (Exception ex) { World.Log(ex.Message, LogLevelEnum.Mid); }
+                     try { WmsApi.WcsUploadInfo(taskInfo.ID, (decimal)taskInfo.Weight, taskInfo.BarCode); } catch (Exception ex) { World.Log(ex.Message, LogLevelEnum.Mid); }
                  }
 
-                 task.Status = TaskStatus.ConveyorExecution;
-                 db.Updateable(task).ExecuteCommand();
-                 task.AddWCS_TASK_DTL(_db, obj.Entity.Code, "SRM", $"状态更新为{TaskStatus.ConveyorExecution.GetDisplayName()},等待分配货位后堆垛机进行取货");
+                 taskInfo.Status = TaskStatus.ConveyorExecution;
+                 db.Updateable(taskInfo).ExecuteCommand();
+                 taskInfo.AddWCS_TASK_DTL(_db, obj.Entity.Code, "SRM", $"状态更新为{TaskStatus.ConveyorExecution.GetDisplayName()},等待分配货位后堆垛机进行取货");
                  task = taskInfo;
              });
             if (task == null) throw new KnownException("数据更新错误", LogLevelEnum.High);