From b76e6b2da039f86c3519ba27590a5a775ce42b5c Mon Sep 17 00:00:00 2001
From: lishuai <1793460677@qq.com>
Date: Thu, 7 Dec 2023 15:13:14 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E5=85=B3=E8=81=94=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91,=E4=BB=A3=E7=A1=AE=E8=AE=A4=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/device_driver/DriverTypeEnum.java  |   2 +-
 .../device/driver/double_belt_conveyor.vue    | 668 ++++++++++++++++++
 .../device/driver/double_station_stacker.vue  |  18 +-
 3 files changed, 670 insertions(+), 18 deletions(-)
 create mode 100644 acs/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
index 24175d4..8e68dab 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
@@ -41,7 +41,7 @@ public enum DriverTypeEnum {
 
     DOUBLE_STATION_STACKER(16, "double_station_stacker", "标准版-双工位堆垛机", "double_station_stacker"),
 
-    DOUBLE_BELT_CONVEYOR(17, "double_belt_conveyor", "双工位输送线虚拟站点", "double_belt_conveyor");
+    DOUBLE_BELT_CONVEYOR(17, "double_belt_conveyor", "双工位输送线", "double_belt_conveyor");
 
 
 
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue b/acs/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue
new file mode 100644
index 0000000..378c09c
--- /dev/null
+++ b/acs/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue
@@ -0,0 +1,668 @@
+<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
+            @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.address" />
+            </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-row>
+          <el-col :span="8">
+            <el-form-item label="是否需要反馈光电" label-width="150px">
+              <el-switch v-model="form.ship_device_update" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form> -->
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="排：" label-width="150px" prop="x">
+              <el-input v-model.number="form.x" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="列：" label-width="150px" prop="z">
+              <el-input v-model.number="form.z" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="层：" label-width="150px" prop="yY">
+              <el-input v-model.number="form.y" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="等待时间：" label-width="150px" prop="apply_time">
+              <el-input v-model.number="form.apply_time" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="关联设备" prop="device_code">
+              <el-select
+                v-model="form.link_device_code"
+                clearable
+                filterable
+                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-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="dbr_value2">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_read2()">测试读</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data2[scope.$index].dbr_value" size="mini" class="edit-input" />
+            </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: 'DoubleStandardConveyorControl',
+  mixins: [crud],
+  props: {
+    parentForm: {
+      type: Object,
+      require: true
+    }
+  },
+  data() {
+    return {
+      device_code: '',
+      device_id: '',
+      plc_id: '',
+      plc_code: '',
+      address: '',
+      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: [],
+        ship_device_update: true,
+        apply_time: ''
+      },
+      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) {
+        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('mode') !== -1) {
+            this.data1[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 0)
+          }
+          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('carrier_direction') !== -1) {
+            this.data1[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 2)
+          }
+          if (this.data1[val].code.indexOf('error') !== -1) {
+            this.data1[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 4)
+          }
+          if (this.data1[val].code.indexOf('task') !== -1) {
+            this.data1[val].db =
+              beforeStr + '.' + 'D' + (parseInt(endNumber) + 8)
+          }
+        }
+      }
+    },
+    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
+        }
+        console.log(endNumber)
+        for (const val in this.data2) {
+          if (this.data2[val].code.indexOf('to_command') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 0)
+          }
+          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_container_type') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 4)
+          }
+          if (this.data2[val].code.indexOf('to_task') !== -1) {
+            this.data2[val].db =
+              beforeStr + '.' + 'D' + (parseInt(endNumber) + 6)
+          }
+          if (this.data2[val].code.indexOf('to_strap_times') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 10)
+          }
+          if (this.data2[val].code.indexOf('to_length') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 12)
+          }
+          if (this.data2[val].code.indexOf('to_weight') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 14)
+          }
+          if (this.data2[val].code.indexOf('to_height') !== -1) {
+            this.data2[val].db =
+              beforeStr +
+              '.' +
+              afterStr.substring(0, 1) +
+              (parseInt(endNumber) + 16)
+          }
+        }
+      }
+    },
+    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
+          console.log(this.data1)
+          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)
+        })
+    },
+    test_read2() {
+      testRead(this.data2, this.opc_id)
+        .then((data) => {
+          this.data2 = data
+          console.log(this.data2)
+          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>
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/double_station_stacker.vue b/acs/nladmin-ui/src/views/acs/device/driver/double_station_stacker.vue
index 053b0d5..1968e06 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/double_station_stacker.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/double_station_stacker.vue
@@ -96,23 +96,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
-            <el-form-item label="关联设备" prop="device_code">
-              <el-select
-                v-model="form.link_device_code"
-                clearable
-                filterable
-                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="5">
             <el-form-item label="货位排序：" prop="sort" label-width="100px">
               <el-select