From a3a061b93f2aef5e73289ac6fca7bfa8cafa17d8 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 3 Dec 2024 08:57:47 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=B8=8B=E5=8F=91=E8=BE=93?=
 =?UTF-8?q?=E9=80=81=E7=BA=BF=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E8=BD=BD?=
 =?UTF-8?q?=E5=85=B7=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/acs/agv/server/AgvWaitUtil.java    |  2 ++
 acs2/nladmin-ui/src/views/acs/task/index.vue  | 35 +++++++++++++------
 2 files changed, 27 insertions(+), 10 deletions(-)

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 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="是否需要载具">
+            <el-select
+              v-model="form.is_vehicle"
+              style="width: 370px;"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in dict.is_yes_not"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="优先级">
             <el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
           </el-form-item>
@@ -261,22 +276,22 @@
         </el-table-column>
         <el-table-column prop="priority" label="任务优先级" min-width="100" show-overflow-tooltip />
         <el-table-column prop="start_point_code" label="起点" min-width="100" show-overflow-tooltip />
-        <!--        <el-table-column prop="start_parent_code" label="父起点点位" min-width="100" show-overflow-tooltip />-->
         <el-table-column prop="next_point_code" label="终点" min-width="100" show-overflow-tooltip />
-        <!--        <el-table-column prop="next_parent_code" label="父终点点位" min-width="100" show-overflow-tooltip />-->
-        <el-table-column prop="start_point_code2" label="起点2" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="next_point_code2" label="终点2" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="put_device_code" label="放货位" min-width="100" show-overflow-tooltip />
+<!--        <el-table-column prop="start_point_code2" label="起点2" min-width="100" show-overflow-tooltip />-->
+<!--        <el-table-column prop="next_point_code2" label="终点2" min-width="100" show-overflow-tooltip />-->
+<!--        <el-table-column prop="put_device_code" label="放货位" min-width="100" show-overflow-tooltip />-->
 
-        <el-table-column prop="compound_task" label="复合任务">
+        <!--<el-table-column prop="compound_task" label="复合任务">
           <template slot-scope="scope">
             <span v-if="scope.row.compound_task==='0' ">否</span>
             <span v-if="scope.row.compound_task==='1' ">是</span>
           </template>
-        </el-table-column>
-        <el-table-column prop="compound_task_data" width="200" label="复合路线" />
-        <el-table-column prop="matarial" label="物料" />
+        </el-table-column>-->
+<!--        <el-table-column prop="compound_task_data" width="200" label="复合路线" />-->
+<!--        <el-table-column prop="matarial" label="物料" />-->
         <el-table-column prop="quantity" label="数量" />
+        <el-table-column prop="is_vehicle" label="是否需要载具" width="135" />
+
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="create_by" label="创建者" />
         <el-table-column prop="create_time" label="创建时间" width="135" />
@@ -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',