Merge branch '合金库' of http://120.77.11.229:3000/zuolinhao/WcsFramework into 合金库

WCS.WorkEngineering/WebApi/Controllers/AgvController.cs

@@ -117,18 +117,21 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                         }
                         var stationNo = res.ResDataList.OrderBy(v => v.Count).Select(v => v.Tunnel.ToString()).ToList();
                         var dev = obj.MinBy(v => stationNo.IndexOf(v.Entity.Code));
-                        var id = db.Default.Queryable<WCS_AgvTaskInfo>().SplitTable(v => v.Take(1)).Max(v => v.ID);
+                        var task = db.Default.Queryable<WCS_TaskInfo>().First(v => v.ID == dev.Data.TaskNumber) ?? throw new Exception("无有效任务");
+                        var id = db.GetAGVTaskId();
                         var agv = new WCS_AgvTaskInfo()
                         {
-                            ID = db.GetAGVTaskId(),
+                            ID = id,
+                            AgvID = $"HJBK{id}{task.ID}",
                             TaskType = AGVTaskType.CallForMaterial,
                             Status = AGVTaskStatus.NewBuild,
                             Station = dev.Entity.Code,
                             AddWho = "WCS"
+
                         };
                         //创建对应的AGV任务
                         db.Default.Insertable(agv).SplitTable().ExecuteCommand();
-                        var task = db.Default.Queryable<WCS_TaskInfo>().First(v => v.ID == dev.Data.TaskNumber) ?? throw new Exception("无有效任务");
+
                         task.AgvTaskID = agv.ID;
                         db.Default.Updateable(task).ExecuteCommand();
 
@@ -136,6 +139,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                         agvFill.SpoolType = "4";
                         agvFill.ResMsg = "";
                         agvFill.ResCode = Models.WMS.Response.ResponseStatusCodeEnum.Sucess;
+                        agvFill.TaskCode = agv.AgvID;
                     });
                 }
                 catch (Exception ex)

WCS.WorkEngineering/WebApi/Models/AGV/Response/ApplyEmptySpoolResponse.cs

@@ -26,5 +26,10 @@ namespace WCS.WorkEngineering.WebApi.Models.AGV.Response
         ///  描述信息
         /// </summary>
         public string ResMsg { get; set; }
+
+        /// <summary>
+        ///  任务号
+        /// </summary>
+        public string TaskCode { get; set; }
     }
 }