点位更新

lms/nladmin-system/src/main/resources/config/application-dev.yml

@@ -6,8 +6,8 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-#      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
       password: ${DB_PWD:P@ssw0rd}
       #      password: ${DB_PWD:12356}

lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue

@@ -0,0 +1,223 @@
+<template>
+  <el-dialog
+    title="点位详情"
+    append-to-body
+    fullscreen
+    :visible.sync="dialogVisible"
+    @open="open"
+    @close="close"
+  >
+    <el-card class="box-card" shadow="never">
+      <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
+        <el-form-item label="区域编码">
+          <el-input v-model="form.region_code" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="区域名称">
+          <el-input v-model="form.region_name" style="width: 200px;"/>
+        </el-form-item>
+
+        <el-form-item label="点位编码">
+          <el-input v-model="form.point_code" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="点位名称">
+          <el-input v-model="form.point_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="点位类型">
+          <el-input v-model="form.point_type_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="点位状态">
+          <el-input v-model="form.point_status_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="锁定类型">
+          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="载具类型">
+          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="载具编码">
+          <el-input v-model="form.vehicle_code" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="载具数量">
+          <el-input v-model="form.vehicle_qty" style="width: 200px;"/>
+        </el-form-item>
+
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="always">
+      <div slot="header" class="clearfix">
+        <span>卡片名称</span>
+      </div>
+
+      <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
+        <el-form-item label="区域编码">
+          <el-input v-model="form.region_code" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="区域名称">
+          <el-input v-model="form.region_name" style="width: 200px;"/>
+        </el-form-item>
+
+        <el-form-item label="点位编码">
+          <el-input v-model="form.point_code" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="点位名称">
+          <el-input v-model="form.point_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="点位类型">
+          <el-input v-model="form.point_type_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="点位状态">
+          <el-input v-model="form.point_status_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="锁定类型">
+          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="载具类型">
+          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="载具编码">
+          <el-input v-model="form.vehicle_code" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="载具数量">
+          <el-input v-model="form.vehicle_qty" style="width: 200px;"/>
+        </el-form-item>
+
+      </el-form>
+    </el-card>
+
+
+    <div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">
+      <span class="role-span">更新记录</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left"/>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="tableData"
+      style="width: 100%;"
+      max-height="300"
+      border
+      :highlight-current-row="true"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column prop="device_code" label="设备编码" align="center"/>
+      <el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip/>
+      <el-table-column prop="produce_qty" label="生产数量" align="center"/>
+      <el-table-column prop="init_qty" label="期初数量" align="center"/>
+      <el-table-column prop="finish_qty" label="期末数量" align="center"/>
+      <el-table-column prop="finishproduct_qty" label="完成数量" align="center"/>
+      <el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip/>
+      <el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip/>
+      <el-table-column prop="nick_name" label="操作人" align="center"/>
+    </el-table>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="dialogVisible = false">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { crud } from '@crud/crud'
+
+export default {
+  name: 'ViewDialog',
+  components: {},
+  dicts: [],
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes3: [],
+      parentData: {},
+      form: {
+        sale_id: null,
+        workorder_id: null,
+        produceorder_code: null,
+        producedeviceorder_code: null,
+        shift_type_scode: null,
+        workprocedure_id: null,
+        produce_date: null,
+        plan_qty: null,
+        real_qty: null,
+        material_id: null,
+        material_code: null,
+        material_weight: null,
+        planproducestart_date: null,
+        planproduceend_date: null,
+        realproducestart_date: null,
+        realproduceend_date: null,
+        order_status: null,
+        is_needmove: null,
+        order_type_scode: null,
+        create_id: null,
+        create_name: null,
+        create_time: null,
+        update_optid: null,
+        update_optname: null,
+        update_time: null,
+        sysdeptid: null,
+        syscompanyid: null,
+        is_delete: null,
+        material_name: null,
+        device_id: null,
+        is_canupdate_update: null,
+        material_spec: null
+      },
+      workprocedureList: [],
+      tableData: [],
+      rules: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+
+    },
+    close() {
+      this.$emit('AddChanged')
+    },
+    setParentData(parentData) {
+      if (parentData) {
+        this.dialogVisible = true
+        this.form = parentData
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+  padding: 4px 4px;
+}
+
+.input-with-select {
+  background-color: #fff;
+}
+</style>

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

@@ -69,7 +69,10 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')" label="块">
+          <el-form-item
+            v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')"
+            label="块"
+          >
             <el-input
               v-model="query.block_num"
               clearable
@@ -78,7 +81,10 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="排">
+          <el-form-item
+            v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')"
+            label="排"
+          >
             <el-input
               v-model="query.row_num"
               clearable
@@ -87,7 +93,10 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="列">
+          <el-form-item
+            v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')"
+            label="列"
+          >
             <el-input
               v-model="query.col_num"
               clearable
@@ -96,7 +105,10 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="层">
+          <el-form-item
+            v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')"
+            label="层"
+          >
             <el-input
               v-model="query.layer_num"
               clearable
@@ -282,7 +294,11 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" label="点位编码" sortable width="100" />
+        <el-table-column prop="point_code" label="点位编码" sortable width="100">
+          <template slot-scope="scope">
+            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.point_code }}</el-link>
+          </template>
+        </el-table-column>
         <el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip />
         <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
         <el-table-column prop="point_type_name" label="点位类型" />
@@ -298,7 +314,7 @@
         <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
         <el-table-column prop="is_used" label="是否启用">
           <template slot-scope="scope">
-            {{ scope.row.is_used=='1' ? '是' : '否' }}
+            {{ scope.row.is_used == '1' ? '是' : '否' }}
           </template>
         </el-table-column>
         <el-table-column prop="update_optname" label="修改人" />
@@ -321,6 +337,8 @@
       <!--分页组件-->
       <pagination />
     </div>
+
+    <ViewDialog ref="viewDialog" />
   </div>
 </template>
 
@@ -332,12 +350,31 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import ViewDialog from '@/views/wms/sch/point/ViewDialog'
 
-const defaultForm = { point_id: null, point_code: null, point_name: null, point_type: null, point_status: null, lock_type: '1', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
+const defaultForm = {
+  point_id: null,
+  point_code: null,
+  point_name: null,
+  point_type: null,
+  point_status: null,
+  lock_type: '1',
+  vehicle_code: null,
+  source_id: null,
+  remark: null,
+  is_used: null,
+  is_delete: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null
+}
 export default {
   name: 'Point',
   dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, rrOperation, udOperation , ViewDialog},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -431,7 +468,9 @@ export default {
         this.getPointStatusList(id, flag)
         this.getPointTypeList(id, flag)
       }
-      if (flag === 1) { this.crud.toQuery() }
+      if (flag === 1) {
+        this.crud.toQuery()
+      }
     },
     getPointStatusList(id, flag) {
       crudRegion.getPointStatusSelectById(id).then(res => {
@@ -444,7 +483,11 @@ export default {
     },
     getPointTypeList(id, flag) {
       crudRegion.getPointTypeSelectById(id).then(res => {
-        if (flag === 1) { this.pointTypesList = res } else { this.pointTypesDialogList = res }
+        if (flag === 1) {
+          this.pointTypesList = res
+        } else {
+          this.pointTypesDialogList = res
+        }
       })
     },
     changeUsed(data, flag) { // 更改启用状态
@@ -464,6 +507,12 @@ export default {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
+    },
+    toView(row) {
+      debugger
+      if (row) {
+        this.$refs.viewDialog.setParentData(row)
+      }
     }
 
   }