Merge branch '数据库连接方式测试' of http://120.77.11.229:3000/zuolinhao/WcsFramework into 数据库连接方式测试

WCS.WorkEngineering/WebApi/Controllers/AgvController.cs

@@ -77,6 +77,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
 
                 try
                 {
+                    agvFill.ResCode = Models.WMS.Response.ResponseStatusCodeEnum.DataSaveErr;
                     if (!World.IsStart)
                     {
                         agvFill.ResCode = Models.WMS.Response.ResponseStatusCodeEnum.DataSaveErr;
@@ -117,11 +118,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                             item.Tunnel = station.ToInt();
                         }
                         var stationNo = res.ResDataList.OrderBy(v => v.Count).Select(v => v.Tunnel.ToString()).ToList();
-                        agvFill.ResCode = Models.WMS.Response.ResponseStatusCodeEnum.Sucess;
                         var dev = obj.MinBy(v => stationNo.IndexOf(v.Entity.Code));
-                        agvFill.LocCode = dev.Entity.Code;
-                        agvFill.SpoolType = "4";
-                        agvFill.ResMsg = "";
                         var id = db.Default.Queryable<WCS_AgvTaskInfo>().SplitTable(v => v.Take(1)).Max(v => v.ID);
                         var agv = new WCS_AgvTaskInfo()
                         {
@@ -136,6 +133,11 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                         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();
+
+                        agvFill.LocCode = dev.Entity.Code;
+                        agvFill.SpoolType = "4";
+                        agvFill.ResMsg = "";
+                        agvFill.ResCode = Models.WMS.Response.ResponseStatusCodeEnum.Sucess;
                     });
                 }
                 catch (Exception ex)
@@ -159,7 +161,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
             lock (LockHub.AgvCallbackLock)
             {
                 LogHub.InterfaceProcessLog("AgvCallback", JsonConvert.SerializeObject(reqDto));
-                var res = new AgvCallbackResponse() { code = AgvResponseCode.Success, message = "成功" };
+                var res = new AgvCallbackResponse() { code = AgvResponseCode.Fail, message = "失败" };
                 WCS_TaskInfo taskInfo = null;
                 try
                 {
@@ -260,6 +262,8 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                                 break;
                         }
                         db.Default.Updateable(agvTask).SplitTable().ExecuteCommand();
+                        res.code = AgvResponseCode.Success;
+                        res.message = "成功";
                     });
                     if (taskInfo != null && taskInfo.Status == Entity.TaskStatus.Finish) WmsApi.CompleteTask(taskInfo.ID);
                 }