From d16434fc56a0f6d9e8a7d976f90f9f067cbcd841 Mon Sep 17 00:00:00 2001
From: loujf <loujingfei666@163.com>
Date: Thu, 1 Dec 2022 16:39:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../produceshiftorder/produceshiftorder.js    |  35 ++++
 .../src/views/acs/instruction/index.vue       |  10 +-
 .../src/views/acs/produceshiftorder/index.vue | 157 ++++++++++++++++++
 .../src/views/acs/route/routeLine/index.vue   |   1 +
 acs/nladmin-ui/src/views/acs/task/index.vue   |  18 +-
 5 files changed, 204 insertions(+), 17 deletions(-)
 create mode 100644 acs/nladmin-ui/src/api/acs/produceshiftorder/produceshiftorder.js
 create mode 100644 acs/nladmin-ui/src/views/acs/produceshiftorder/index.vue

diff --git a/acs/nladmin-ui/src/api/acs/produceshiftorder/produceshiftorder.js b/acs/nladmin-ui/src/api/acs/produceshiftorder/produceshiftorder.js
new file mode 100644
index 0000000..955d1ec
--- /dev/null
+++ b/acs/nladmin-ui/src/api/acs/produceshiftorder/produceshiftorder.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/produceshiftorder',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/produceshiftorder/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function finish(order_id) {
+  return request({
+    url: 'api/produceshiftorder/finish/' + order_id,
+    method: 'post',
+    data: order_id
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/produceshiftorder',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del, finish }
diff --git a/acs/nladmin-ui/src/views/acs/instruction/index.vue b/acs/nladmin-ui/src/views/acs/instruction/index.vue
index 7e82e25..960b244 100644
--- a/acs/nladmin-ui/src/views/acs/instruction/index.vue
+++ b/acs/nladmin-ui/src/views/acs/instruction/index.vue
@@ -110,7 +110,6 @@
         <el-table-column v-if="false" prop="instruction_id" label="指令标识" />
         <el-table-column prop="instruction_code" label="指令编号" />
         <el-table-column prop="instruction_type" label="指令类型" />
-        <el-table-column prop="link_num" label="关联编号" />
         <el-table-column prop="task_code" label="任务号" />
         <el-table-column prop="vehicle_code" label="载具号" />
         <el-table-column prop="instruction_status" label="指令状态">
@@ -127,9 +126,10 @@
             <span v-if="scope.row.send_status=='2' ">失败</span>
           </template>
         </el-table-column>
-        <el-table-column prop="start_point_code" label="取货点" />
-        <el-table-column prop="put_point_code" label="倒料点" />
-        <el-table-column prop="next_point_code" label="放货点" />
+        <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="carno" label="车号" />
         <el-table-column prop="compound_inst" label="复合指令">
           <template slot-scope="scope">
@@ -149,7 +149,7 @@
           v-permission="['admin','instruction:edit','instruction:del']"
           fixed="left"
           label="操作"
-          width="150px"
+          width="80px"
           align="center"
         >
           <template slot-scope="scope">
diff --git a/acs/nladmin-ui/src/views/acs/produceshiftorder/index.vue b/acs/nladmin-ui/src/views/acs/produceshiftorder/index.vue
new file mode 100644
index 0000000..6d84715
--- /dev/null
+++ b/acs/nladmin-ui/src/views/acs/produceshiftorder/index.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input
+          v-model="query.order_code"
+          size="small"
+          clearable
+          placeholder="输入工单编码或设备编码"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <rrOperation />
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="工单编码" prop="order_code">
+            <el-input v-model="form.order_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="设备编码" prop="order_code">
+            <el-input v-model="form.device_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="下料数量" prop="qty">
+            <el-input v-model="form.qty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="物料编码" prop="material_code">
+            <el-input v-model="form.material_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="物料名称" prop="material_name">
+            <el-input v-model="form.material_name" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="客户编码">
+            <el-input v-model="form.cust_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="客户名称">
+            <el-input v-model="form.cust_name" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="型号">
+            <el-input v-model="form.model" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="熔池">
+            <el-input v-model="form.molten_pool" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="重量">
+            <el-input v-model="form.weight" style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="order_code" label="工单编码" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="device_code" label="设备编码" />
+        <el-table-column prop="order_status_name" label="工单状态" />
+        <el-table-column prop="qty" label="下料数量" />
+        <el-table-column prop="material_code" label="物料编码" />
+        <el-table-column prop="material_name" label="物料名称" />
+        <el-table-column prop="cust_code" label="客户编码" />
+        <el-table-column prop="cust_name" label="客户名称" />
+        <el-table-column prop="model" label="型号" />
+        <el-table-column prop="molten_pool" label="熔池" />
+        <el-table-column prop="weight" label="重量" />
+        <el-table-column prop="create_by" label="创建者" />
+        <el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip />
+        <el-table-column v-permission="['admin','produceshiftorder:edit','produceshiftorder:del']" label="操作" width="160px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              style="display: inline"
+              :data="scope.row"
+              :permission="permission"
+            />
+            <el-button slot="right" size="mini" type="text" @click="finish(scope.$index, scope.row)">
+              完成
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import crudProduceshiftorder from '@/api/acs/produceshiftorder/produceshiftorder'
+import crudTask from '@/api/acs/task/task'
+
+const defaultForm = { order_id: null, order_code: null, is_unbundling: null, order_status: null, qty: null, product_code: null, material_code: null, material_name: null, material_uuid: null, cust_code: null, cust_name: null, model: null, molten_pool: null, weight: null, create_by: null, create_time: null, update_by: null, update_time: null, is_deleted: null }
+export default {
+  name: 'Produceshiftorder',
+  // eslint-disable-next-line vue/no-unused-components
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({ title: '工单信息', url: 'api/produceshiftorder', idField: 'create_time', sort: 'create_time,desc', crudMethod: { ...crudProduceshiftorder }})
+  },
+  data() {
+    return {
+      permission: {
+        add: ['admin', 'produceshiftorder:add'],
+        edit: ['admin', 'produceshiftorder:edit'],
+        del: ['admin', 'produceshiftorder:del']
+      },
+      rules: {
+        order_code: [
+          { required: true, message: '工单编码不能为空', trigger: 'blur' }
+        ],
+        qty: [
+          { required: true, message: '下料数量不能为空', trigger: 'blur' }
+        ],
+        product_code: [
+          { required: true, message: '产品编码不能为空', trigger: 'blur' }
+        ],
+        material_code: [
+          { required: true, message: '物料编码不能为空', trigger: 'blur' }
+        ],
+        material_name: [
+          { required: true, message: '物料名称不能为空', trigger: 'blur' }
+        ]
+      }}
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    finish(index, row) {
+      debugger
+      crudProduceshiftorder.finish(row.order_id).then(res => {
+        this.crud.toQuery()
+        this.crud.notify('完成成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue b/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
index 6c2f897..d6890d4 100644
--- a/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
+++ b/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
@@ -9,6 +9,7 @@
             <el-select
               v-model="query.route_plan_id"
               placeholder="请选择路由类型"
+              clearable
               style="width: 250px;"
             >
               <el-option
diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue
index d95937c..b1d4ca9 100644
--- a/acs/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/index.vue
@@ -251,8 +251,6 @@
         <el-table-column type="selection" width="25" />
         <el-table-column v-if="false" prop="task_id" label="任务标识" />
         <el-table-column prop="task_code" label="任务号" />
-        <el-table-column prop="task_type" label="任务类型" />
-        <el-table-column prop="link_num" label="关联编号" />
         <el-table-column prop="vehicle_code" label="载具号" />
         <el-table-column prop="task_status" label="任务状态">
           <template slot-scope="scope">
@@ -261,15 +259,11 @@
             <span v-if="scope.row.task_status==='2' ">完成</span>
           </template>
         </el-table-column>
-        <!--<el-table-column prop="task_type" label="任务类型">
-          <template slot-scope="scope">
-            {{ dict.label.task_type[scope.row.task_type] }}
-          </template>
-        </el-table-column>-->
-        <el-table-column prop="priority" label="任务优先级" />
-        <el-table-column prop="start_point_code" label="取货点" width="120px" />
-        <el-table-column prop="put_point_code" label="倒料点" />
-        <el-table-column prop="next_point_code" label="放货点" width="120px" />
+        <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="compound_task" label="复合任务">
           <template slot-scope="scope">
             <span v-if="scope.row.compound_task==='0' ">否</span>
@@ -282,7 +276,7 @@
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="create_by" label="创建者" />
         <el-table-column prop="create_time" label="创建时间" width="135" />
-        <el-table-column v-permission="['admin','task:edit','task:del']" fixed="left" label="操作" width="150px" align="center">
+        <el-table-column v-permission="['admin','task:edit','task:del']" fixed="left" label="操作" width="80px" align="center">
           <template slot-scope="scope">
             <el-dropdown trigger="click" @command="handleCommand">
               <span class="el-dropdown-link">