任务管理-下发测试任务

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

@@ -145,10 +145,8 @@ public class WcsTaskController extends BaseController {
         WcsTask wcsTask = new WcsTask();
         wcsTask.setTaskNo(System.currentTimeMillis() + "");
         wcsTask.setState(9L);
-        if (addTaskForm.getTaskType().equals(Constant.IS_YES.Y.toString())) {
-            wcsTask.setTaskType(Constant.TASK_TYPE.FORWARD.getValue());
-        }
-        wcsTask.setBusinessType(addTaskForm.getBusinessType());
+        wcsTask.setTaskType(Constant.TASK_TYPE.FORWARD.getValue());
+        wcsTask.setBusinessType(Constant.TASK_BUSINESS_TYPE.TASK_01.getValue());
         wcsTask.setAreaFrom(addTaskForm.getAreaFrom());
         wcsTask.setLocationFrom(addTaskForm.getLocationFrom());
         wcsTask.setAreaTo(addTaskForm.getAreaTo());

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

@@ -263,26 +263,26 @@
     <!-- 添加或修改AGV任务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="任务类型" prop="businessType">
-          <el-select v-model="form.businessType" placeholder="请选择任务类型" clearable size="small" style="width: 100%">
-            <el-option
-              v-for="dict in businessTypeCombo"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否转发" prop="businessType">
-          <el-select v-model="form.taskType" placeholder="请选择" clearable size="small" style="width: 100%">
-            <el-option
-              v-for="dict in taskTypeCombo"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="任务类型" prop="businessType">-->
+<!--          <el-select v-model="form.businessType" placeholder="请选择任务类型" clearable size="small" style="width: 100%">-->
+<!--            <el-option-->
+<!--              v-for="dict in businessTypeCombo"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="是否转发" prop="businessType">-->
+<!--          <el-select v-model="form.taskType" placeholder="请选择" clearable size="small" style="width: 100%">-->
+<!--            <el-option-->
+<!--              v-for="dict in taskTypeCombo"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="起始区域" prop="areaFrom">
           <el-select v-model="form.areaFrom" @change="locationZoneFromChange" placeholder="请选择库区" clearable
                      size="small" style="width: 100%">

warewms-ams/src/main/java/com/ruoyi/ams/task/form/AddTaskForm.java

@@ -14,8 +14,8 @@ public class AddTaskForm {
     private String areaTo;
     @NotBlank(message = "目标库位不能为空")
     private String locationTo;
-    @NotBlank(message = "任务类型不能为空")
+//    @NotBlank(message = "任务类型不能为空")
     private String businessType;
-    @NotBlank(message = "是否转发不能为空")
+//    @NotBlank(message = "是否转发不能为空")
     private String taskType;
 }