diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
index 5a2d41a..d9a0bb1 100644
--- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
+++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
@@ -140,6 +140,8 @@ public class AgvWaitUtil {
JSONObject param = new JSONObject();
param.put("toCommand",XgAgvEnum.APPLY_PUT.getCode());
param.put("deviceCode",deviceCode);
+ // 判断是否需要空托盘
+ param.put("isBarcode", ObjectUtil.isEmpty(taskDto.getIs_vehicle()) ? "0" : taskDto.getIs_vehicle());
JSONObject data = new JSONObject();
data.put("DATA", param);
diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue
index b1b979d..2cefa2d 100644
--- a/acs2/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/task/index.vue
@@ -231,6 +231,21 @@
/>
+
+
+
+
+
@@ -261,22 +276,22 @@
-
-
-
-
-
+
+
+
-
+
+
+
+
+
@@ -313,7 +328,7 @@ import { getDicts } from '@/api/system/dict'
export default {
name: 'Task',
components: { pagination, crudOperation },
- dicts: ['task_status', 'task_type'],
+ dicts: ['task_status', 'task_type', 'is_yes_not'],
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({ title: '任务', url: 'api/task', idField: 'task_id', sort: 'task_id,desc',