fix: 任务业务以及与acs对接的接口

2023-07-18 15:16:05 +08:00
parent 3a437675dd
commit 82bebd313e
59 changed files with 2745 additions and 863 deletions
--- a/lms/nladmin-ui/src/views/system/notice/index.vue
+++ b/lms/nladmin-ui/src/views/system/notice/index.vue
@@ -236,10 +236,10 @@ export default {
        crudNotice.read(record.notice_id).then(() => {
          record.have_read = '2'
          this.$bus.emit(NOTICE_MESSAGE_UPDATE)
+          this.crud.toQuery()
        })
      }
      this.$bus.emit(NOTICE_SHOW_MESSAGE, record)
-      this.crud.toQuery()
    },
    hand(value) {
      this.crud.toQuery()
--- a/lms/nladmin-ui/src/views/wms/pdm/record/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/record/index.vue
@@ -0,0 +1,96 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， 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="mini" label-width="80px">
+          <el-form-item label="压机编号">
+            <el-input v-model="form.device_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="物料">
+            <el-input v-model="form.material_id" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="工单">
+            <el-input v-model="form.workorder_id" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="叫料时间">
+            <el-input v-model="form.create_time" 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="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="device_code" label="压机编号" :min-width="flexWidth('device_code',crud.data,'压机编号')"/>
+        <el-table-column prop="material_id" label="物料" :min-width="flexWidth('material_id',crud.data,'物料')"/>
+        <el-table-column prop="workorder_id" label="工单" :min-width="flexWidth('workorder_id',crud.data,'工单')"/>
+        <el-table-column prop="create_time" label="叫料时间" :min-width="flexWidth('create_time',crud.data,'叫料时间')"/>
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudPdmBdRequestMaterialRecord from './pdmBdRequestMaterialRecord'
+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'
+
+const defaultForm = {
+  record_id: null,
+  device_code: null,
+  material_id: null,
+  workorder_id: null,
+  create_time: null
+}
+export default {
+  name: 'PdmBdRequestMaterialRecord',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '压机提前要料',
+      url: 'api/pdmBdRequestMaterialRecord',
+      idField: 'record_id',
+      sort: 'record_id,desc',
+      crudMethod: { ...crudPdmBdRequestMaterialRecord }
+    })
+  },
+  data() {
+    return {
+      permission: {
+      },
+      rules: {
+      }    }
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/lms/nladmin-ui/src/views/wms/pdm/record/pdmBdRequestMaterialRecord.js
+++ b/lms/nladmin-ui/src/views/wms/pdm/record/pdmBdRequestMaterialRecord.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/pdmBdRequestMaterialRecord',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/pdmBdRequestMaterialRecord/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/pdmBdRequestMaterialRecord',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
--- a/lms/nladmin-ui/src/views/wms/sch/task/config/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/config/index.vue
@@ -93,7 +93,18 @@
            <el-input v-model="form.task_name" style="width: 240px;" />
          </el-form-item>
          <el-form-item label="任务类型">
-            <el-input v-model="form.task_type" style="width: 240px;" />
+            <el-select
+              v-model="form.task_type"
+              size="mini"
+              placeholder="任务类型"
+              style="width: 240px;"
+            >
+              <el-option
+                v-for="item in dict.task_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
          </el-form-item>
          <el-form-item label="优先级" pro="priority">
            <el-input-number
@@ -268,7 +279,11 @@
          </template>
        </el-table-column>
        <el-table-column prop="task_name" label="任务名字" :min-width="flexWidth('task_name',crud.data,'任务名字')" />
-        <el-table-column prop="task_type" label="任务类型" :min-width="flexWidth('task_type',crud.data,'任务类型')" />
+        <el-table-column prop="task_type" label="任务类型" :min-width="flexWidth('task_type',crud.data,'任务类型', 20)" >
+          <template slot-scope="scope">
+            {{ dict.label.task_type[scope.row.task_type] }}
+          </template>
+        </el-table-column>
        <el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
        <el-table-column prop="task_create_max_num" label="任务生成数上限" :min-width="flexWidth('task_create_max_num',crud.data,'任务生成数上限')" />
        <el-table-column prop="task_issue_max_num" label="任务下发数上限" :min-width="flexWidth('task_issue_max_num',crud.data,'任务下发数上限')" />
@@ -416,14 +431,14 @@ const defaultForm = {
 }
 export default {
  name: 'TaskConfig',
-  dicts: ['task_qf_type', 'acs_task_type', 'task_direction'],
+  dicts: ['task_qf_type', 'acs_task_type', 'task_direction', 'task_type'],
  components: { pagination, crudOperation, rrOperation, udOperation },
  mixins: [presenter(), header(), form(defaultForm), crud()],
  cruds() {
    return CRUD({
      title: '任务配置',
      url: 'api/schBaseTaskconfig',
-      idField: 'config_code',
+      idField: 'config_id',
      sort: 'config_code,desc',
      optShow: {
        add: true,
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -183,7 +183,7 @@
        <el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
        <el-table-column v-if="false" prop="handle_class" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')" />
        <el-table-column prop="handle_status" label="处理状态" :min-width="flexWidth('handle_status',crud.data,'处理状态')" />
-        <el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />
+<!--        <el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />-->
        <el-table-column prop="task_group_id" label="任务组标识" :min-width="flexWidth('task_group_id',crud.data,'任务组标识')" />
        <el-table-column prop="task_group_seq" label="任务组顺序号" :min-width="flexWidth('task_group_seq',crud.data,'任务组顺序号')" />
        <el-table-column prop="finished_type" label="任务完成类型" :min-width="flexWidth('finished_type',crud.data,'任务完成类型')" />
@@ -197,9 +197,9 @@
        <el-table-column prop="response_param" label="下发任务的请求参数" :min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')" />
        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
        <el-table-column prop="ext_group_data" label="额外组盘信息" :min-width="flexWidth('ext_group_data',crud.data,'额外组盘信息')" />
-<!--        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />-->
+        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
-<!--        <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />-->
+        <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
        <el-table-column v-permission="[]" label="操作" width="160px" align="center" fixed="right">
          <template slot-scope="scope">