吊挂管理-吊挂基本信息 2.3

zhc4dev
zhc077 2 years ago
parent a9d99abb34
commit b8aff2e54e
  1. 343
      ant-design-vue-jeecg/src/views/hanger/ZyHangList.vue
  2. 183
      ant-design-vue-jeecg/src/views/hanger/ZyHangPointList.vue
  3. 34
      ant-design-vue-jeecg/src/views/hanger/modules/ZyHangForm.vue
  4. 118
      ant-design-vue-jeecg/src/views/hanger/modules/ZyHangPointForm.vue
  5. 60
      ant-design-vue-jeecg/src/views/hanger/modules/ZyHangPointModal.vue
  6. 84
      ant-design-vue-jeecg/src/views/hanger/modules/ZyHangPointModal__Style#Drawer.vue
  7. 1
      ant-design-vue-jeecg/src/views/productplan/ZyProductPlanList.vue
  8. 50
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangController.java
  9. 156
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangPointController.java
  10. 19
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/ZyHang.java
  11. 81
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/ZyHangPoint.java
  12. 15
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/mapper/ZyHangPointMapper.java
  13. 15
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IZyHangPointService.java
  14. 19
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/ZyHangPointServiceImpl.java

@ -4,6 +4,38 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.brand" placeholder="请输入品牌"></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-model-item label="型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.model" placeholder="请输入型号"></a-input>
</a-form-model-item>
</a-col>
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">-->
<!-- <a-input v-model="queryParam.name" placeholder="请输入名称" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.code" placeholder="请输入编号"></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
<j-dict-select-tag v-model="queryParam.status" dictCode="devicestatus1"
placeholder="设备状态"></j-dict-select-tag>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -13,23 +45,30 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('吊挂表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<!-- <a-button type="primary" icon="import">导入</a-button>-->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<!-- <a-button type="primary" icon="import">导入</a-button>-->
</a-upload>
<!-- 高级查询区域 -->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="1" @click="batchDel">
<a-icon type="delete"/>
删除
</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
<a-button style="margin-left: 8px"> 批量操作
<a-icon type="down"/>
</a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
@ -52,8 +91,16 @@
</template>
<template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
<img v-else :src="getImgView(text)" height="25px" alt=""
style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="imgeSlot" slot-scope="text">
<img :src="text" height="" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="img3dSlot" slot-scope="text">
<a :href="text" target="_blank">显示3d模型</a>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
@ -69,7 +116,7 @@
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
@ -84,153 +131,155 @@
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyHangModal from './modules/ZyHangModal'
import '@/assets/less/TableExpand.less'
import {mixinDevice} from '@/utils/mixin'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import ZyHangModal from './modules/ZyHangModal'
export default {
name: 'ZyHangList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ZyHangModal
},
data () {
return {
description: '吊挂表管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'车间',
align:"center",
dataIndex: 'workshopId_dictText'
},{
title:'品牌',
align:"center",
dataIndex: 'brand'
},
{
title:'型号',
align:"center",
dataIndex: 'model'
},
{
title:'编号',
align:"center",
dataIndex: 'code'
},
{
title:'工站数',
align:"center",
dataIndex: 'pointnumber'
},
{
title:'购买时间',
align:"center",
dataIndex: 'buydate'
},
{
title:'经办人',
align:"center",
dataIndex: 'agent'
},
{
title:'状态',
align:"center",
dataIndex: 'status'
},
{
title:'二维码',
align:"center",
dataIndex: 'qrcode'
},
{
title:'维护周期',
align:"center",
dataIndex: 'maintenancecycle'
},
{
title:'管理 人',
align:"center",
dataIndex: 'administrator'
},
{
title:'上次维护时间',
align:"center",
dataIndex: 'maintenancedate'
},
{
title:'图片',
align:"center",
dataIndex: 'img'
},
{
title:'3d模型',
align:"center",
dataIndex: 'img3d'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
export default {
name: 'ZyHangList',
mixins: [JeecgListMixin, mixinDevice],
components: {
ZyHangModal
},
data() {
return {
description: '吊挂表管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key: 'rowIndex',
width: 60,
align: "center",
customRender: function (t, r, index) {
return parseInt(index) + 1;
}
],
url: {
list: "/org.jeecg.modules.hanger/zyHang/list",
delete: "/org.jeecg.modules.hanger/zyHang/delete",
deleteBatch: "/org.jeecg.modules.hanger/zyHang/deleteBatch",
exportXlsUrl: "/org.jeecg.modules.hanger/zyHang/exportXls",
importExcelUrl: "org.jeecg.modules.hanger/zyHang/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
{
title: '车间',
align: "center",
dataIndex: 'workshopId_dictText'
},
{
title: '品牌',
align: "center",
dataIndex: 'brand'
},
{
title: '型号',
align: "center",
dataIndex: 'model'
},
{
title: '编号',
align: "center",
dataIndex: 'code'
},
{
title: '工站数',
align: "center",
dataIndex: 'pointnumber'
},
{
title: '经办人',
align: "center",
dataIndex: 'agent_dictText'
},
{
title: '状态',
align: "center",
dataIndex: 'status_dictText'
},
{
title: '维护周期(天)',
align: "center",
dataIndex: 'maintenancecycle'
},
{
title: '管理人',
align: "center",
dataIndex: 'administrator_dictText'
},
{
title: '上次维护时间',
align: "center",
dataIndex: 'maintenancedate',
customRender: function (text) {
return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
}
},
{
title: '图片',
align: "center",
dataIndex: 'img',
scopedSlots: {customRender: 'imgSlot'}
},
{
title: '二维码',
align: "center",
dataIndex: 'qrcode',
scopedSlots: {customRender: 'imgeSlot'}
},
{
title: '3d模型',
align: "center",
dataIndex: 'img3d',
scopedSlots: {customRender: 'img3dSlot'}
},
{
title: '操作',
dataIndex: 'action',
align: "center",
// fixed:"right",
width: 147,
scopedSlots: {customRender: 'action'}
}
],
url: {
list: "/org.jeecg.modules.hanger/zyHang/list",
delete: "/org.jeecg.modules.hanger/zyHang/delete",
deleteBatch: "/org.jeecg.modules.hanger/zyHang/deleteBatch",
exportXlsUrl: "/org.jeecg.modules.hanger/zyHang/exportXls",
importExcelUrl: "org.jeecg.modules.hanger/zyHang/importExcel",
},
dictOptions: {},
superFieldList: [],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig() {
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'brand',text:'品牌',dictCode:''})
fieldList.push({type:'string',value:'model',text:'型号',dictCode:''})
fieldList.push({type:'string',value:'code',text:'编号',dictCode:''})
fieldList.push({type:'int',value:'pointnumber',text:'工站数',dictCode:''})
fieldList.push({type:'string',value:'buydate',text:'购买时间',dictCode:''})
fieldList.push({type:'string',value:'agent',text:'经办人',dictCode:''})
fieldList.push({type:'string',value:'status',text:'状态',dictCode:''})
fieldList.push({type:'string',value:'qrcode',text:'二维码',dictCode:''})
fieldList.push({type:'int',value:'maintenancecycle',text:'维护周期',dictCode:''})
fieldList.push({type:'string',value:'administrator',text:'管理 人',dictCode:''})
fieldList.push({type:'string',value:'maintenancedate',text:'上次维护时间',dictCode:''})
fieldList.push({type:'string',value:'img',text:'图片',dictCode:''})
fieldList.push({type:'string',value:'img3d',text:'3d模型',dictCode:''})
this.superFieldList = fieldList
}
getSuperFieldList() {
let fieldList = [];
fieldList.push({type: 'string', value: 'brand', text: '品牌', dictCode: ''})
fieldList.push({type: 'string', value: 'model', text: '型号', dictCode: ''})
fieldList.push({type: 'string', value: 'code', text: '编号', dictCode: ''})
fieldList.push({type: 'int', value: 'pointnumber', text: '工站数', dictCode: ''})
fieldList.push({type: 'string', value: 'buydate', text: '购买时间', dictCode: ''})
fieldList.push({type: 'string', value: 'agent', text: '经办人', dictCode: ''})
fieldList.push({type: 'string', value: 'status', text: '状态', dictCode: ''})
fieldList.push({type: 'string', value: 'qrcode', text: '二维码', dictCode: ''})
fieldList.push({type: 'int', value: 'maintenancecycle', text: '维护周期', dictCode: ''})
fieldList.push({type: 'string', value: 'administrator', text: '管理 人', dictCode: ''})
fieldList.push({type: 'string', value: 'maintenancedate', text: '上次维护时间', dictCode: ''})
fieldList.push({type: 'string', value: 'img', text: '图片', dictCode: ''})
fieldList.push({type: 'string', value: 'img3d', text: '3d模型', dictCode: ''})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,183 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('吊挂工位表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<zy-hang-point-modal ref="modalForm" @ok="modalFormOk"></zy-hang-point-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyHangPointModal from './modules/ZyHangPointModal'
export default {
name: 'ZyHangPointList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ZyHangPointModal
},
data () {
return {
description: '吊挂工位表管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'吊挂编号',
align:"center",
dataIndex: 'code_dictText'
},
{
title:'工站编号',
align:"center",
dataIndex: 'point'
},
{
title:'工位id',
align:"center",
dataIndex: 'stationId_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/org.jeecg.modules.hanger/zyHangPoint/list",
delete: "/org.jeecg.modules.hanger/zyHangPoint/delete",
deleteBatch: "/org.jeecg.modules.hanger/zyHangPoint/deleteBatch",
exportXlsUrl: "/org.jeecg.modules.hanger/zyHangPoint/exportXls",
importExcelUrl: "org.jeecg.modules.hanger/zyHangPoint/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'code',text:'吊挂编号',dictCode:''})
fieldList.push({type:'string',value:'point',text:'工站编号',dictCode:''})
fieldList.push({type:'string',value:'stationId',text:'工位id',dictCode:''})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -6,8 +6,6 @@
<a-col :span="24">
<a-form-model-item label="车间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workshopId">
<j-select-depart placeholder="请选择车间" v-model="model.workshopId" />
<!-- <j-select-depart placeholder="请选择车间" v-model="queryParam.departId"/>-->
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -32,42 +30,49 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="购买时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buydate">
<a-input v-model="model.buydate" placeholder="请输入购买时间" ></a-input>
<!-- <a-input v-model="model.buydate" placeholder="请输入购买时间" ></a-input>-->
<j-date placeholder="请选择购买时间" v-model="model.buydate" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="经办人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="agent">
<a-input v-model="model.agent" placeholder="请输入经办人" ></a-input>
<!-- <a-input v-model="model.agent" placeholder="请输入经办人" ></a-input>-->
<j-select-user-by-dep v-model="model.agent" :multi="false"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
<a-input v-model="model.status" placeholder="请输入状态" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="二维码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qrcode">
<a-input v-model="model.qrcode" placeholder="请输入二维码" ></a-input>
<!-- <a-input v-model="model.status" placeholder="请输入状态"></a-input>-->
<j-dict-select-tag v-model="model.status" dictCode="devicestatus1"
placeholder="设备状态"></j-dict-select-tag>
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="二维码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qrcode">-->
<!-- <a-input v-model="model.qrcode" placeholder="请输入二维码"></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="维护周期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="maintenancecycle">
<a-form-model-item label="维护周期(天)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="maintenancecycle">
<a-input-number v-model="model.maintenancecycle" placeholder="请输入维护周期" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="管理人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="administrator">
<a-input v-model="model.administrator" placeholder="请输入管理人" ></a-input>
<!-- <a-input v-model="model.administrator" placeholder="请输入管理人"></a-input>-->
<j-select-user-by-dep v-model="model.administrator" :multi="false"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="上次维护时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="maintenancedate">
<a-input v-model="model.maintenancedate" placeholder="请输入上次维护时间" ></a-input>
<!-- <a-input v-model="model.maintenancedate" placeholder="请输入上次维护时间" ></a-input>-->
<j-date placeholder="请选择上次维护时间" v-model="model.maintenancedate" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="img">
<a-input v-model="model.img" placeholder="请输入图片" ></a-input>
<!-- <a-input v-model="model.img" placeholder="请输入图片" ></a-input>-->
<j-image-upload isMultiple v-model="model.img" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -101,6 +106,7 @@ export default {
data () {
return {
model:{
status:1,
},
labelCol: {
xs: { span: 24 },

@ -0,0 +1,118 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="吊挂编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
<j-dict-select-tag type="list" v-model="model.code" dictCode="" placeholder="请选择吊挂编号" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="工站编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="point">
<a-input v-model="model.point" placeholder="请输入工站编号" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="工位id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationId">
<j-dict-select-tag type="list" v-model="model.stationId" dictCode="" placeholder="请选择工位id" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'ZyHangPointForm',
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
stationId: [
{ required: false},
{ pattern: /^\d{6,16}$/, message: '请输入6到16位数字!'},
],
},
url: {
add: "/org.jeecg.modules.hanger/zyHangPoint/add",
edit: "/org.jeecg.modules.hanger/zyHangPoint/edit",
queryById: "/org.jeecg.modules.hanger/zyHangPoint/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
//
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
}
}
</script>

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<zy-hang-point-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-hang-point-form>
</j-modal>
</template>
<script>
import ZyHangPointForm from './ZyHangPointForm'
export default {
name: 'ZyHangPointModal',
components: {
ZyHangPointForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<zy-hang-point-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></zy-hang-point-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import ZyHangPointForm from './ZyHangPointForm'
export default {
name: 'ZyHangPointModal',
components: {
ZyHangPointForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

@ -313,7 +313,6 @@ export default {
getPaiWeiTu(record) {
// alert(JSON.stringify(record));
alert("请稍等,正在开发中。。。")
getAction(this.url.paiweitu, record).then((res) => {
if (res.success) {
console.log("the paiweitu----------" + JSON.stringify(res.result))

@ -5,11 +5,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.WriterException;
import com.google.zxing.client.j2se.MatrixToImageWriter;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.hanger.entity.ZyHang;
@ -21,8 +29,9 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.*;
/**
* @Description: 吊挂表
@ -57,6 +66,38 @@ public class ZyHangController extends JeecgController<ZyHang, IZyHangService> {
QueryWrapper<ZyHang> queryWrapper = QueryGenerator.initQueryWrapper(zyHang, req.getParameterMap());
Page<ZyHang> page = new Page<ZyHang>(pageNo, pageSize);
IPage<ZyHang> pageList = zyHangService.page(page, queryWrapper);
if (!ObjectUtils.isEmpty(pageList)) {
Map hints = new HashMap();
//设置UTF-8, 防止中文乱码
hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
//设置二维码四周白色区域的大小
hints.put(EncodeHintType.MARGIN, 1);
//设置二维码的容错性
hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
//width:图片完整的宽;height:图片完整的高
//因为要在二维码下方附上文字,所以把图片设置为长方形(高大于宽)
int width = 150;
int height = 150;
//画二维码,记得调用multiFormatWriter.encode()时最后要带上hints参数,不然上面设置无效
QRCodeWriter qrCodeWriter = new QRCodeWriter();
// List<Object> img = new ArrayList<>();
String content = "";
//批量生成二维码
try {
for (int i = 0; i < pageList.getRecords().size(); i++) {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
content = pageList.getRecords().get(i).getCode();
BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, width, height, hints);
MatrixToImageWriter.writeToStream(bitMatrix, "PNG", outputStream);
Base64.Encoder encoder = Base64.getEncoder();
String text = encoder.encodeToString(outputStream.toByteArray());
pageList.getRecords().get(i).setQrcode("data:image/png;base64," + text);
}
} catch (Exception e) {
log.error("获取吊挂信息-异常-{},{}", e, e.getMessage());
Result.error("获取数据失败");
}
}
return Result.OK(pageList);
}
@ -78,8 +119,8 @@ public class ZyHangController extends JeecgController<ZyHang, IZyHangService> {
code = "DG1000";
} else {
String[] dgs = list.get(0).getCode().split("DG");
int val = new Integer(dgs[1]).intValue() + 1 ;
code = "DG" + val+ "";
int val = new Integer(dgs[1]).intValue() + 1;
code = "DG" + val + "";
}
zyHang.setCode(code);
zyHang.setStatus("0");
@ -97,6 +138,7 @@ public class ZyHangController extends JeecgController<ZyHang, IZyHangService> {
@ApiOperation(value = "吊挂表-编辑", notes = "吊挂表-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody ZyHang zyHang) {
zyHang.setQrcode("");
zyHangService.updateById(zyHang);
return Result.OK("编辑成功!");
}

@ -0,0 +1,156 @@
package org.jeecg.modules.hanger.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.hanger.entity.ZyHangPoint;
import org.jeecg.modules.hanger.service.IZyHangPointService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/**
* @Description: 吊挂工位表
* @Author: jeecg-boot
* @Date: 2023-02-03
* @Version: V1.0
*/
@Api(tags = "吊挂工位表")
@RestController
@RequestMapping("/org.jeecg.modules.hanger/zyHangPoint")
@Slf4j
public class ZyHangPointController extends JeecgController<ZyHangPoint, IZyHangPointService> {
@Autowired
private IZyHangPointService zyHangPointService;
/**
* 分页列表查询
*
* @param zyHangPoint
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "吊挂工位表-分页列表查询")
@ApiOperation(value = "吊挂工位表-分页列表查询", notes = "吊挂工位表-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(ZyHangPoint zyHangPoint,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ZyHangPoint> queryWrapper = QueryGenerator.initQueryWrapper(zyHangPoint, req.getParameterMap());
Page<ZyHangPoint> page = new Page<ZyHangPoint>(pageNo, pageSize);
IPage<ZyHangPoint> pageList = zyHangPointService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param zyHangPoint
* @return
*/
@AutoLog(value = "吊挂工位表-添加")
@ApiOperation(value = "吊挂工位表-添加", notes = "吊挂工位表-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyHangPoint zyHangPoint) {
zyHangPointService.save(zyHangPoint);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param zyHangPoint
* @return
*/
@AutoLog(value = "吊挂工位表-编辑")
@ApiOperation(value = "吊挂工位表-编辑", notes = "吊挂工位表-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody ZyHangPoint zyHangPoint) {
zyHangPointService.updateById(zyHangPoint);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "吊挂工位表-通过id删除")
@ApiOperation(value = "吊挂工位表-通过id删除", notes = "吊挂工位表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
zyHangPointService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "吊挂工位表-批量删除")
@ApiOperation(value = "吊挂工位表-批量删除", notes = "吊挂工位表-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.zyHangPointService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "吊挂工位表-通过id查询")
@ApiOperation(value = "吊挂工位表-通过id查询", notes = "吊挂工位表-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
ZyHangPoint zyHangPoint = zyHangPointService.getById(id);
if (zyHangPoint == null) {
return Result.error("未找到对应数据");
}
return Result.OK(zyHangPoint);
}
/**
* 导出excel
*
* @param request
* @param zyHangPoint
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ZyHangPoint zyHangPoint) {
return super.exportXls(request, zyHangPoint, ZyHangPoint.class, "吊挂工位表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ZyHangPoint.class);
}
}

@ -95,20 +95,24 @@ public class ZyHang implements Serializable {
/**
* 购买时间
*/
@Excel(name = "购买时间", width = 15)
@Excel(name = "购买时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "购买时间")
private String buydate;
private Date buydate;
/**
* 经办人
*/
@Excel(name = "经办人", width = 15)
@ApiModelProperty(value = "经办人")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String agent;
/**
* 状态
*/
@Excel(name = "状态", width = 15)
@ApiModelProperty(value = "状态")
@Dict(dicCode = "devicestatus1")
private String status;
/**
* 二维码
@ -125,15 +129,18 @@ public class ZyHang implements Serializable {
/**
* 管理
*/
@Excel(name = "管理 人", width = 15)
@ApiModelProperty(value = "管理 人")
@Excel(name = "管理人", width = 15)
@ApiModelProperty(value = "管理人")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String administrator;
/**
* 上次维护时间
*/
@Excel(name = "上次维护时间", width = 15)
@Excel(name = "上次维护时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "上次维护时间")
private String maintenancedate;
private Date maintenancedate;
/**
* 图片
*/

@ -0,0 +1,81 @@
package org.jeecg.modules.hanger.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 吊挂工位表
* @Author: jeecg-boot
* @Date: 2023-02-03
* @Version: V1.0
*/
@Data
@TableName("zy_hang_point")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "zy_hang_point对象", description = "吊挂工位表")
public class ZyHangPoint implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**
* 创建人
*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**
* 更新人
*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
/**
* 吊挂编号
*/
@Excel(name = "吊挂编号", width = 15)
@ApiModelProperty(value = "吊挂编号")
private String code;
/**
* 工站编号
*/
@Excel(name = "工站编号", width = 15)
@ApiModelProperty(value = "工站编号")
private String point;
/**
* 工位id
*/
@Excel(name = "工位id", width = 15)
@ApiModelProperty(value = "工位id")
private String stationId;
}

@ -0,0 +1,15 @@
package org.jeecg.modules.hanger.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.hanger.entity.ZyHangPoint;
/**
* @Description: 吊挂工位表
* @Author: jeecg-boot
* @Date: 2023-02-03
* @Version: V1.0
*/
public interface ZyHangPointMapper extends BaseMapper<ZyHangPoint> {
}

@ -0,0 +1,15 @@
package org.jeecg.modules.hanger.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.hanger.entity.ZyHangPoint;
/**
* @Description: 吊挂工位表
* @Author: jeecg-boot
* @Date: 2023-02-03
* @Version: V1.0
*/
public interface IZyHangPointService extends IService<ZyHangPoint> {
}

@ -0,0 +1,19 @@
package org.jeecg.modules.hanger.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.hanger.entity.ZyHangPoint;
import org.jeecg.modules.hanger.mapper.ZyHangPointMapper;
import org.jeecg.modules.hanger.service.IZyHangPointService;
import org.springframework.stereotype.Service;
/**
* @Description: 吊挂工位表
* @Author: jeecg-boot
* @Date: 2023-02-03
* @Version: V1.0
*/
@Service
public class ZyHangPointServiceImpl extends ServiceImpl<ZyHangPointMapper, ZyHangPoint> implements IZyHangPointService {
}
Loading…
Cancel
Save