任务管理-完成按钮修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/WcsTaskController.java

@@ -116,9 +116,12 @@ public class WcsTaskController extends BaseController {
     public AjaxResult taskComplete(@PathVariable("taskNo") String taskNo) {
         WcsTask wcsTask = wcsTaskService.selectWcsTaskByTaskNo(taskNo);
         if (wcsTask == null) {
-            AjaxResult.error("任务回调失败");
+           return AjaxResult.error("任务回调失败");
         }
-        wcsTaskService.callBackTaskComplete(wcsTask);
+        if (!wcsTask.getState().equals("4")) {
+           return AjaxResult.error("任务未取货，不能直接完成！");
+        }
+        wcsTaskService.callBack(wcsTask.getTaskNo(),2,Integer.parseInt(wcsTask.getAgvNo()));
         return AjaxResult.success("任务回调完成");
     }
 

ruoyi-ui/src/views/ams/task/index.vue

@@ -495,6 +495,7 @@ import {
 } from "@/api/ams/wcsTask";
 import { queryLocationDict } from "@/api/base/locationInfo";
 import { queryLocationZoneDict } from "@/api/base/locationZone"
+import {lockLocRequest} from "@/api/ams/locationView";
 
 export default {
   name: "WcsTask",
@@ -763,11 +764,14 @@ export default {
     handleComplete (row) {
       const taskNos = row.taskNo
       this.$modal.confirm('是否确认要完成"' + taskNos + '"的任务？').then(function() {
-        return completeWcsTask(taskNos);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("执行成功");
-      }).catch(() => {});
+        completeWcsTask(taskNos).then(response => {
+          if (response.code === 200) {
+            this.$modal.msgSuccess(response.msg);
+          } else {
+            this.$modal.msgError("111");
+          }
+        });
+      });
     },
     handleCancel (row) {
       const taskNos = row.taskNo