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

计划工序制定 1.6

Browse Source
zhc4dev
zhc077 2 years ago
parent 8388f0199f
commit c3473b9aa9
18 changed files with 1132 additions and 825 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. 195
      ant-design-vue-jeecg/src/views/device/ZyDeviceListRef.vue
  2. 579
      ant-design-vue-jeecg/src/views/devicetype/ZyDevicetypeListRef.vue
  3. 497
      ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue
  4. 282
      ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList_back1223.vue
  5. 34
      ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue
  6. 37
      ant-design-vue-jeecg/src/views/team/GroupxList.vue
  7. 23
      ant-design-vue-jeecg/src/views/team/modules/StationMachineModal.vue
  8. 134
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java
  9. 13
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
  10. 9
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java
  11. 22
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
  12. 28
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationMachineController.java
  13. 35
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationToolController.java
  14. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Station.java
  15. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationMachine.java
  16. 16
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/vo/StationMachineVo.java
  17. 33
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/vo/StationToolVo.java
  18. 16
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/vo/StationVo.java

195
ant-design-vue-jeecg/src/views/device/ZyDeviceListRef.vue
Unescape View File

@ -0,0 +1,195 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<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.code" 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>
<!-- 查询区域-END -->
<!-- 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">
</a-table>
</div>
<!-- <ZyDeviceDetail ref="ZyDeviceDetail"></ZyDeviceDetail>-->
<!-- <zy-device-modal ref="modalForm" @ok="modalFormOk"></zy-device-modal>-->
</a-card>
</template>
<script>
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import {getAction} from "@api/manage";
export default {
name: 'ZyDeviceListRef',
mixins:[JeecgListMixin],
components: {},
data () {
return {
description: '设备信息管理页面',
labelCol: {
xs: {span: 24},
sm: {span: 5},
},
wrapperCol: {
xs: {span: 24},
sm: {span: 16},
},
// 表头
columns: [
{
title:'设备编号',
align:"center",
dataIndex: 'code'
},
{
title: '名称',
align: "center",
dataIndex: 'name'
},
],
url: {
list: "/device/zyDevice/list",
delete: "/device/zyDevice/delete",
deleteBatch: "/device/zyDevice/deleteBatch",
exportXlsUrl: "/device/zyDevice/exportXls",
importExcelUrl: "device/zyDevice/importExcel",
},
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
},
selectedMainId: '',
superFieldList: [],
selectedRowKeys: [],
}
},
created() {
// this.getSuperFieldList();
// console.log(this.superFieldList)
},
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 = [];
this.selectionRows = [];
this.selectedMainId = ''
},
// onSelectChange(selectedRowKeys, selectionRows) {
// this.selectedMainId=selectedRowKeys[0]
// this.selectedRowKeys = selectedRowKeys;
// this.selectionRows = selectionRows;
// },
loadData(arg) {
if (!this.url.list) {
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;
}
if (res.code === 510) {
this.$message.warning(res.message)
}
this.loading = false;
})
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'img',text:'设备图片',dictCode:''})
fieldList.push({type:'string',value:'typeid',text:'设备类型',dictCode:'zy_devicetype,name,id'})
fieldList.push({type:'string',value:'code',text:'设备编号',dictCode:''})
fieldList.push({type:'date',value:'buydate',text:'购买时间'})
fieldList.push({type:'sel_user',value:'agent',text:'经办人'})
fieldList.push({type:'string',value:'adress',text:'存放位置',dictCode:''})
fieldList.push({type:'string',value:'status',text:'设备状态',dictCode:''})
fieldList.push({type:'string',value:'maintenancecycle',text:'维护周期',dictCode:''})
fieldList.push({type:'sel_user',value:'administrator',text:'管理人'})
fieldList.push({type:'date',value:'maintenancedate',text:'上次维护时间'})
fieldList.push({type:'string',value:'img3d',text:'3d模型',dictCode:''})
this.superFieldList = fieldList
},
openDetail(id){
this.$refs.ZyDeviceDetail.showModal(id)
// this.$children[0].showModal(id)
}
}
}
</script>

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

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

497
ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue
Unescape View File

@ -1,111 +1,30 @@
<template> <template>
<a-card :bordered="false"> <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"> <div class="table-operator">
<a-button type="primary" icon="download" @click="handleExportXls('计划工序')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('计划工序')">导出</a-button>
<!-- <a-button type="primary" @click="handleTableSave($event)">保存</a-button>-->
<a-button type="primary" @click="fanHui()">返回</a-button> <a-button type="primary" @click="fanHui()">返回</a-button>
</div> </div>
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<a-table <j-vxe-table
ref="table" ref="xTable"
size="middle" toolbar
:scroll="{x:true}" :toolbarConfig="toolbarConfig"
bordered row-number
rowKey="id" row-selection
keep-source
:rowSelection="clickTrue"
:clickSelectRow="clickTrue"
:loading="loading"
:columns="columns" :columns="columns"
@selectRowChange="handleSelectRowChange"
:dataSource="dataSource" :dataSource="dataSource"
:pagination="ipagination" @valueChange="handleValueChange"
:loading="loading" @save="handleTableSave"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" />
class="j-table-force-nowrap"
@change="handleTableChange">
<span slot="stationList" slot-scope="stationList">
<a-select @change="getToolAndMachine" style="width: 180px" placeholder="请选择">
<a-select-option v-for="item in stationList" :value="item.id">
{{ item.stationName }}
</a-select-option>
</a-select>
</span>
<span slot="toolsList" slot-scope="toolsList">
<a-select style="width: 180px" placeholder="请选择">
<a-select-option v-for="item in toolsList" :value="item.id">
{{ item.name }}
</a-select-option>
</a-select>
</span>
<span slot="machineList" slot-scope="machineList">
<a-select style="width: 180px" placeholder="请选择">
<a-select-option v-for="item in machineList" :value="item.id">
{{ item.name }}
</a-select-option>
</a-select>
</span>
<span slot="proProcess" slot-scope="proProcess">
<j-search-select-tag type="list" dict="zy_process,process_name,id,id in(select process_id from zy_product_process where product_id='1')" pidField="pid"
pidValue="" placeholder="前导工序"/>
</span>
<span slot="postProcess" slot-scope="postProcess">
<j-search-select-tag type="list" dict="zy_process,process_name,id,id in(select process_id from zy_product_process where product_id='1')" pidField="pid"
pidValue="" placeholder="后导工序"/>
</span>
<span slot="inputProduct" slot-scope="inputProduct">
<a-input v-model="processIds" placeholder="请输入产品"></a-input>
</span>
<span slot="semiProduct" slot-scope="semiProduct">
<a-input v-model="semiProduct" placeholder="请输入成品/半成品"></a-input>
</span>
<!-- <template
v-for="col in columns"
:slot="col"
slot-scope="text, record, index"
>
<div :key="col">
<a-input
v-if="record.editable"
style="margin: -5px 0"
:value="text"
@change="e => handleChange(e.target.value, record.key, col)"
/>
<template v-else>
{{ text }}
</template>
</div>
</template>
<template slot="operation" slot-scope="text, record, index">
<div class="editable-row-operations">
<span v-if="record.editable">
<a @click="() => save(record)">Save</a>
<a-popconfirm title="Sure to cancel?" @confirm="() => cancel(record)">
<a>Cancel</a>
</a-popconfirm>
</span>
<span>
<a :disabled="editingKey !== ''" @click="() => edit(index)">Edit66</a>
</span> b
</div>
</template>-->
</a-table>
</div>
<div class="table-operator" style="text-align: right">
<a-button type="primary" @click="fanHui()">提交</a-button>
</div> </div>
<!-- <zy-plan-process-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-plan-process-modal>-->
</a-card> </a-card>
</template> </template>
@ -114,189 +33,135 @@
import '@/assets/less/TableExpand.less' import '@/assets/less/TableExpand.less'
import {mixinDevice} from '@/utils/mixin' import {mixinDevice} from '@/utils/mixin'
import {JeecgListMixin} from '@/mixins/JeecgListMixin' import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import ZyPlanProcessModal from './modules/ZyPlanProcessModal2' import {getAction, postAction} from "@api/manage";
import {getAction} from "@api/manage"; import {filterObj, pushIfNotExist, randomNumber, randomUUID} from "@/utils/util";
import {filterObj} from "@/utils/util"; import {JVXETypes} from '@/components/jeecg/JVxeTable'
export default { export default {
name: 'ZyPlanProcessList', name: 'ZyPlanProcessDataList',
mixins: [JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
components: {
ZyPlanProcessModal
},
data() { data() {
// this.cacheData = this.dataSource.map(item => ({ ...item }));
this.cacheData = [];
return { return {
toolbarConfig: {
// add 新增按钮；remove 删除按钮；clearSelection 清空选择按钮
btn: ['save']
},
description: '生产计划工序管理页面', description: '生产计划工序管理页面',
loading: false,
// 分页器参数
// pagination: {
// // 当前页码
// current: 1,
// // 每页的条数
// pageSize: 10,
// // 可切换的条数
// pageSizeOptions: ['10', '20', '30', '50'],
// // 数据总数（目前并不知道真实的总数，所以先填写0，在后台查出来后再赋值）
// total: 0,
// },
// 选择的行
// selectedRows: [],
// 数据源，控制表格的数据
dataSource: [],
// columns, // columns,
// 表头
columns: [ columns: [
{ {key: 'workOrderId', title: '工单编号', width: '180px'},
title: '#', {key: 'productName', title: '产品名称', width: '180px'},
dataIndex: 'productProcessId', {key: 'departName', title: '车间名称', width: '180px'},
key: 'rowIndex', {key: 'processName', title: '工序名称', width: '180px'},
width: 60,
align: "center",
customRender: function (t, r, index) {
return parseInt(index) + 1;
}
},
/* {
title: '计划id',
align: "center",
dataIndex: 'planId'
},*/
{
title: '工单编号',
align: "center",
dataIndex: 'workOrderId',
scopedSlots: {customRender: 'workOrderId'}
},
/*{
title: '产品id',
align: "center",
dataIndex: 'productId'
},
{
title: '工序id',
align: "center",
dataIndex: 'productProcessId'
},*/
{
title: '产品',
align: "center",
dataIndex: 'productName'
},
{
title: '车间',
align: "center",
dataIndex: 'departName'
},
{
title: '工序',
align: "center",
dataIndex: 'processName'
},
{ {
title: '工位列表', title: '工位列表',
align: "center", key: 'stationId',
dataIndex: 'stationList', type: JVXETypes.select,
width: 150, width: '200px',
scopedSlots: {customRender: 'stationList'} options: [],
}, placeholder: '请选择${title}',
{ }, {
title: '工位工具列表', title: '设备列表',
align: "center", key: 'machineIds',
dataIndex: 'toolsList', type: JVXETypes.selectMultiple,
width: 150, width: '200px',
// scopedSlots: {customRender: this.toolsList} options: [],
scopedSlots: {customRender: 'toolsList'} placeholder: '请选择${title}',
}, }, {
{ title: '工具列表',
title: '工具设备列表', key: 'toolsIds',
align: "center", type: JVXETypes.selectMultiple,
dataIndex: 'machineList', width: '200px',
width: 150, options: [],
scopedSlots: {customRender: 'machineList'} placeholder: '请选择${title}',
}, },
{ {
key: 'proProcess',
title: '前导工序', title: '前导工序',
align: "center", dictCode: 'zy_process,process_name,id,id in(select process_id from zy_product_process where product_id="1")',
dataIndex: 'proProcess', width: '150',
width: 150, type: JVXETypes.select
scopedSlots: {customRender: 'proProcess'}
}, },
{ {key: 'postProcess', title: '后导工序', width: '150', type: JVXETypes.select},
title: '后导工序', {key: 'inputProduct', title: '输入产品', width: '150', type: JVXETypes.input},
align: "center", {key: 'semiProduct', title: '成品/半成品', width: '150', type: JVXETypes.input},
dataIndex: 'proProcess',
width: 150,
scopedSlots: {customRender: 'postProcess'}
},
{
title: '输入产品',
align: "center",
dataIndex: 'inputProduct',
width: 150,
scopedSlots: {customRender: 'inputProduct'}
},
{
title: '成品/半成品',
align: "center",
dataIndex: 'semiProduct',
width: 150,
scopedSlots: {customRender: 'semiProduct'}
},
// {
// title: 'operation',
// dataIndex: 'operation',
// scopedSlots: {customRender: 'operation'},
// },
// {
// title: '操作',
// dataIndex: 'action',
// align: "center",
// fixed: "right",
// width: 147,
// scopedSlots: {customRender: 'action'}
// }
], ],
editingKey: '',
url: { url: {
list: "/org.jeecg.modules.productplan/zyPlanProcess/getProcessDatalist", list: "/org.jeecg.modules.productplan/zyPlanProcess/getProcessDatalist",
stationToolslist: "/stationTool/list", stationToolslist: "/stationTool/list2",
stationMachinelist: "/stationMachine/list", stationMachinelist: "/stationMachine/list2",
// productPlanlist: "/org.jeecg.modules.productplan/zyProductPlan/list", addProcessBatch: "/org.jeecg.modules.productplan/zyPlanProcess/addProcessBatch",
delete: "/org.jeecg.modules.productplan/zyPlanProcess/delete",
// deleteBatch: "/org.jeecg.modules.productplan/zyPlanProcess/deleteBatch",
// exportXlsUrl: "/org.jeecg.modules.productplan/zyPlanProcess/exportXls",
// importExcelUrl: "org.jeecg.modules.productplan/zyPlanProcess/importExcel",
}, },
loadRouteType: false, loadRouteType: false,
planId: "", planId: "",
dictOptions: {}, dictOptions: {},
// superFieldList: [], superFieldList: [],
stationList: [],
toolsList: [], toolsList: [],
machineList: [], machineList: [],
clickTrue: true,
} }
}, },
created() { created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
}, },
methods: { methods: {
// 【整体保存】点击保存按钮时触发的事件
handleTableSave({$table, target}) {
console.log("保存开始-----")
// 校验整个表格
$table.validate().then((errMap) => {
// 校验通过
if (!errMap) {
// 获取所有数据
let tableData = target.getTableData()
tableData.forEach(item => {
item.id = '';
})
console.log('当前保存的数据是：', tableData)
// // 获取新增的数据
// let newData = target.getNewData()
// console.log('-- 新增的数据：', newData)
// // 获取删除的数据
// let deleteData = target.getDeleteData()
// console.log('-- 删除的数据：', deleteData)
// 【模拟保存】
this.loading = true
postAction(this.url.addProcessBatch, tableData).then(res => {
if (res.success) {
this.$message.success(`保存成功！`)
} else {
this.$message.warn(`保存失败：` + res.message)
}
}).finally(() => {
this.loading = false
})
}
})
},
fanHui() { fanHui() {
this.$router.push({ this.$router.push({
path: '/productplan/ZyPlanProcessList', path: '/productplan/ZyPlanProcessList',
}); });
}, },
getToolAndMachine(stationId) {
// alert("stationId=" + stationId);
getAction(this.url.stationToolslist, {"stationId": stationId}).then((res) => {
if (res.success) {
this.toolsList = res.result.records || res.result;
console.log("toolsList", JSON.stringify(this.toolsList))
} else {
this.$message.warning(res.message)
}
});
getAction(this.url.stationMachinelist, {"stationId": stationId}).then((res) => {
if (res.success) {
this.machineList = res.result.records || res.result;
console.log("machineList", JSON.stringify(this.toolsList))
} else {
this.$message.warning(res.message)
}
});
},
//加载传递参数 //加载传递参数
loadParameter() { loadParameter() {
if (this.loadRouteType === false) { if (this.loadRouteType === false) {
@ -307,14 +172,16 @@ export default {
} }
}, },
loadData(arg) { loadData(arg) {
console.log("the loadData---------开始");
// var that = this;
if (!this.url.list) { if (!this.url.list) {
this.$message.error("请设置url.list属性!") this.$message.error("请设置url.list属性!")
return return
} }
//加载数据 若传入参数1则加载第一页的内容 //加载数据 若传入参数1则加载第一页的内容
if (arg === 1) { // if (arg === 1) {
this.ipagination.current = 1; // this.ipagination.current = 1;
} // }
this.loadParameter(); this.loadParameter();
var params = this.getQueryParams();//查询条件 var params = this.getQueryParams();//查询条件
this.loading = true; this.loading = true;
@ -322,19 +189,12 @@ export default {
getAction(this.url.list, params).then((res) => { getAction(this.url.list, params).then((res) => {
if (res.success) { if (res.success) {
this.dataSource = res.result.records || res.result; this.dataSource = res.result.records || res.result;
if (res.result.total) { this.stationList = this.dataSource[0].stationList;
this.ipagination.total = res.result.total;
} else {
this.ipagination.total = 0;
}
} else { } else {
// this.stationIdCode = "station,station_name,id,depart_id in (select workshop_id from zy_product_plan where id='" + this.planId + "')";
this.$message.warning(res.message) this.$message.warning(res.message)
} }
}).finally(() => { }).finally(() => {
// this.dataSource.forEach(item => {
// item['stationName'] = this.stationName;
// item['stationNum'] = this.stationNum;
// })
this.loading = false this.loading = false
}) })
}, },
@ -352,78 +212,61 @@ export default {
param.planId = this.planId; param.planId = this.planId;
return filterObj(param); return filterObj(param);
}, },
// initDictConfig() {
// }, // 当选择的行变化时触发的事件
getSuperFieldList() { handleSelectRowChange(event) {
// let fieldList = []; console.log("handleSelectRowChange")
// fieldList.push({type: 'string', value: 'id', text: 'id', dictCode: ''}) console.log("handleSelectRowChange-event:", event)
// fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''}) const {type, row, column, value, target, $table} = event
// fieldList.push({type: 'string', value: 'productName', text: '生产计划id', dictCode: ''}) console.log(JSON.stringify(this.stationList));
// fieldList.push({type: 'string', value: 'stationId', text: '工位id', dictCode: ''}) // target.$refs.vxe.columns[6].dictCode = this.stationIdCode;
// fieldList.push({type: 'string', value: 'machineIds', text: '设备id列表', dictCode: ''}) target.$refs.vxe.columns[6].options = this.stationList;
// fieldList.push({type: 'string', value: 'toolsIds', text: '工具id列表', dictCode: ''}) // 清空后两列的数据
// fieldList.push({type: 'string', value: 'productProcessId', text: '工序id列表', dictCode: ''}) // target.setValues([{
// fieldList.push({type: 'string', value: 'productProcessId', text: '工序id列表', dictCode: ''}) // rowKey: row.id,
// fieldList.push({type: 'string', value: 'userIds', text: '成员id列表', dictCode: ''}) // values: {machineIds: '', toolsIds: ''}
// this.superFieldList = fieldList // }])
}, // target.$refs.vxe.columns[4].options = []
// handleChange(value, key, column) {
// const newData = [...this.data];
// const target = newData.find(item => key === item.key);
// if (target) {
// target[column] = value;
// this.data = newData;
// }
// },
edit(key) {
alert("the edit() record =" + JSON.stringify(key))
// const newData = [...this.data];
const newData = [...this.dataSource];
// const newData = record;
console.log("the edit() newData =", JSON.stringify(newData));
// this.editingKey = '0';
// record.editable = true;
// const target = newData.find(item => key === item.key);
const target = newData[0];
console.log("the edit() target =", JSON.stringify(target));
this.editingKey = key;
console.log("the edit() editingKey =", this.editingKey);
if (target) {
// debugger;
target.editable = true;
this.dataSource = newData;
}
},
save(key) {
// const newData = [...this.data];
const newData = this.dataSource;
console.log("save() newData=", JSON.stringify(newData))
const newCacheData = [...this.cacheData];
const target = newData.find(item => key === item.key);
const targetCache = newCacheData.find(item => key === item.key);
if (target && targetCache) {
delete target.editable;
this.dataSource = newData;
Object.assign(targetCache, target);
this.cacheData = newCacheData;
}
this.editingKey = '';
}, },
cancel(key) { /** 当选项被改变时，联动其他组件 */
const newData = this.dataSource; handleValueChange(event) {
const target = newData.find(item => key === item.key); const {type, row, column, value, target} = event
this.editingKey = ''; console.log("event", event)
if (target) { console.log("row", row)
Object.assign(target, this.cacheData.find(item => key === item.key)); // if (type === JVXETypes.select) {
delete target.editable; // 第一列
this.dataSource = newData; if (column.key === 'stationId') {
// 设置第二列的 options
console.log('this stationid(row.id):', row.stationId)
// 清空后两列的数据
target.setValues([{
rowKey: row.id,
values: {machineIds: '', toolsIds: ''}
}])
target.$refs.vxe.columns[7].options = []
target.$refs.vxe.columns[8].options = []
getAction(this.url.stationMachinelist, {"stationId": row.stationId}).then((res) => {
if (res.success) {
this.machineList = res.result.records || res.result;
console.log("machineList", JSON.stringify(this.machineList))
target.$refs.vxe.columns[7].options = this.machineList;
} else {
this.$message.warning(res.message)
}
});
getAction(this.url.stationToolslist, {"stationId": row.stationId}).then((res) => {
if (res.success) {
this.toolsList = res.result.records || res.result;
console.log("toolsList", JSON.stringify(this.toolsList))
target.$refs.vxe.columns[8].options = this.toolsList;
} else {
this.$message.warning(res.message)
}
});
} }
}, }
}, },
}; };
</script> </script>
<style scoped>
.editable-row-operations a {
margin-right: 8px;
}
</style>

282
ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList_back1223.vue
Unescape View File

@ -1,52 +1,13 @@
<template> <template>
<a-card :bordered="false"> <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">-->
<!--&lt;!&ndash; <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('生产计划工序')">导出</a-button>-->
<!-- &lt;!&ndash; <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"&ndash;&gt;-->
<!-- &lt;!&ndash; @change="handleImportExcel">&ndash;&gt;-->
<!-- &lt;!&ndash; <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
<!-- &lt;!&ndash; </a-upload>&ndash;&gt;-->
<!-- &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
<!-- <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>-->
<div class="table-operator"> <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-button @click="zyStyleFabricHandleAdd(stationId)" type="primary" icon="plus">新增</a-button>--> <a-button type="primary" @click="fanHui()">保存</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('1')">导出</a-button>
<a-button type="primary" @click="fanHui()">返回</a-button> <a-button type="primary" @click="fanHui()">返回</a-button>
</div> </div>
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <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 <a-table
ref="table" ref="table"
size="middle" size="middle"
@ -77,12 +38,59 @@
</span> </span>
<span slot="machineList" slot-scope="machineList"> <span slot="machineList" slot-scope="machineList">
<a-select style="width: 180px" placeholder="请选择"> <a-select style="width: 180px" placeholder="请选择">
<a-select-option v-for="item in machineList" :value="item.id"> <a-select-option v-for="item in machineList" :value="item.id">
{{ item.name }} {{ item.name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</span> </span>
<span slot="proProcess" slot-scope="proProcess">
<j-search-select-tag type="list" dict="zy_process,process_name,id,id in(select process_id from zy_product_process where product_id='1')" pidField="pid"
pidValue="" placeholder="前导工序"/>
</span>
<span slot="postProcess" slot-scope="postProcess">
<j-search-select-tag type="list" dict="zy_process,process_name,id,id in(select process_id from zy_product_process where product_id='1')" pidField="pid"
pidValue="" placeholder="后导工序"/>
</span>
<span slot="inputProduct" slot-scope="inputProduct">
<a-input v-model="processIds" placeholder="请输入产品"></a-input>
</span>
<span slot="semiProduct" slot-scope="semiProduct">
<a-input v-model="semiProduct" placeholder="请输入成品/半成品"></a-input>
</span>
<!-- <template
v-for="col in columns"
:slot="col"
slot-scope="text, record, index"
>
<div :key="col">
<a-input
v-if="record.editable"
style="margin: -5px 0"
:value="text"
@change="e => handleChange(e.target.value, record.key, col)"
/>
<template v-else>
{{ text }}
</template>
</div>
</template>
<template slot="operation" slot-scope="text, record, index">
<div class="editable-row-operations">
<span v-if="record.editable">
<a @click="() => save(record)">Save</a>
<a-popconfirm title="Sure to cancel?" @confirm="() => cancel(record)">
<a>Cancel</a>
</a-popconfirm>
</span>
<span>
<a :disabled="editingKey !== ''" @click="() => edit(index)">Edit66</a>
</span> b
</div>
</template>-->
</a-table> </a-table>
</div> </div>
@ -110,13 +118,16 @@ export default {
ZyPlanProcessModal ZyPlanProcessModal
}, },
data() { data() {
// this.cacheData = this.dataSource.map(item => ({ ...item }));
this.cacheData = [];
return { return {
description: '生产计划工序管理页面', description: '生产计划工序管理页面',
// columns,
// 表头 // 表头
columns: [ columns: [
{ {
title: '#', title: '#',
dataIndex: '', dataIndex: 'productProcessId',
key: 'rowIndex', key: 'rowIndex',
width: 60, width: 60,
align: "center", align: "center",
@ -124,21 +135,27 @@ export default {
return parseInt(index) + 1; return parseInt(index) + 1;
} }
}, },
// { /* {
// title: '计划id', title: '计划id',
// align: "center", align: "center",
// dataIndex: 'planId' dataIndex: 'planId'
// }, },*/
{ {
title: '工单编号', title: '工单编号',
align: "center", align: "center",
dataIndex: 'workOrderId' dataIndex: 'workOrderId',
scopedSlots: {customRender: 'workOrderId'}
}, },
{ /*{
title: '产品id', title: '产品id',
align: "center", align: "center",
dataIndex: 'productId' dataIndex: 'productId'
}, },
{
title: '工序id',
align: "center",
dataIndex: 'productProcessId'
},*/
{ {
title: '产品', title: '产品',
align: "center", align: "center",
@ -166,8 +183,8 @@ export default {
align: "center", align: "center",
dataIndex: 'toolsList', dataIndex: 'toolsList',
width: 150, width: 150,
scopedSlots: {customRender: 'toolsList'}
// scopedSlots: {customRender: this.toolsList} // scopedSlots: {customRender: this.toolsList}
scopedSlots: {customRender: 'toolsList'}
}, },
{ {
title: '工具设备列表', title: '工具设备列表',
@ -177,14 +194,50 @@ export default {
scopedSlots: {customRender: 'machineList'} scopedSlots: {customRender: 'machineList'}
}, },
{ {
title: '操作', title: '前导工序',
dataIndex: 'action',
align: "center", align: "center",
fixed: "right", dataIndex: 'proProcess',
width: 147, width: 150,
scopedSlots: {customRender: 'action'} scopedSlots: {customRender: 'proProcess'}
} },
{
title: '后导工序',
align: "center",
dataIndex: 'proProcess',
width: 150,
scopedSlots: {customRender: 'postProcess'}
},
{
title: '输入产品',
align: "center",
dataIndex: 'inputProduct',
width: 150,
scopedSlots: {customRender: 'inputProduct'}
},
{
title: '成品/半成品',
align: "center",
dataIndex: 'semiProduct',
width: 150,
scopedSlots: {customRender: 'semiProduct'}
},
// {
// title: 'operation',
// dataIndex: 'operation',
// scopedSlots: {customRender: 'operation'},
// },
// {
// title: '操作',
// dataIndex: 'action',
// align: "center",
// fixed: "right",
// width: 147,
// scopedSlots: {customRender: 'action'}
// }
], ],
editingKey: '',
url: { url: {
list: "/org.jeecg.modules.productplan/zyPlanProcess/getProcessDatalist", list: "/org.jeecg.modules.productplan/zyPlanProcess/getProcessDatalist",
stationToolslist: "/stationTool/list", stationToolslist: "/stationTool/list",
@ -198,7 +251,7 @@ export default {
loadRouteType: false, loadRouteType: false,
planId: "", planId: "",
dictOptions: {}, dictOptions: {},
superFieldList: [], // superFieldList: [],
toolsList: [], toolsList: [],
machineList: [], machineList: [],
} }
@ -295,48 +348,75 @@ export default {
// initDictConfig() { // initDictConfig() {
// }, // },
getSuperFieldList() { getSuperFieldList() {
let fieldList = []; // let fieldList = [];
fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''}) // fieldList.push({type: 'string', value: 'id', text: 'id', dictCode: ''})
fieldList.push({type: 'string', value: 'stationId', text: '工位id', dictCode: ''}) // fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''})
fieldList.push({type: 'string', value: 'machineIds', text: '设备id列表', dictCode: ''}) // fieldList.push({type: 'string', value: 'productName', text: '生产计划id', dictCode: ''})
fieldList.push({type: 'string', value: 'toolsIds', text: '工具id列表', dictCode: ''}) // fieldList.push({type: 'string', value: 'stationId', text: '工位id', dictCode: ''})
fieldList.push({type: 'string', value: 'processIds', text: '工序id列表', dictCode: ''}) // fieldList.push({type: 'string', value: 'machineIds', text: '设备id列表', dictCode: ''})
fieldList.push({type: 'string', value: 'userIds', text: '成员id列表', dictCode: ''}) // fieldList.push({type: 'string', value: 'toolsIds', text: '工具id列表', dictCode: ''})
this.superFieldList = fieldList // fieldList.push({type: 'string', value: 'productProcessId', text: '工序id列表', dictCode: ''})
// fieldList.push({type: 'string', value: 'productProcessId', text: '工序id列表', dictCode: ''})
// fieldList.push({type: 'string', value: 'userIds', text: '成员id列表', dictCode: ''})
// this.superFieldList = fieldList
}, },
// jumpPage1(record) { // handleChange(value, key, column) {
// this.$router.push({ // const newData = [...this.data];
// // path: '/productplan/ZyProductPlanList', // const target = newData.find(item => key === item.key);
// path: '/productplan/ZyPlanProcessDataList', // if (target) {
// // target[column] = value;
// // query: { // 路由携带参数 // this.data = newData;
// // 'stationId': record.id,
// // 'stationName': record.stationName,
// // },
// });
// },
// pf(record) {
// this.$router.push({
// path: '/productplan/ZyPlanProcessAddList',
// query: { // 路由携带参数
// }
// });
// getAction("productPlanlist", {id: record.id}).then((res) => {
// if (res.success) {
// this.$router.push({
// path: '/src/views/processassessment/assessmentCourse/ClassOpeningTaskList',
// query: { // 路由携带参数
// }
// });
// } else {
// this.$message.error(res.message)
// } // }
// });
// }, // },
} edit(key) {
} alert("the edit() record =" + JSON.stringify(key))
// const newData = [...this.data];
const newData = [...this.dataSource];
// const newData = record;
console.log("the edit() newData =", JSON.stringify(newData));
// this.editingKey = '0';
// record.editable = true;
// const target = newData.find(item => key === item.key);
const target = newData[0];
console.log("the edit() target =", JSON.stringify(target));
this.editingKey = key;
console.log("the edit() editingKey =", this.editingKey);
if (target) {
// debugger;
target.editable = true;
this.dataSource = newData;
}
},
save(key) {
// const newData = [...this.data];
const newData = this.dataSource;
console.log("save() newData=", JSON.stringify(newData))
const newCacheData = [...this.cacheData];
const target = newData.find(item => key === item.key);
const targetCache = newCacheData.find(item => key === item.key);
if (target && targetCache) {
delete target.editable;
this.dataSource = newData;
Object.assign(targetCache, target);
this.cacheData = newCacheData;
}
this.editingKey = '';
},
cancel(key) {
const newData = this.dataSource;
const target = newData.find(item => key === item.key);
this.editingKey = '';
if (target) {
Object.assign(target, this.cacheData.find(item => key === item.key));
delete target.editable;
this.dataSource = newData;
}
},
},
};
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; .editable-row-operations a {
margin-right: 8px;
}
</style> </style>

34
ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue
Unescape View File

@ -20,17 +20,17 @@
<!-- 高级查询区域 --> <!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" <j-super-query :fieldList="superFieldList" ref="superQueryModal"
@handleSuperQuery="handleSuperQuery"></j-super-query> @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0"> <!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
<a-menu slot="overlay"> <!-- <a-menu slot="overlay">-->
<a-menu-item key="1" @click="batchDel"> <!-- <a-menu-item key="1" @click="batchDel">-->
<a-icon type="delete"/> <!-- <a-icon type="delete"/>-->
删除 <!-- 删除-->
</a-menu-item> <!-- </a-menu-item>-->
</a-menu> <!-- </a-menu>-->
<a-button style="margin-left: 8px"> 批量操作 <!--&lt;!&ndash; <a-button style="margin-left: 8px"> 批量操作&ndash;&gt;-->
<a-icon type="down"/> <!--&lt;!&ndash; <a-icon type="down"/>&ndash;&gt;-->
</a-button> <!--&lt;!&ndash; </a-button>&ndash;&gt;-->
</a-dropdown> <!-- </a-dropdown>-->
</div> </div>
<!-- table区域-begin --> <!-- table区域-begin -->
@ -171,12 +171,12 @@ export default {
dataIndex: 'toolsIds_dictText', dataIndex: 'toolsIds_dictText',
scopedSlots: {customRender: 'toolsIds_dictText'} scopedSlots: {customRender: 'toolsIds_dictText'}
}, },
{ // {
title: '成员', // title: '成员',
align: "center", // align: "center",
dataIndex: 'userIds_dictText', // dataIndex: 'userIds_dictText',
scopedSlots: {customRender: 'userIds_dictText'} // scopedSlots: {customRender: 'userIds_dictText'}
}, // },
{ {
title:'前导工序', title:'前导工序',
align:"center", align:"center",

37
ant-design-vue-jeecg/src/views/team/GroupxList.vue
Unescape View File

@ -16,26 +16,31 @@
<a-input placeholder="请输入班组名称" v-model="queryParam.groupName"></a-input> <a-input placeholder="请输入班组名称" v-model="queryParam.groupName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-form-item label="手机号">
<a-form-item label="负责人"> <a-input placeholder="请输入手机号" v-model="queryParam.mobile"></a-input>
<a-input placeholder="请输入负责人" v-model="queryParam.enterprisesManager"></a-input> </a-form-item>
</a-form-item> </a-col>
</a-col> <!-- <template v-if="toggleSearchStatus">-->
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<a-form-item label="手机号"> <!-- <a-form-item label="负责人">-->
<a-input placeholder="请输入手机号" v-model="queryParam.mobile"></a-input> <!-- <a-input placeholder="请输入负责人" v-model="queryParam.enterprisesManager"></a-input>-->
</a-form-item> <!-- </a-form-item>-->
</a-col> <!-- </a-col>-->
</template> <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="手机号">-->
<!-- <a-input placeholder="请输入手机号" v-model="queryParam.mobile"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- </template>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <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="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px"> <!-- <a @click="handleToggleSearch" style="margin-left: 8px">-->
{{ toggleSearchStatus ? '收起' : '展开' }} <!-- {{ toggleSearchStatus ? '收起' : '展开' }}-->
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> <!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
</a> <!-- </a>-->
</span> </span>
</a-col> </a-col>

23
ant-design-vue-jeecg/src/views/team/modules/StationMachineModal.vue
Unescape View File

@ -27,19 +27,18 @@
<!-- </a-form-model>--> <!-- </a-form-model>-->
<!-- </a-spin>--> <!-- </a-spin>-->
<ZyDevicetypeListRef ref="modalForm2"></ZyDevicetypeListRef> <ZyDeviceListRef ref="modalForm2"></ZyDeviceListRef>
</j-modal> </j-modal>
</template> </template>
<script> <script>
import {httpAction} from '@/api/manage' import {httpAction} from '@/api/manage'
import moment from "moment" import ZyDeviceListRef from '@views/device/ZyDeviceListRef'
import ZyDevicetypeListRef from '@views/devicetype/ZyDevicetypeListRef'
export default { export default {
name: "StationMachineModal", name: "StationMachineModal",
components:{ components:{
ZyDevicetypeListRef ZyDeviceListRef
}, },
data() { data() {
return { return {
@ -49,14 +48,14 @@ export default {
stationId: '', stationId: '',
machineId:[], machineId:[],
}, },
labelCol: { // labelCol: {
xs: {span: 24}, // xs: {span: 24},
sm: {span: 5}, // sm: {span: 5},
}, // },
wrapperCol: { // wrapperCol: {
xs: {span: 24}, // xs: {span: 24},
sm: {span: 16}, // sm: {span: 16},
}, // },
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {

134
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java
Unescape View File

@ -4,7 +4,9 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@ -20,93 +22,133 @@ import lombok.experimental.Accessors;
/** /**
* @Description: 设备信息 * @Description: 设备信息
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2021-11-11 * @Date: 2021-11-11
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
@TableName("zy_device") @TableName("zy_device")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="zy_device对象", description="设备信息") @ApiModel(value = "zy_device对象", description = "设备信息")
public class ZyDevice implements Serializable { public class ZyDevice implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**主键*/ /**
@TableId(type = IdType.ASSIGN_ID) * 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private String id; private String id;
/**创建人*/
private String name;
/**
* 创建人
*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private String createBy; private String createBy;
/**创建日期*/ /**
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") * 创建日期
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
private Date createTime; private Date createTime;
/**更新人*/ /**
* 更新人
*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private String updateBy; private String updateBy;
/**更新日期*/ /**
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") * 更新日期
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @ApiModelProperty(value = "更新日期")
private Date updateTime; private Date updateTime;
/**所属部门*/ /**
* 所属部门
*/
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private String sysOrgCode; private String orgCode;
/**设备图片*/ /**
@Excel(name = "设备图片", width = 15) * 设备图片
*/
@Excel(name = "设备图片", width = 15)
@ApiModelProperty(value = "设备图片") @ApiModelProperty(value = "设备图片")
private String img; private String img;
/**设备类型*/ /**
@Excel(name = "设备类型", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id") * 设备类型
@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") */
@Excel(name = "设备类型", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "设备类型") @ApiModelProperty(value = "设备类型")
private String typeid; private String typeCode;
/**设备编号*/ /**
@Excel(name = "设备编号", width = 15) * 设备编号
*/
@Excel(name = "设备编号", width = 15)
@ApiModelProperty(value = "设备编号") @ApiModelProperty(value = "设备编号")
private String code; private String code;
/**购买时间*/ /**
@Excel(name = "购买时间", width = 15, format = "yyyy-MM-dd") * 购买时间
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") */
@DateTimeFormat(pattern="yyyy-MM-dd") @Excel(name = "购买时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "购买时间") @ApiModelProperty(value = "购买时间")
private Date buydate; private Date buydate;
/**经办人*/ /**
@Excel(name = "经办人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") * 经办人
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") */
@Excel(name = "经办人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@ApiModelProperty(value = "经办人") @ApiModelProperty(value = "经办人")
private String agent; private String agent;
/**存放位置*/ /**
@Excel(name = "存放位置", width = 15) * 存放位置
*/
@Excel(name = "存放位置", width = 15)
@ApiModelProperty(value = "存放位置") @ApiModelProperty(value = "存放位置")
@TableField(exist = false)
private String adress; private String adress;
/**设备状态*/ /**
@Excel(name = "设备状态", width = 15) * 设备状态
*/
@Excel(name = "设备状态", width = 15)
@ApiModelProperty(value = "设备状态") @ApiModelProperty(value = "设备状态")
private String status; private String status;
/**二维码*/ /**
@Excel(name = "二维码", width = 15) * 二维码
*/
@Excel(name = "二维码", width = 15)
@ApiModelProperty(value = "二维码") @ApiModelProperty(value = "二维码")
@TableField(exist = false)
private String erweima; private String erweima;
/**维护周期*/ /**
@Excel(name = "维护周期", width = 15) * 维护周期
*/
@Excel(name = "维护周期", width = 15)
@ApiModelProperty(value = "维护周期") @ApiModelProperty(value = "维护周期")
private String maintenancecycle; private String maintenancecycle;
/**管理人*/ /**
@Excel(name = "管理人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") * 管理人
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") */
@Excel(name = "管理人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@ApiModelProperty(value = "管理人") @ApiModelProperty(value = "管理人")
private String administrator; private String administrator;
/**上次维护时间*/ /**
@Excel(name = "上次维护时间", width = 15, format = "yyyy-MM-dd") * 上次维护时间
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") */
@DateTimeFormat(pattern="yyyy-MM-dd") @Excel(name = "上次维护时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "上次维护时间") @ApiModelProperty(value = "上次维护时间")
private Date maintenancedate; private Date maintenancedate;
/**3d模型*/ /**
@Excel(name = "3d模型", width = 15) * 3d模型
*/
@Excel(name = "3d模型", width = 15)
@ApiModelProperty(value = "3d模型") @ApiModelProperty(value = "3d模型")
private String img3d; private String img3d;
} }

13
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
Unescape View File

@ -4,7 +4,6 @@ package org.jeecg.modules.productplan.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.PageList; import com.baomidou.mybatisplus.core.metadata.PageList;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -19,7 +18,6 @@ import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.productplan.entity.ZyPlanProcess; import org.jeecg.modules.productplan.entity.ZyPlanProcess;
import org.jeecg.modules.productplan.entity.vo.ProcessDataVo; import org.jeecg.modules.productplan.entity.vo.ProcessDataVo;
import org.jeecg.modules.productplan.service.IZyPlanProcessService; import org.jeecg.modules.productplan.service.IZyPlanProcessService;
import org.jeecg.modules.team.entity.GroupxMember;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
@ -28,7 +26,9 @@ 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.LinkedList;
import java.util.List;
/** /**
* @Description: 生产计划工序 * @Description: 生产计划工序
@ -156,12 +156,15 @@ public class ZyPlanProcessController extends JeecgController<ZyPlanProcess, IZyP
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }
// @AutoLog(value = "生产计划工序-添加")
@ApiOperation(value = "计划工序管理-批量添加工序、工位、设备", notes = "计划工序管理-批量添加工序、工位、设备") @ApiOperation(value = "计划工序管理-批量添加工序、工位、设备", notes = "计划工序管理-批量添加工序、工位、设备")
@PostMapping(value = "/addProcessBatch") @PostMapping(value = "/addProcessBatch")
public Result<?> addProcessBatch(@RequestBody List<ZyPlanProcess> zyPlanProcessList) { public Result<?> addProcessBatch(@RequestBody List<ZyPlanProcess> zyPlanProcessList) {
if (!ObjectUtils.isEmpty(zyPlanProcessList)) {
zyPlanProcessService.remove(new LambdaQueryWrapper<ZyPlanProcess>()
.eq(ZyPlanProcess::getPlanId, zyPlanProcessList.get(0).getPlanId()));
zyPlanProcessService.saveBatch(zyPlanProcessList); zyPlanProcessService.saveBatch(zyPlanProcessList);
}
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }

9
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/vo/ProcessDataVo.java
Unescape View File

@ -3,9 +3,8 @@ package org.jeecg.modules.productplan.entity.vo;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.team.entity.GroupxMember; import org.jeecg.modules.team.entity.GroupxMember;
import org.jeecg.modules.team.entity.Station; import org.jeecg.modules.team.vo.StationVo;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
@ -21,6 +20,8 @@ public class ProcessDataVo implements Serializable {
//工单id //工单id
private String workOrderId; private String workOrderId;
private String planId;
//产品id //产品id
private String productId; private String productId;
private String productName; private String productName;
@ -31,13 +32,13 @@ public class ProcessDataVo implements Serializable {
private String departName; private String departName;
//工位 //工位
private List<Station> stationList; private List<StationVo> stationList;
//班组成员列表 //班组成员列表
private List<GroupxMember> groupMemberList; private List<GroupxMember> groupMemberList;
//产品工序id //产品工序id
// @Dict(dictTable ="zy_process",dicText = "process_name",dicCode = "id") // @Dict(dictTable ="zy_process",dicText = "process_name",dicCode = "id")
private String productProcessId; private String processId;
private String processName; private String processName;
} }

22
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
Unescape View File

@ -19,6 +19,7 @@ import org.jeecg.modules.team.entity.GroupxMember;
import org.jeecg.modules.team.entity.Station; import org.jeecg.modules.team.entity.Station;
import org.jeecg.modules.team.service.IGroupxMemberService; import org.jeecg.modules.team.service.IGroupxMemberService;
import org.jeecg.modules.team.service.IStationService; import org.jeecg.modules.team.service.IStationService;
import org.jeecg.modules.team.vo.StationVo;
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; import org.springframework.util.ObjectUtils;
@ -69,16 +70,29 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z
if (!ObjectUtils.isEmpty(productProcessesList)) { if (!ObjectUtils.isEmpty(productProcessesList)) {
SysDepart depart = iSysDepartService.getById(departId); SysDepart depart = iSysDepartService.getById(departId);
List<Station> stationList = iStationService.list(new LambdaQueryWrapper<Station>().eq(Station::getDepartId, departId)); List<Station> stationList = iStationService.list(new LambdaQueryWrapper<Station>().eq(Station::getDepartId, departId));
List<StationVo> stationVoList = new LinkedList<>();
if (!ObjectUtils.isEmpty(stationList)) {
stationList.forEach(en -> {
StationVo stationVo = new StationVo();
stationVo.setId(en.getId());
stationVo.setValue(en.getId());
stationVo.setText(en.getStationName());
stationVo.setTitle(en.getStationName());
stationVoList.add(stationVo);
});
}
productProcessesList.forEach(e -> { productProcessesList.forEach(e -> {
ProcessDataVo vo = new ProcessDataVo(); ProcessDataVo vo = new ProcessDataVo();
vo.setProductProcessId(e.getProcessId()); vo.setPlanId(planId);
vo.setProcessId(e.getProcessId());
vo.setProcessName(iZyProcessService.getById(e.getProcessId()).getProcessName()); vo.setProcessName(iZyProcessService.getById(e.getProcessId()).getProcessName());
vo.setProductId(e.getProductId()); vo.setProductId(e.getProductId());
vo.setProductName("产品名称"); vo.setProductName("产品名称");
vo.setWorkOrderId(productCode); vo.setWorkOrderId(productCode);
vo.setDepartId(departId); vo.setDepartId(departId);
vo.setDepartName(depart.getDepartName()); vo.setDepartName(depart.getDepartName());
vo.setStationList(stationList); vo.setStationList(stationVoList);
result.add(vo); result.add(vo);
}); });
} }
@ -106,8 +120,8 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z
List<GroupxMember> groupxMemberList = iGroupxMemberService.list(new LambdaQueryWrapper<GroupxMember>().eq(GroupxMember::getGroupxId, zyProductPlan.getTeamId())); List<GroupxMember> groupxMemberList = iGroupxMemberService.list(new LambdaQueryWrapper<GroupxMember>().eq(GroupxMember::getGroupxId, zyProductPlan.getTeamId()));
productProcessesList.forEach(e -> { productProcessesList.forEach(e -> {
ProcessDataVo vo = new ProcessDataVo(); ProcessDataVo vo = new ProcessDataVo();
// vo.setId() vo.setPlanId(planId);
vo.setProductProcessId(e.getProcessId()); vo.setProcessId(e.getProcessId());
vo.setProcessName(iZyProcessService.getById(e.getProcessId()).getProcessName()); vo.setProcessName(iZyProcessService.getById(e.getProcessId()).getProcessName());
vo.setProductId(e.getProductId()); vo.setProductId(e.getProductId());
// vo.setProductName("产品名称") // vo.setProductName("产品名称")

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

@ -1,5 +1,6 @@
package org.jeecg.modules.team.controller; package org.jeecg.modules.team.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -11,11 +12,15 @@ 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.device.entity.ZyDevice;
import org.jeecg.modules.device.service.IZyDeviceService;
import org.jeecg.modules.team.entity.StationMachine; import org.jeecg.modules.team.entity.StationMachine;
import org.jeecg.modules.team.entity.StationMachine; import org.jeecg.modules.team.entity.StationMachine;
import org.jeecg.modules.team.service.IStationMachineService; import org.jeecg.modules.team.service.IStationMachineService;
import org.jeecg.modules.team.vo.StationMachineVo;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
@ -39,6 +44,9 @@ public class StationMachineController extends JeecgController<StationMachine, IS
@Autowired @Autowired
private IStationMachineService stationMachineService; private IStationMachineService stationMachineService;
@Autowired
private IZyDeviceService iZyDeviceService;
/** /**
* 分页列表查询 * 分页列表查询
* *
@ -61,6 +69,26 @@ public class StationMachineController extends JeecgController<StationMachine, IS
return Result.OK(pageList); return Result.OK(pageList);
} }
@ApiOperation(value = "工序工具管理-分页列表查询", notes = "工序工具管理-分页列表查询")
@GetMapping(value = "/list2")
public Result<?> list2(StationMachine stationMachine,
HttpServletRequest req) {
List<StationMachineVo> voList = new LinkedList<>();
List<StationMachine> toolList = stationMachineService.list(new LambdaQueryWrapper<StationMachine>().eq(StationMachine::getStationId, stationMachine.getStationId()));
if (!ObjectUtils.isEmpty(toolList)) {
toolList.forEach(en -> {
StationMachineVo stationMachineVo = new StationMachineVo();
stationMachineVo.setId(en.getMachineId());
stationMachineVo.setValue(en.getMachineId());
ZyDevice zyDevice = iZyDeviceService.getById(en.getMachineId());
stationMachineVo.setText(zyDevice.getName());
stationMachineVo.setTitle(zyDevice.getName());
voList.add(stationMachineVo);
});
}
return Result.OK(voList);
}
/** /**
* 添加 * 添加
* *

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

@ -1,5 +1,6 @@
package org.jeecg.modules.team.controller; package org.jeecg.modules.team.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -12,10 +13,16 @@ 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.demo.tool.entity.ZyTool;
import org.jeecg.modules.demo.tool.service.IZyToolService;
import org.jeecg.modules.device.service.IZyDeviceService;
import org.jeecg.modules.team.entity.StationTool; import org.jeecg.modules.team.entity.StationTool;
import org.jeecg.modules.team.service.IStationToolService; import org.jeecg.modules.team.service.IStationToolService;
import org.jeecg.modules.team.vo.StationToolVo;
import org.jeecg.modules.team.vo.StationVo;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
@ -40,6 +47,9 @@ public class StationToolController extends JeecgController<StationTool, IStation
@Autowired @Autowired
private IStationToolService stationToolService; private IStationToolService stationToolService;
@Autowired
private IZyToolService iZyToolService;
/** /**
* 分页列表查询 * 分页列表查询
* *
@ -62,6 +72,31 @@ public class StationToolController extends JeecgController<StationTool, IStation
return Result.OK(pageList); return Result.OK(pageList);
} }
@ApiOperation(value = "工序工具管理-分页列表查询", notes = "工序工具管理-分页列表查询")
@GetMapping(value = "/list2")
public Result<?> list2(StationTool stationTool,
// @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
// @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
// QueryWrapper<StationTool> queryWrapper = QueryGenerator.initQueryWrapper(stationTool, req.getParameterMap());
// Page<StationTool> page = new Page<StationTool>(pageNo, pageSize);
// IPage<StationTool> pageList = stationToolService.page(page, queryWrapper);
List<StationToolVo> voList = new LinkedList<>();
List<StationTool> toolList = stationToolService.list(new LambdaQueryWrapper<StationTool>().eq(StationTool::getStationId, stationTool.getStationId()));
if(!ObjectUtils.isEmpty(toolList)){
toolList.forEach(en->{
StationToolVo stationVo = new StationToolVo();
stationVo.setId(en.getToolsId());
stationVo.setValue(en.getToolsId());
ZyTool zyTool = iZyToolService.getById(en.getToolsId());
stationVo.setText(zyTool.getName());
stationVo.setTitle(zyTool.getName());
voList.add(stationVo);
});
}
return Result.OK(voList);
}
/** /**
* 添加 * 添加
* *

2
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Station.java
Unescape View File

@ -87,7 +87,7 @@ public class Station {
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "设备id列表") @ApiModelProperty(value = "设备id列表")
@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") @Dict(dictTable = "zy_device", dicText = "name", dicCode = "id")
private String machineIds; private String machineIds;
/** /**
* 工具id列表 * 工具id列表

2
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationMachine.java
Unescape View File

@ -45,7 +45,7 @@ public class StationMachine {
*/ */
@Excel(name = "设备id，uuid，FK，设备表", width = 15) @Excel(name = "设备id，uuid，FK，设备表", width = 15)
@ApiModelProperty(value = "设备id，uuid，FK，设备表") @ApiModelProperty(value = "设备id，uuid，FK，设备表")
@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") @Dict(dictTable = "zy_device", dicText = "name", dicCode = "id")
private String machineId; private String machineId;
/** /**
* 创建日期 * 创建日期

16
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/vo/StationMachineVo.java
Unescape View File

@ -0,0 +1,16 @@
package org.jeecg.modules.team.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class StationMachineVo {
private String id;
private String value;
private String text;
private String title;
}

33
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/vo/StationToolVo.java
Unescape View File

@ -0,0 +1,33 @@
package org.jeecg.modules.team.vo;
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.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @Description: 工序工具管理
* @Author: jeecg-boot
* @Date: 2022-12-06
* @Version: V1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class StationToolVo {
private String id;
private String value;
private String text;
private String title;
}

16
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/vo/StationVo.java
Unescape View File

@ -0,0 +1,16 @@
package org.jeecg.modules.team.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class StationVo {
private String id;
private String value;
private String text;
private String title;
}
Write Preview
Loading…
Cancel
Save