yu
/
CostumingPlatform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

车间工位管理问题修复 1.3

Browse Source
zhc4dev
zhc077 2 years ago
parent 41c10baf3f
commit 73b5a00c84
9 changed files with 374 additions and 257 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 479
      ant-design-vue-jeecg/src/views/devicetype/ZyDevicetypeListRef.vue
  2. 31
      ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue
  3. 42
      ant-design-vue-jeecg/src/views/team/StationList.vue
  4. 10
      ant-design-vue-jeecg/src/views/team/StationMachineList.vue
  5. 10
      ant-design-vue-jeecg/src/views/team/StationToolList.vue
  6. 4
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/tool/controller/ZyToolController.java
  7. 23
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationController.java
  8. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IStationService.java
  9. 28
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java

479
ant-design-vue-jeecg/src/views/devicetype/ZyDevicetypeListRef.vue
Unescape View File

@ -1,23 +1,48 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<!-- &lt;!&ndash; 查询区域 &ndash;&gt;--> <!-- 查询区域 -->
<!-- <div class="table-page-search-wrapper">--> <!-- <div class="table-page-search-wrapper">-->
<!-- <a-form layout="inline" @keyup.enter.native="searchQuery">--> <!-- <a-form layout="inline" @keyup.enter.native="searchQuery">-->
<!-- <a-row :gutter="24">--> <!-- <a-row :gutter="24">-->
<!-- </a-row>--> <!-- </a-row>-->
<!-- </a-form>--> <!-- </a-form>-->
<!-- </div>--> <!-- </div>-->
<!-- &lt;!&ndash; 查询区域-END &ndash;&gt;--> <!-- 查询区域-END -->
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :sm="5">
<a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="id">
<a-input v-model="queryParam.id" placeholder="请输入设备编号"></a-input>
</a-form-model-item>
</a-col>
<a-col :sm="5">
<a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
<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">
<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>
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<!-- <div class="table-operator">--> <!-- <div class="table-operator">-->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<!-- </div>--> <!-- </div>-->
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <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> <a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div> </div>
@ -36,244 +61,244 @@
:customRow="clickThenSelect" :customRow="clickThenSelect"
@change="handleTableChange"> @change="handleTableChange">
<!-- <template slot="htmlSlot" slot-scope="text">--> <!-- <template slot="htmlSlot" slot-scope="text">-->
<!-- <div v-html="text"></div>--> <!-- <div v-html="text"></div>-->
<!-- </template>--> <!-- </template>-->
<!-- <template slot="imgSlot" slot-scope="text">--> <!-- <template slot="imgSlot" slot-scope="text">-->
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>--> <!-- <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>-->
<!-- <template slot="imgeSlot" slot-scope="text">--> <!-- <template slot="imgeSlot" slot-scope="text">-->
<!-- <img :src="text" height="" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>--> <!-- <img :src="text" height="" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>-->
<!-- </template>--> <!-- </template>-->
<!-- <template slot="fileSlot" slot-scope="text">--> <!-- <template slot="fileSlot" slot-scope="text">-->
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>--> <!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
<!-- <a-button--> <!-- <a-button-->
<!-- v-else--> <!-- v-else-->
<!-- :ghost="true"--> <!-- :ghost="true"-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- icon="download"--> <!-- icon="download"-->
<!-- size="small"--> <!-- size="small"-->
<!-- @click="downloadFile(text)">--> <!-- @click="downloadFile(text)">-->
<!-- 下载--> <!-- 下载-->
<!-- </a-button>--> <!-- </a-button>-->
<!-- </template>--> <!-- </template>-->
<!-- <span slot="action" slot-scope="text, record">--> <!-- <span slot="action" slot-scope="text, record">-->
<!-- <a @click="handleEdit(record)">编辑</a>--> <!-- <a @click="handleEdit(record)">编辑</a>-->
<!-- <a-divider type="vertical" />--> <!-- <a-divider type="vertical" />-->
<!-- <a-dropdown>--> <!-- <a-dropdown>-->
<!-- <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>--> <!-- <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
<!-- <a-menu slot="overlay">--> <!-- <a-menu slot="overlay">-->
<!-- <a-menu-item>--> <!-- <a-menu-item>-->
<!-- <a @click="openDetail(record.id)">详情</a>--> <!-- <a @click="openDetail(record.id)">详情</a>-->
<!-- </a-menu-item>--> <!-- </a-menu-item>-->
<!-- <a-menu-item>--> <!-- <a-menu-item>-->
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">--> <!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<!-- <a>删除</a>--> <!-- <a>删除</a>-->
<!-- </a-popconfirm>--> <!-- </a-popconfirm>-->
<!-- </a-menu-item>--> <!-- </a-menu-item>-->
<!-- </a-menu>--> <!-- </a-menu>-->
<!-- </a-dropdown>--> <!-- </a-dropdown>-->
<!-- </span>--> <!-- </span>-->
</a-table> </a-table>
</div> </div>
<!-- <a-tabs defaultActiveKey="1">--> <!-- <a-tabs defaultActiveKey="1">-->
<!-- <a-tab-pane tab="类型参数" key="1" >--> <!-- <a-tab-pane tab="类型参数" key="1" >-->
<!-- <ZyTypeparametersList :mainId="selectedMainId" />--> <!-- <ZyTypeparametersList :mainId="selectedMainId" />-->
<!-- </a-tab-pane>--> <!-- </a-tab-pane>-->
<!-- <a-tab-pane tab="运行参数" key="2" forceRender>--> <!-- <a-tab-pane tab="运行参数" key="2" forceRender>-->
<!-- <ZyOperationparametersList :mainId="selectedMainId" />--> <!-- <ZyOperationparametersList :mainId="selectedMainId" />-->
<!-- </a-tab-pane>--> <!-- </a-tab-pane>-->
<!-- </a-tabs>--> <!-- </a-tabs>-->
<!-- <ZyDevicetypeDetail ref="ZyDevicetypeDetail"></ZyDevicetypeDetail>--> <!-- <ZyDevicetypeDetail ref="ZyDevicetypeDetail"></ZyDevicetypeDetail>-->
<!-- <zyDevicetype-modal ref="modalForm" @ok="modalFormOk"></zyDevicetype-modal>--> <!-- <zyDevicetype-modal ref="modalForm" @ok="modalFormOk"></zyDevicetype-modal>-->
</a-card> </a-card>
</template> </template>
<script> <script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import ZyDevicetypeModal from './modules/ZyDevicetypeModal' import ZyDevicetypeModal from './modules/ZyDevicetypeModal'
import { getAction } from '@/api/manage' import {getAction} from '@/api/manage'
import ZyTypeparametersList from './ZyTypeparametersList' import ZyTypeparametersList from './ZyTypeparametersList'
import ZyOperationparametersList from './ZyOperationparametersList' import ZyOperationparametersList from './ZyOperationparametersList'
import '@/assets/less/TableExpand.less' import '@/assets/less/TableExpand.less'
import ZyDevicetypeDetail from './modules/ZyDevicetypeDetail' import ZyDevicetypeDetail from './modules/ZyDevicetypeDetail'
export default {
name: "ZyDevicetypeList", export default {
mixins:[JeecgListMixin], name: "ZyDevicetypeList",
components: { mixins: [JeecgListMixin],
ZyTypeparametersList, components: {
ZyOperationparametersList, // ZyTypeparametersList,
ZyDevicetypeModal, // ZyOperationparametersList,
ZyDevicetypeDetail // ZyDevicetypeModal,
}, // ZyDevicetypeDetail
data () { },
return { data() {
description: '设备类型管理页面', return {
// 表头 description: '设备类型管理页面',
columns: [ // 表头
// { columns: [
// title:'类型编号', {
// align:"center", title: '设备编号',
// dataIndex: 'code' align: "center",
// }, dataIndex: 'id'
{
title:'名称',
align:"center",
dataIndex: 'name'
},
// {
// title:'类型图片',
// align:"center",
// dataIndex: 'img',
// scopedSlots: {customRender: 'imgSlot'}
// },
// {
// title:"二维码",
// align:"center",
// dataIndex: 'erweima',
// scopedSlots: {customRender: 'imgeSlot'}
// },
{
title:'类型品牌',
align:"center",
dataIndex: 'brand'
},
// {
// title:'型号',
// align:"center",
// dataIndex: 'model'
// },
{
title:'生产厂商',
align:"center",
dataIndex: 'manufacturer'
},
{
title:'供货商',
align:"center",
dataIndex: 'supplier'
},
// {
// title:'联系人',
// align:"center",
// dataIndex: 'contact'
// },
// {
// title:'产地',
// align:"center",
// dataIndex: 'place'
// },
],
url: {
list: "/devicetype/zyDevicetype/list",
delete: "/devicetype/zyDevicetype/delete",
deleteBatch: "/devicetype/zyDevicetype/deleteBatch",
exportXlsUrl: "/devicetype/zyDevicetype/exportXls",
importExcelUrl: "devicetype/zyDevicetype/importExcel",
}, },
dictOptions:{ {
title: '名称',
align: "center",
dataIndex: 'name'
}, },
/* 分页参数 */ // {
ipagination:{ // title:'类型图片',
current: 1, // align:"center",
pageSize: 5, // dataIndex: 'img',
pageSizeOptions: ['5', '10', '50'], // scopedSlots: {customRender: 'imgSlot'}
showTotal: (total, range) => { // },
return range[0] + "-" + range[1] + " 共" + total + "条" // {
}, // title:"二维码",
showQuickJumper: true, // align:"center",
showSizeChanger: true, // dataIndex: 'erweima',
total: 0 // scopedSlots: {customRender: 'imgeSlot'}
// },
{
title: '类型品牌',
align: "center",
dataIndex: 'brand'
}, },
selectedMainId:'', // {
superFieldList:[], // title:'型号',
selectedRowKeys: [], // align:"center",
} // dataIndex: 'model'
}, // },
created() { {
this.getSuperFieldList(); title: '生产厂商',
}, align: "center",
computed: { dataIndex: 'manufacturer'
importExcelUrl: function(){ },
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; // {
} // title:'供货商',
}, // align:"center",
methods: { // dataIndex: 'supplier'
onSelectChange(selectedRowKeys){ // },
console.log('selectedRowKeys changed: ', selectedRowKeys); // {
this.selectedRowKeys = selectedRowKeys; // title:'联系人',
// align:"center",
// dataIndex: 'contact'
// },
// {
// title:'产地',
// align:"center",
// dataIndex: 'place'
// },
],
url: {
list: "/devicetype/zyDevicetype/list",
delete: "/devicetype/zyDevicetype/delete",
deleteBatch: "/devicetype/zyDevicetype/deleteBatch",
exportXlsUrl: "/devicetype/zyDevicetype/exportXls",
importExcelUrl: "devicetype/zyDevicetype/importExcel",
}, },
initDictConfig(){ dictOptions: {},
/* 分页参数 */
ipagination: {
current: 1,
pageSize: 5,
pageSizeOptions: ['5', '10', '50'],
showTotal: (total, range) => {
return range[0] + "-" + range[1] + " 共" + total + "条"
},
showQuickJumper: true,
showSizeChanger: true,
total: 0
}, },
clickThenSelect(record) { selectedMainId: '',
return { superFieldList: [],
on: { selectedRowKeys: [],
click: () => { }
this.onSelectChange(record.id.split(","), [record]); },
} created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}
},
methods: {
onSelectChange(selectedRowKeys) {
console.log('selectedRowKeys changed: ', selectedRowKeys);
this.selectedRowKeys = selectedRowKeys;
},
initDictConfig() {
},
clickThenSelect(record) {
return {
on: {
click: () => {
this.onSelectChange(record.id.split(","), [record]);
} }
} }
}, }
onClearSelected() { },
this.selectedRowKeys = []; onClearSelected() {
this.selectionRows = []; this.selectedRowKeys = [];
this.selectedMainId='' this.selectionRows = [];
}, this.selectedMainId = ''
// onSelectChange(selectedRowKeys, selectionRows) { },
// this.selectedMainId=selectedRowKeys[0] // onSelectChange(selectedRowKeys, selectionRows) {
// this.selectedRowKeys = selectedRowKeys; // this.selectedMainId=selectedRowKeys[0]
// this.selectionRows = selectionRows; // this.selectedRowKeys = selectedRowKeys;
// }, // this.selectionRows = selectionRows;
loadData(arg) { // },
if(!this.url.list){ loadData(arg) {
this.$message.error("请设置url.list属性!") if (!this.url.list) {
return this.$message.error("请设置url.list属性!")
return
}
//加载数据 若传入参数1则加载第一页的内容
if (arg === 1) {
this.ipagination.current = 1;
}
this.onClearSelected()
var params = this.getQueryParams();//查询条件
this.loading = true;
getAction(this.url.list, params).then((res) => {
if (res.success) {
this.dataSource = res.result.records;
this.ipagination.total = res.result.total;
} }
//加载数据 若传入参数1则加载第一页的内容 if (res.code === 510) {
if (arg === 1) { this.$message.warning(res.message)
this.ipagination.current = 1;
} }
this.onClearSelected() this.loading = false;
var params = this.getQueryParams();//查询条件 })
this.loading = true; },
getAction(this.url.list, params).then((res) => { getSuperFieldList() {
if (res.success) { let fieldList = [];
this.dataSource = res.result.records; fieldList.push({type: 'string', value: 'pid', text: '父级节点', dictCode: ''})
this.ipagination.total = res.result.total; fieldList.push({type: 'string', value: 'code', text: '类型编号', dictCode: ''})
} fieldList.push({type: 'string', value: 'name', text: '类型名称', dictCode: ''})
if(res.code===510){ fieldList.push({type: 'string', value: 'img', text: '类型图片', dictCode: ''})
this.$message.warning(res.message) fieldList.push({type: 'string', value: 'brand', text: '类型品牌', dictCode: ''})
} fieldList.push({type: 'string', value: 'model', text: '型号', dictCode: ''})
this.loading = false; fieldList.push({type: 'string', value: 'manufacturer', text: '生产厂商', dictCode: ''})
}) fieldList.push({type: 'string', value: 'supplier', text: '供货商', dictCode: ''})
}, fieldList.push({type: 'string', value: 'contact', text: '联系人', dictCode: ''})
getSuperFieldList(){ fieldList.push({type: 'string', value: 'place', text: '产地', dictCode: ''})
let fieldList=[]; this.superFieldList = fieldList
fieldList.push({type:'string',value:'pid',text:'父级节点',dictCode:''}) },
fieldList.push({type:'string',value:'code',text:'类型编号',dictCode:''}) openDetail(id) {
fieldList.push({type:'string',value:'name',text:'类型名称',dictCode:''}) this.$refs.ZyDevicetypeDetail.showModal(id)
fieldList.push({type:'string',value:'img',text:'类型图片',dictCode:''})
fieldList.push({type:'string',value:'brand',text:'类型品牌',dictCode:''})
fieldList.push({type:'string',value:'model',text:'型号',dictCode:''})
fieldList.push({type:'string',value:'manufacturer',text:'生产厂商',dictCode:''})
fieldList.push({type:'string',value:'supplier',text:'供货商',dictCode:''})
fieldList.push({type:'string',value:'contact',text:'联系人',dictCode:''})
fieldList.push({type:'string',value:'place',text:'产地',dictCode:''})
this.superFieldList = fieldList
},
openDetail(id){
this.$refs.ZyDevicetypeDetail.showModal(id)
}
} }
} }
}
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less' @import '~@assets/less/common.less'
</style> </style>

31
ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue
Unescape View File

@ -1,13 +1,28 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<!-- 查询区域 --> <!-- 查询区域 -->
<!-- <div class="table-page-search-wrapper">--> <div class="table-page-search-wrapper">
<!-- <a-form layout="inline" @keyup.enter.native="searchQuery">--> <a-form layout="inline" @keyup.enter.native="searchQuery">
<!-- <a-row :gutter="24">--> <a-row :gutter="24">
<!-- </a-row>--> <a-col :sm="5">
<!-- </a-form>--> <a-form-model-item label="工具编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="id">
<!-- </div>--> <a-input v-model="queryParam.id" placeholder="请输入工具编号"></a-input>
<!-- &lt;!&ndash; 查询区域-END &ndash;&gt;--> </a-form-model-item>
</a-col>
<a-col :sm="5">
<a-form-model-item label="工具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
<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">
<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>
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<!-- <div class="table-operator">--> <!-- <div class="table-operator">-->
@ -116,7 +131,7 @@ export default {
{ {
title: '工具编号', title: '工具编号',
align: "center", align: "center",
dataIndex: 'nums' dataIndex: 'id'
}, },
{ {
title: '工具名称', title: '工具名称',

42
ant-design-vue-jeecg/src/views/team/StationList.vue
Unescape View File

@ -84,7 +84,9 @@
<template slot="content"> <template slot="content">
<p>{{ text }}</p> <p>{{ text }}</p>
</template> </template>
<a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{ text }}</a> <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{
text
}}</a>
</a-popover> </a-popover>
</span> </span>
<span slot="machineIds_dictText" slot-scope="text, record"> <span slot="machineIds_dictText" slot-scope="text, record">
@ -92,12 +94,13 @@
<template slot="content"> <template slot="content">
<p>{{ text }}</p> <p>{{ text }}</p>
</template> </template>
<a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{ text }}</a> <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{
text
}}</a>
</a-popover> </a-popover>
</span> </span>
<span slot="action1" slot-scope="text, record"> <span slot="action1" slot-scope="text, record">
<a @click="jumpPage1(record)">管理</a> <a @click="jumpPage1(record)">管理</a>
</span> </span>
@ -112,6 +115,10 @@
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete2(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete2(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
<a-divider type="vertical"/>
<a @click="up(record.id)">升序</a>
<a-divider type="vertical"/>
<a @click="down(record.id)">降序</a>
</span> </span>
</a-table> </a-table>
</div> </div>
@ -214,6 +221,8 @@ export default {
url: { url: {
list: "/team/station/list", list: "/team/station/list",
queryIsCanDelete: "/team/station/queryIsCanDelete", queryIsCanDelete: "/team/station/queryIsCanDelete",
up: "/team/station/up",
down: "/team/station/down",
delete: "/team/station/delete", delete: "/team/station/delete",
deleteBatch: "/team/station/deleteBatch", deleteBatch: "/team/station/deleteBatch",
exportXlsUrl: "/team/station/exportXls", exportXlsUrl: "/team/station/exportXls",
@ -279,9 +288,30 @@ export default {
} }
}) })
}, },
up(id) {
getAction(this.url.up, {id: id}).then((res) => {
if (res.success) {
this.loadData();
this.$message.success(res.message);
} else {
this.$message.warning(res.message);
}
})
},
down(id) {
getAction(this.url.down, {id: id}).then((res) => {
if (res.success) {
this.loadData();
this.$message.success(res.message);
} else {
this.$message.warning(res.message);
}
})
},
} }
} }
</script> </script>
<style scoped> <!--<style scoped>-->
@import '~@assets/less/common.less'; <!--@import '~@assets/less/common.less';-->
</style> <!--</style>-->

10
ant-design-vue-jeecg/src/views/team/StationMachineList.vue
Unescape View File

@ -146,11 +146,11 @@ export default {
align: "center", align: "center",
dataIndex: 'stationName', dataIndex: 'stationName',
}, },
// { {
// title: '设备ID', title: '设备编号',
// align: "center", align: "center",
// dataIndex: 'machineId' dataIndex: 'machineId'
// }, },
{ {
title: '设备名称', title: '设备名称',
align: "center", align: "center",

10
ant-design-vue-jeecg/src/views/team/StationToolList.vue
Unescape View File

@ -144,11 +144,11 @@ export default {
align: "center", align: "center",
dataIndex: 'stationName', dataIndex: 'stationName',
}, },
// { {
// title: '工具ID', title: '工具编号',
// align: "center", align: "center",
// dataIndex: 'toolsId' dataIndex: 'toolsId'
// }, },
{ {
title: '工具名称', title: '工具名称',
align: "center", align: "center",

4
jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/tool/controller/ZyToolController.java
Unescape View File

@ -66,8 +66,8 @@ public class ZyToolController extends JeecgController<ZyTool, IZyToolService> {
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
//QueryWrapper<ZyTool> queryWrapper = QueryGenerator.initQueryWrapper(zyTool, req.getParameterMap()); QueryWrapper<ZyTool> queryWrapper = QueryGenerator.initQueryWrapper(zyTool, req.getParameterMap());
QueryWrapper queryWrapper = new QueryWrapper(); // QueryWrapper queryWrapper = new QueryWrapper();
Page<ZyTool> page = new Page<ZyTool>(pageNo, pageSize); Page<ZyTool> page = new Page<ZyTool>(pageNo, pageSize);
IPage<ZyTool> pageList = zyToolService.page(page, queryWrapper); IPage<ZyTool> pageList = zyToolService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);

23
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationController.java
Unescape View File

@ -7,12 +7,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.activiti.entity.ActBusiness;
import org.jeecg.modules.system.entity.SysDepart; import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecg.modules.team.entity.Station; import org.jeecg.modules.team.entity.Station;
@ -28,9 +26,11 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.*; import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* @Description: 车间工位管理 * @Description: 车间工位管理
@ -197,4 +197,19 @@ public class StationController extends JeecgController<Station, IStationService>
return super.importExcel(request, response, Station.class); return super.importExcel(request, response, Station.class);
} }
@ApiOperation(value = "排序", notes = "排序")
@GetMapping(value = "/up")
public Result<?> up(@RequestParam(name = "id", required = true) String id) {
stationService.up(id);
return Result.OK();
}
@AutoLog(value = "排序")
@ApiOperation(value = "排序", notes = "排序")
@GetMapping(value = "/down")
public Result<?> down(@RequestParam(name = "id", required = true) String id) {
stationService.down(id);
return Result.OK();
}
} }

4
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IStationService.java
Unescape View File

@ -13,4 +13,8 @@ import org.jeecg.modules.team.entity.Station;
public interface IStationService extends IService<Station> { public interface IStationService extends IService<Station> {
int queryIsCanDelete(Station station); int queryIsCanDelete(Station station);
void up(String id);
void down(String id);
} }

28
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java
Unescape View File

@ -3,6 +3,7 @@ package org.jeecg.modules.team.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.system.entity.SysDepart; import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.team.entity.Station; import org.jeecg.modules.team.entity.Station;
import org.jeecg.modules.team.entity.StationMachine; import org.jeecg.modules.team.entity.StationMachine;
@ -13,6 +14,7 @@ import org.jeecg.modules.team.service.IStationService;
import org.jeecg.modules.team.service.IStationToolService; import org.jeecg.modules.team.service.IStationToolService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
/** /**
* @Description: 车间工位管理 * @Description: 车间工位管理
@ -36,4 +38,30 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
} }
return count; return count;
} }
@Override
public void up(String id) {
Station entity = this.getById(id);
if (ObjectUtils.isEmpty(entity)) {
throw new JeecgBootException(id + "不存在");
}
Station station = new Station();
station.setId(id);
station.setStationNum(entity.getStationNum() + 1);
this.updateById(station);
}
@Override
public void down(String id) {
Station entity = this.getById(id);
if (ObjectUtils.isEmpty(entity)) {
throw new JeecgBootException(id + "不存在");
}
if (entity.getStationNum() > 1) {
Station station = new Station();
station.setId(id);
station.setStationNum(entity.getStationNum() - 1);
this.updateById(station);
}
}
} }

Write Preview
Loading…
Cancel
Save