更新

2022-12-19 08:58:50 +08:00
parent 3abfc2bb36
commit 1c49eb87bb
33 changed files with 1126 additions and 174 deletions
--- a/acs/nladmin-ui/src/views/acs/device/config.vue
+++ b/acs/nladmin-ui/src/views/acs/device/config.vue
@@ -91,6 +91,8 @@ import oven_manipulator from '@/views/acs/device/driver/oven_manipulator'
 import siemens_conveyor from '@/views/acs/device/driver/siemens_conveyor'
 import slit_two_manipulator from '@/views/acs/device/driver/slit_two_manipulator'
 import hongxiang_device from '@/views/acs/device/driver/hongxiang_device'
+import hongxiang_conveyor from '@/views/acs/device/driver/hongxiang_conveyor'
+

 export default {
  name: 'DeviceConfig',
@@ -109,6 +111,7 @@ export default {
    agv_ndc_two,
    agv_ndc_one,
    hongxiang_device,
+    hongxiang_conveyor,
    box_palletizing_manipulator,
    oven_manipulator,
    siemens_conveyor,
--- a/acs/nladmin-ui/src/views/acs/device/driver/box_palletizing_manipulator.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/box_palletizing_manipulator.vue
@@ -30,6 +30,7 @@
            v-model="plc_id"
            placeholder="无"
            clearable
+            filterable
            @change="changePlc"
          >
            <el-option
--- a/acs/nladmin-ui/src/views/acs/device/driver/hongxiang_conveyor.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/hongxiang_conveyor.vue
@@ -0,0 +1,489 @@
+<template>
+  <!--检测站点-->
+  <div>
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">设备协议：</span>
+      </div>
+
+      <el-row>
+        <el-col :span="12">
+          OpcServer:
+          <el-select
+            v-model="opc_id"
+            placeholder="无"
+            clearable
+            filterable
+            @change="changeOpc"
+          >
+            <el-option
+              v-for="item in dataOpcservers"
+              :key="item.opc_id"
+              :label="item.opc_name"
+              :value="item.opc_id"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          PLC:
+          <el-select
+            v-model="plc_id"
+            placeholder="无"
+            clearable
+            filterable
+            @change="changePlc"
+          >
+            <el-option
+              v-for="item in dataOpcPlcs"
+              :key="item.plc_id"
+              :label="item.plc_name"
+              :value="item.plc_id"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">输送系统：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="电气调度号" label-width="150px">
+              <el-input v-model="form.OPCServer" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">指令相关：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检验有货">
+              <el-switch v-model="form.inspect_in_stocck" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="忽视取货校验" label-width="150px">
+              <el-switch v-model="form.ignore_pickup_check" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="忽视放货校验" label-width="150px">
+              <el-switch v-model="form.ignore_release_check" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="呼叫">
+              <el-switch v-model="form.apply_task" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="响应" label-width="150px">
+              <el-switch v-model="form.manual_create_task" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="关联设备" prop="device_code">
+              <el-select
+                v-model="form.link_device_code"
+                filterable
+                multiple
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.device_code"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="关联三色灯" prop="device_code" label-width="100px">
+              <el-select
+                v-model="form.link_three_lamp"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.device_code"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否输入物料" label-width="150px">
+              <el-switch v-model="form.input_material" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">AGV相关：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="取货">
+              <el-switch v-model="form.is_pickup" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="放货">
+              <el-switch v-model="form.is_release" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">PLC读取字段：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-table
+          v-loading="false"
+          :data="data1"
+          :max-height="550"
+          size="small"
+          style="width: 100%;margin-bottom: 15px"
+        >
+
+          <el-table-column prop="name" label="用途" />
+          <el-table-column prop="code" label="别名要求" />
+          <el-table-column prop="db" label="DB块">
+            <template slot-scope="scope">
+              <el-input
+                v-model="data1[scope.$index].db"
+                size="mini"
+                class="edit-input"
+                @input="finishReadEdit(data1[scope.$index])"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbr_value">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">PLC写入字段：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-table
+          v-loading="false"
+          :data="data2"
+          :max-height="550"
+          size="small"
+          style="width: 100%;margin-bottom: 15px"
+        >
+
+          <el-table-column prop="name" label="用途" />
+          <el-table-column prop="code" label="别名要求" />
+          <el-table-column prop="db" label="DB块">
+            <template slot-scope="scope">
+              <el-input
+                v-model="data2[scope.$index].db"
+                size="mini"
+                class="edit-input"
+                @input="finishWriteEdit(data2[scope.$index])"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbw_value">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span" />
+        <el-button
+          :loading="false"
+          icon="el-icon-check"
+          size="mini"
+          style="float: right; padding: 6px 9px"
+          type="primary"
+          @click="doSubmit"
+        >保存
+        </el-button>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import {
+  queryDriverConfig,
+  updateConfig,
+  testRead,
+  testwrite
+} from '@/api/acs/device/driverConfig'
+import { selectOpcList } from '@/api/acs/device/opc'
+import { selectPlcList } from '@/api/acs/device/opcPlc'
+import { selectListByOpcID } from '@/api/acs/device/opcPlc'
+
+import crud from '@/mixins/crud'
+import deviceCrud from '@/api/acs/device/device'
+
+export default {
+  name: 'StandardInspectSite',
+  mixins: [crud],
+  props: {
+    parentForm: {
+      type: Object,
+      require: true
+    }
+  },
+  data() {
+    return {
+      device_code: '',
+      device_id: '',
+      plc_id: '',
+      plc_code: '',
+      opc_id: '',
+      opc_code: '',
+      configLoading: false,
+      dataOpcservers: [],
+      dataOpcPlcs: [],
+      deviceList: [],
+      data1: [],
+      data2: [],
+      form: {
+        inspect_in_stocck: true,
+        ignore_pickup_check: true,
+        ignore_release_check: true,
+        apply_task: true,
+        link_three_lamp: '',
+        manual_create_task: true,
+        is_pickup: true,
+        is_release: true,
+        link_device_code: []
+      },
+      rules: {}
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      // 从父表单获取设备编码
+      this.device_id = this.$props.parentForm.device_id
+      this.device_code = this.$props.parentForm.device_code
+      queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
+        // 给表单赋值，并且属性不能为空
+        if (data.form) {
+          const arr = Object.keys(data.form)
+          // 不为空
+          if (arr.length > 0) {
+            this.form = data.form
+          }
+        }
+
+        // 给表单赋值，并且属性不能为空
+        if (data.parentForm) {
+          const arr = Object.keys(data.parentForm)
+          // 不为空
+          if (arr.length > 0) {
+            this.opc_code = data.parentForm.opc_code
+            this.plc_code = data.parentForm.plc_code
+          }
+        }
+        this.data1 = data.rs
+        this.data2 = data.ws
+        this.sliceItem()
+      })
+      selectPlcList().then(data => {
+        this.dataOpcPlcs = data
+        this.plc_id = this.$props.parentForm.opc_plc_id
+      })
+      selectOpcList().then(data => {
+        this.dataOpcservers = data
+        this.opc_id = this.$props.parentForm.opc_server_id
+      })
+      deviceCrud.selectDeviceList().then(data => {
+        this.deviceList = data
+      })
+    })
+  },
+  methods: {
+    finishReadEdit(data) {
+      // 编辑的是code列,并且值包含mode
+      if (data.code.indexOf('mode') !== -1) {
+        debugger
+        const dbValue = data.db
+        // .之前的字符串
+        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // .之后的字符串
+        const afterStr = dbValue.match(/\.(\S*)/)[1]
+        // 取最后数字
+        const endNumber = afterStr.substring(1)
+        // 最后为非数字
+        if (isNaN(parseInt(endNumber))) {
+          return
+        }
+        for (const val in this.data1) {
+          if (this.data1[val].code.indexOf('move') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
+          }
+          if (this.data1[val].code.indexOf('error') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 5)
+          }
+          if (this.data1[val].code.indexOf('task') !== -1) {
+            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 7)
+          }
+        }
+      }
+    },
+    finishWriteEdit(data) {
+      // 编辑的是code列,并且值包含mode
+      if (data.code.indexOf('to_command') !== -1) {
+        const dbValue = data.db
+        // .之前的字符串
+        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // .之后的字符串
+        const afterStr = dbValue.match(/\.(\S*)/)[1]
+        // 取最后数字
+        const endNumber = afterStr.substring(1)
+        // 最后为非数字
+        if (isNaN(parseInt(endNumber))) {
+          return
+        }
+        for (const val in this.data2) {
+          if (this.data2[val].code.indexOf('to_target') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
+          }
+          if (this.data2[val].code.indexOf('to_task') !== -1) {
+            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6)
+          }
+        }
+      }
+    },
+    changeOpc(val) {
+      this.dataOpcservers.forEach(item => {
+        if (item.opc_id === val) {
+          this.opc_code = item.opc_code
+        }
+      })
+
+      selectListByOpcID(val).then(data => {
+        this.dataOpcPlcs = data
+        this.plc_id = ''
+        this.plc_code = ''
+        if (this.dataOpcPlcs && this.dataOpcPlcs.length > 0) {
+          this.plc_id = this.dataOpcPlcs[0].plc_id
+          this.plc_code = this.dataOpcPlcs[0].plc_code
+        }
+        this.sliceItem()
+      })
+    },
+    changePlc(val) {
+      this.dataOpcPlcs.forEach(item => {
+        if (item.plc_id === val) {
+          this.plc_code = item.plc_code
+          this.sliceItem()
+          return
+        }
+      })
+    },
+    test_read1() {
+      testRead(this.data1, this.opc_id).then(data => {
+        this.data1 = data
+        this.notify('操作成功!', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    test_write1() {
+      testwrite(this.data2, this.opc_id).then(data => {
+        this.notify('操作成功!', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    doSubmit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.configLoading = true
+          // 根据驱动类型判断是否为路由设备
+          const parentForm = this.parentForm
+          parentForm.is_route = true
+          parentForm.plc_id = this.plc_id
+          parentForm.opc_id = this.opc_id
+          updateConfig(parentForm, this.form, this.data1, this.data2).then(res => {
+            this.notify('保存成功', 'success')
+            this.configLoading = false
+          }).catch(err => {
+            this.configLoading = false
+            console.log(err.response.data.message)
+          })
+        }
+      })
+    },
+    sliceItem() { // 拼接DB的Item值
+      this.data1.forEach(item => {
+        const str = item.code
+        // 是否包含.
+        if (str.search('.') !== -1) {
+          // 截取最后一位
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
+        } else {
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
+        }
+      })
+      this.data2.forEach(item => {
+        const str = item.code
+        // 是否包含.
+        if (str.search('.') !== -1) {
+          // 截取最后一位
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
+        } else {
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/acs/nladmin-ui/src/views/acs/device/driver/hongxiang_device.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/hongxiang_device.vue
@@ -13,6 +13,7 @@
            v-model="opc_id"
            placeholder="无"
            clearable
+            filterable
            @change="changeOpc"
          >
            <el-option
--- a/acs/nladmin-ui/src/views/acs/device/driver/lamp_three_color.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/lamp_three_color.vue
@@ -13,6 +13,7 @@
            v-model="opc_id"
            placeholder="无"
            clearable
+            filterable
            @change="changeOpc"
          >
            <el-option
--- a/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue
@@ -13,6 +13,7 @@
            v-model="opc_id"
            placeholder="无"
            clearable
+            filterable
            @change="changeOpc"
          >
            <el-option
--- a/acs/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control.vue
@@ -13,6 +13,7 @@
            v-model="opc_id"
            placeholder="无"
            clearable
+            filterable
            @change="changeOpc"
          >
            <el-option
--- a/acs/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control_with_scanner.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control_with_scanner.vue
@@ -13,6 +13,7 @@
            v-model="opc_id"
            placeholder="无"
            clearable
+            filterable
            @change="changeOpc"
          >
            <el-option
--- a/acs/nladmin-ui/src/views/acs/device/driver/standard_conveyor_monitor.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/standard_conveyor_monitor.vue
@@ -13,6 +13,7 @@
            v-model="opc_id"
            placeholder="无"
            clearable
+            filterable
            @change="changeOpc"
          >
            <el-option
--- a/acs/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue
@@ -13,6 +13,7 @@
            v-model="opc_id"
            placeholder="无"
            clearable
+            filterable
            @change="changeOpc"
          >
            <el-option
--- a/acs/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/index.vue
@@ -117,6 +117,22 @@
              />
            </el-select>
          </el-form-item>
+          <el-form-item label="立库任务类型" v-if = "form.task_type == '7'">
+            <el-select
+              v-model="form.storage_task_type"
+              style="width: 370px;"
+              filterable
+              placeholder="请选择"
+              @change="isDisabled=false"
+            >
+              <el-option
+                v-for="item in dict.storage_task_type"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
          <el-form-item label="agv系统">
            <el-select
              v-model="form.agv_system_type"
@@ -297,41 +313,40 @@
      <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="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="任务状态">
+        <el-table-column prop="task_code" label="任务号" width="100" />
+        <el-table-column prop="task_type" label="任务类型"  width="120">
          <template slot-scope="scope">
+            {{ dict.label.task_type[scope.row.task_type] }}
+          </template>
+        </el-table-column>
+<!--        <el-table-column prop="link_num" label="关联编号" />-->
+        <el-table-column prop="vehicle_code" label="载具号" width="100" />
+        <el-table-column prop="task_status" label="任务状态" width="60">
+          <template slot-scope="scope" width="60">
            <span v-if="scope.row.task_status==='0' ">就绪</span>
            <span v-if="scope.row.task_status==='1' ">执行中</span>
            <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="任务优先级" width="120px" />
-        <el-table-column prop="start_point_code" label="取货点1" width="120px" />
-        <el-table-column prop="put_point_code" label="倒料点" />
+        <el-table-column prop="priority" label="优先级" width="100"/>
+        <el-table-column prop="start_point_code" label="取货点1" width="100px" />
+        <el-table-column prop="put_point_code" label="倒料点" width="100" />
        <el-table-column prop="next_point_code" label="放货点1" width="120px" />
        <el-table-column prop="start_point_code2" label="取货点2" width="120px" />
        <el-table-column prop="next_point_code2" label="放货点2" width="120px" />
-        <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="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 prop="quantity" label="数量" />
        <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">
@@ -446,6 +461,7 @@ export default {
        vehicle_code: null,
        vehicle_type: null,
        task_type: '1',
+        storage_task_type: '',
        task_status: null,
        priority: 1,
        start_point_code: null,