rev: 二期内包间改造

lms/nladmin-ui/src/views/wms/pdm/ivt/deliverycache/deliverycachepointivt.js

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

lms/nladmin-ui/src/views/wms/pdm/ivt/deliverycache/index.vue

@@ -0,0 +1,294 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="点位编码">
+            <el-input
+              v-model="query.point_code"
+              clearable
+              placeholder="输入点位编码"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="生产区域">
+            <el-select
+              v-model="query.product_area"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="点位状态">
+            <el-select
+              v-model="query.point_status"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.delivery_point_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="点位类型">
+            <el-select
+              v-model="query.point_type"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.delivery_cache_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否启用">
+            <el-switch
+              v-model="query.is_used"
+              active-value="0"
+              inactive-value="1"
+              active-color="#C0CCDA"
+              inactive-color="#409EFF"
+              @change="hand"
+            />
+          </el-form-item>
+          <rrOperation :crud="crud" />
+        </el-form>
+      </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="mini" label-width="80px">
+          <el-form-item label="点位编码">
+            <el-input v-model="form.point_code" disabled style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="生产区域">
+            <el-select
+              v-model="form.product_area"
+              size="mini"
+              placeholder="生产区域"
+              class="filter-item"
+              style="width: 370px;"
+              disabled
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="气涨轴">
+            <el-input v-model="form.qzzno" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="点位状态">
+            <el-select
+              v-model="form.point_status"
+              size="mini"
+              placeholder="点位状态"
+              class="filter-item"
+              style="width: 370px;"
+            >
+              <el-option
+                v-for="item in dict.delivery_point_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="点位类型">
+            <el-select
+              v-model="form.point_type"
+              size="mini"
+              placeholder="点位状态"
+              class="filter-item"
+              style="width: 370px;"
+            >
+              <el-option
+                v-for="item in dict.delivery_cache_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="位置">
+            <el-select
+              v-model="form.point_location"
+              size="mini"
+              placeholder="位置"
+              class="filter-item"
+              style="width: 370px;"
+              disabled
+            >
+              <el-option
+                v-for="item in dict.point_location"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="顺序号">
+            <el-input v-model="form.sort_seq" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="是否启用">
+            <el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-input v-model="form.remark" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="允许尺寸">
+            <el-input v-model="form.can_size" 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="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
+        <el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')">
+          <template slot-scope="scope">
+            {{ dict.label.product_area[scope.row.product_area] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="qzzno" label="气涨轴" :min-width="flexWidth('qzzno',crud.data,'气涨轴')" />
+        <el-table-column prop="point_status" label="点位状态">
+          <template slot-scope="scope">
+            {{ dict.label.delivery_point_status[scope.row.point_status] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')">
+          <template slot-scope="scope">
+            {{ dict.label.delivery_cache_type[scope.row.point_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="point_location" label="位置" :min-width="flexWidth('point_location',crud.data,'位置')">
+          <template slot-scope="scope">
+            {{ dict.label.point_location[scope.row.point_location] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="sort_seq" label="顺序号" :min-width="flexWidth('sort_seq',crud.data,'顺序号')" />
+        <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">
+          <template slot-scope="scope">
+            {{ dict.label.is_used[scope.row.is_used] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',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_optname" label="修改人姓名" :min-width="flexWidth('update_optname',crud.data,'修改人姓名')" />
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
+        <el-table-column prop="can_size" label="允许尺寸" :min-width="flexWidth('can_size',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 crudDeliverycachepointivt from './deliverycachepointivt'
+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 = {
+  ivt_id: null,
+  point_code: null,
+  product_area: null,
+  qzzno: null,
+  point_status: null,
+  point_type: null,
+  point_location: null,
+  sort_seq: null,
+  is_used: null,
+  remark: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null,
+  plan: null,
+  can_size: null
+}
+export default {
+  name: 'Deliverycachepointivt',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  dicts: ['delivery_point_status', 'delivery_cache_type', 'product_area', 'is_used', 'point_location'],
+  cruds() {
+    return CRUD({
+      title: '分切缓存架',
+      url: 'api/deliverycachepointivt',
+      idField: 'ivt_id',
+      sort: 'ivt_id,desc',
+      crudMethod: { ...crudDeliverycachepointivt }
+    })
+  },
+  data() {
+    return {
+      permission: {
+      },
+      rules: {
+      }}
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    hand(value) {
+      this.crud.toQuery()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue

@@ -80,7 +80,7 @@
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
           <el-form-item label="点位编码" prop="point_code">
-            <el-input v-model="form.point_code" style="width: 370px;" disabled/>
+            <el-input v-model="form.point_code" style="width: 370px;" disabled />
           </el-form-item>
           <el-form-item label="生产区域">
             <el-select
@@ -119,6 +119,21 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="点位类型">
+            <el-select
+              v-model="form.point_type"
+              size="mini"
+              placeholder="点位状态"
+              class="filter-item"
+              style="width: 370px;"
+            >
+              <el-option
+                v-for="item in dict.delivery_cache_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="位置">
             <el-select
               v-model="form.point_location"
@@ -136,7 +151,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="顺序号" prop="sort_seq">
-            <el-input v-model="form.sort_seq" style="width: 370px;" disabled/>
+            <el-input v-model="form.sort_seq" style="width: 370px;" disabled />
           </el-form-item>
           <el-form-item label="是否启用" prop="is_used">
             <el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
@@ -168,6 +183,11 @@
             {{ dict.label.delivery_point_status[scope.row.point_status] }}
           </template>
         </el-table-column>
+        <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')">
+          <template slot-scope="scope">
+            {{ dict.label.delivery_cache_type[scope.row.point_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="product_area" label="生产区域">
           <template slot-scope="scope">
             {{ dict.label.product_area[scope.row.product_area] }}
@@ -214,6 +234,7 @@ const defaultForm = {
   point_code: null,
   product_area: null,
   qzzno: null,
+  point_type: null,
   vehicle_code: null,
   point_status: null,
   point_location: null,
@@ -230,7 +251,7 @@ const defaultForm = {
 export default {
   name: 'DeliveryPointIvt',
   components: { pagination, crudOperation, rrOperation, udOperation },
-  dicts: ['delivery_point_status', 'product_area', 'is_used', 'point_location'],
+  dicts: ['delivery_point_status', 'product_area', 'is_used', 'point_location', 'delivery_cache_type'],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({

lms/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -142,11 +142,11 @@
         <el-table-column prop="task_group_id" label="关联任务" width="100" show-overflow-tooltip />
         <el-table-column prop="vehicle_code" label="载具编码1" width="130" show-overflow-tooltip />
         <el-table-column prop="vehicle_code2" label="载具编码2" width="100" show-overflow-tooltip />
-        <el-table-column prop="request_param" label="请求参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip/>
-        <el-table-column prop="response_param" label="响应参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip/>
+        <el-table-column prop="request_param" label="请求参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip />
+        <el-table-column prop="response_param" label="响应参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip />
         <el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
         <el-table-column prop="create_name" label="创建人" width="135" show-overflow-tooltip />
-        <el-table-column prop="create_time" label="创建时间" width="135" show-overflow-tooltip />
+        <el-table-column prop="create_time" label="创建时间" sortable width="135" show-overflow-tooltip />
         <el-table-column prop="update_optname" label="修改人" width="135" show-overflow-tooltip />
         <el-table-column prop="update_time" label="修改时间" width="135" show-overflow-tooltip />
         <el-table-column prop="remark" label="备注" width="135" show-overflow-tooltip />
@@ -298,26 +298,25 @@ export default {
     formatSignal(row, column) {
       if (row.task_type === '010911') {
         if (column.property === 'response_param') {
-          return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送';
+          return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送'
         }
         if (column.property === 'request_param') {
-          return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送';
+          return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送'
         }
       } else if (row.task_type === '010904') {
         if (column.property === 'request_param') {
-          return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送';
+          return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送'
         }
       } else if (row.task_type === '010901') {
         if (column.property === 'response_param') {
-          return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送';
+          return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送'
         }
-      }
-      else if (row.task_type === '010905'||row.task_type === '010913') {
+      } else if (row.task_type === '010905' || row.task_type === '010913') {
         if (column.property === 'response_param') {
-          return row.response_param === '1' ? '二次分配已分配' : '二次分配未分配';
+          return row.response_param === '1' ? '二次分配已分配' : '二次分配未分配'
         }
       }
-      return row[column.property];
+      return row[column.property]
     },
     // 获取子节点数据
     loadChildNodes({ action, parentNode, callback }) {