add：新增产线mes叫料以及查询托盘信息接口以及手持组盘以及点位管理功能

acs/nladmin-ui/.env.production

@@ -2,6 +2,6 @@ ENV = 'production'
 
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
-VUE_APP_BASE_API  = 'http:// 172.30.15.231:8011'
+VUE_APP_BASE_API  = 'http://172.30.15.231:8011'
 # 如果接口是 http 形式， wss 需要改为 ws
-VUE_APP_WS_API = 'ws:// 172.30.15.231:8011'
+VUE_APP_WS_API = 'ws://172.30.15.231:8011'

acs/nladmin-ui/src/api/acs/Group.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/group',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/group/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/group',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }

acs/nladmin-ui/src/views/acs/device/group/index.vue

@@ -0,0 +1,127 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input
+          v-model="query.blurry"
+          size="small"
+          clearable
+          placeholder="输入托盘编码"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <rrOperation />
+      </div>
+      <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="vehicle_code">
+            <el-input v-model="form.vehicle_code" 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="device_code">
+            <el-input v-model="form.device_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="物料数量">
+            <el-input v-model="form.qty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="工单编码">
+            <el-input v-model="form.order_code" 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="vehicle_code" label="托盘编码" />
+        <el-table-column prop="material_code" label="物料编码" />
+        <el-table-column prop="qty" label="物料数量" />
+        <el-table-column prop="order_code" label="工单编码" />
+        <el-table-column prop="device_code" label="上料口" />
+        <el-table-column prop="create_name" label="创建者" />
+        <el-table-column prop="create_time" label="创建时间" width="135" />
+        <el-table-column prop="update_name" label="修改者" />
+        <el-table-column prop="update_time" label="修改时间" width="135" />
+        <el-table-column v-permission="['admin','Group:edit','Group:del']" label="操作" width="150px" align="center">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudGroup from '@/api/acs/Group'
+import CRUD, { presenter, header, form, crud } 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 deviceCrud from '@/api/acs/device/device'
+
+const defaultForm = { group_id: null, vehicle_code: null, material_code: null, qty: null, device_code: null, point_code4: null, remark: null, create_name: null, create_time: null, update_name: null, update_time: null, order_code: null }
+export default {
+  name: 'Group',
+  // eslint-disable-next-line vue/no-unused-components
+  dicts: ['task_type'],
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({ title: '组盘管理', url: 'api/group', idField: 'group_id', sort: 'group_id,desc', crudMethod: { ...crudGroup }})
+  },
+  data() {
+    return {
+      permission: {
+        add: ['admin', 'Group:add'],
+        edit: ['admin', 'Group:edit'],
+        del: ['admin', 'Group:del']
+      },
+      isDisabled: false,
+      deviceList: [],
+      rules: {
+        vehicle_code: [
+          { required: true, message: '托盘号不能为空', trigger: 'blur' }
+        ],
+        material_code: [
+          { required: true, message: '物料编码不能为空', trigger: 'blur' }
+        ],
+        device_code: [
+          { required: true, message: '上料口不能为空', trigger: 'blur' }
+        ]
+      }}
+  },
+  created() {
+    deviceCrud.selectDeviceList().then(data => {
+      this.deviceList = data
+    })
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

acs/nladmin-ui/src/views/acs/device/index.vue

@@ -109,6 +109,9 @@
           <!--          <el-form-item label="厂家电话">-->
           <!--            <el-input v-model="form.manufacturer_phone" style="width: 370px;" />-->
           <!--          </el-form-item>-->
+          <el-form-item label="托盘编码" prop="vehicle_code">
+            <el-input v-model="form.vehicle_code" style="width: 380px;" />
+          </el-form-item>
           <el-form-item label="描述信息" prop="description">
             <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
           </el-form-item>
@@ -154,6 +157,7 @@
         </el-table-column>
         <!--        <el-table-column prop="manufacturer" label="生产厂家" />-->
         <!--        <el-table-column prop="manufacturer_phone" label="厂家电话" />-->
+        <el-table-column prop="vehicle_code" label="托盘编码" />
         <el-table-column prop="remark" label="备注" />
         <el-table-column v-permission="['admin','device:edit','device:del']" label="操作" width="200px" align="center">
           <template slot-scope="scope">
@@ -203,6 +207,7 @@ const defaultForm = {
   device_name: null,
   device_type: null,
   region: null,
+  vehicle_code: null,
   is_config: null,
   remark: null
 }