fix: 任务强制完成

lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java

@@ -25,6 +25,7 @@ import org.nl.wms.sch.task.service.dto.SchBaseTaskQuery;
 import org.nl.wms.sch.task_manage.AbstractTask;
 import org.nl.wms.sch.task_manage.TaskFactory;
 import org.nl.wms.sch.task_manage.TaskStatus;
+import org.nl.wms.util.TaskUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -32,7 +33,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -220,6 +220,12 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
             case "cancel":
                 abstractTask.cancel(task_code);
                 break;
+            case "finish":
+                taskOne.setTask_status(TaskStatus.FINISHED.getCode());
+                taskOne.setRemark("任务被用户:" + SecurityUtils.getCurrentUsername() + "在:" + DateUtil.now() + "强制完成。");
+                TaskUtils.setUpdateByDefault(taskOne);
+                updateById(taskOne);
+                break;
             default:
                 break;
         }

lms2/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -398,6 +398,13 @@
               @click="doOperate(scope.row, 'b')"
             >{{ $t('common.Cancel') }}
             </el-button>
+            <el-button
+              type="text"
+              icon="el-icon-error"
+              :disabled="scope.row.task_status==='07' || scope.row.task_status==='08'"
+              @click="doOperate(scope.row, 'e')"
+            >强制完成
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -518,6 +525,9 @@ export default {
         case 'd':// 详情
           method_name = 'view'
           break
+        case 'e':// 强制完成
+          method_name = 'finish'
+          break
       }
       if (method_name === 'view') {
         // this.view(row)