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

2022-11-12 赵玉瑞 修改制衣模块部件及相关问题

Browse Source
zhc4dev
赵玉瑞 2 years ago
parent 540ea5ee73
commit 623ec80277
17 changed files with 601 additions and 430 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. 29
      ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
  2. 18
      ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
  3. 135
      ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
  4. 6
      ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
  5. 17
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
  6. 10
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue
  7. 12
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
  8. 19
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
  9. 11
      ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue
  10. 2
      ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
  11. 108
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
  12. 41
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java
  13. 30
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModular.java
  14. 16
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModularCompent.java
  15. 155
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
  16. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
  17. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java

29
ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
Unescape View File

@ -71,7 +71,12 @@
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a-dropdown> <a @click="handleDetail(record)">详情</a>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
<!-- <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>
@ -83,7 +88,7 @@
</a-popconfirm> </a-popconfirm>
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</a-dropdown> </a-dropdown>-->
</span> </span>
</a-table> </a-table>
@ -132,6 +137,12 @@
align:"center", align:"center",
dataIndex: 'partsName' dataIndex: 'partsName'
}, },
{
title:'部件类型',
align:"center",
dataIndex: 'componentType'
},
{ {
title:'描述', title:'描述',
align:"center", align:"center",
@ -148,11 +159,22 @@
align:"center", align:"center",
dataIndex: 'modularId_dictText' dataIndex: 'modularId_dictText'
}, },
{
title:'制衣模块类型',
align:"center",
dataIndex: 'modularType_dictText'
},
{ {
title:'企业', title:'企业',
align:"center", align:"center",
dataIndex: 'enterpriseId' dataIndex: 'enterpriseId_dictText'
}, },
{
title:'创建时间',
align:"center",
dataIndex: 'createTime'
},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
@ -189,6 +211,7 @@
let fieldList=[]; let fieldList=[];
fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''}) fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
fieldList.push({type:'string',value:'partsName',text:'部件名称',dictCode:''}) fieldList.push({type:'string',value:'partsName',text:'部件名称',dictCode:''})
fieldList.push({type:'string',value:'componentType',text:'部件类型',dictCode:''})
fieldList.push({type:'string',value:'description',text:'描述',dictCode:''}) fieldList.push({type:'string',value:'description',text:'描述',dictCode:''})
fieldList.push({type:'string',value:'pictureUrl',text:'图片地址',dictCode:''}) fieldList.push({type:'string',value:'pictureUrl',text:'图片地址',dictCode:''})
fieldList.push({type:'string',value:'modularId',text:'模块',dictCode:'zy_cloths_modular,modular_name,id'}) fieldList.push({type:'string',value:'modularId',text:'模块',dictCode:'zy_cloths_modular,modular_name,id'})

18
ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
Unescape View File

@ -71,7 +71,12 @@
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a-dropdown> <a @click="handleDetail(record)">详情</a>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
<!-- <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>
@ -83,7 +88,7 @@
</a-popconfirm> </a-popconfirm>
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</a-dropdown> </a-dropdown>-->
</span> </span>
</a-table> </a-table>
@ -127,20 +132,21 @@
dataIndex: 'nums' dataIndex: 'nums'
}, },
{ {
title:'部件名称', title:'制衣模块类型',
align:"center", align:"center",
dataIndex: 'partsName' dataIndex: 'modularType_dictText'
}, },
{ {
title:'制衣模块类型', title:'部件名称',
align:"center", align:"center",
dataIndex: 'modularType' dataIndex: 'partsName'
}, },
{ {
title:'部件id', title:'部件id',
align:"center", align:"center",
dataIndex: 'componentId' dataIndex: 'componentId'
}, },
{ {
title:'创建时间', title:'创建时间',
align:"center", align:"center",

135
ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
Unescape View File

@ -13,23 +13,31 @@
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('zy_cloths_modular')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('zy_cloths_modular')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<!-- 高级查询区域 --> <!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> <j-super-query :fieldList="superFieldList" ref="superQueryModal"
@handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> <a-menu-item key="1" @click="batchDel">
<a-icon type="delete"/>
删除
</a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button> <a-button style="margin-left: 8px"> 批量操作
<a-icon type="down"/>
</a-button>
</a-dropdown> </a-dropdown>
</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>
@ -52,7 +60,8 @@
</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="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>
@ -70,8 +79,14 @@
<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 @click="handleDetail(record)">详情</a>
<a-divider type="vertical"/>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
<!-- <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>
@ -83,7 +98,7 @@
</a-popconfirm> </a-popconfirm>
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</a-dropdown> </a-dropdown>-->
</span> </span>
</a-table> </a-table>
@ -95,71 +110,81 @@
<script> <script>
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 ZyClothsModularModal from './modules/ZyClothsModularModal' import ZyClothsModularModal from './modules/ZyClothsModularModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default { export default {
name: 'ZyClothsModularList', name: 'ZyClothsModularList',
mixins:[JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
components: { components: {
ZyClothsModularModal ZyClothsModularModal
}, },
data () { data() {
return { return {
description: 'zy_cloths_modular管理页面', description: '制衣模块 zy_cloths_modular管理页面',
// 表头 // 表头
columns: [ columns: [
{ {
title: '#', title: '#',
dataIndex: '', dataIndex: '',
key:'rowIndex', key: 'rowIndex',
width:60, width: 60,
align:"center", align: "center",
customRender:function (t,r,index) { customRender: function (t, r, index) {
return parseInt(index)+1; return parseInt(index) + 1;
} }
}, },
{ {
title:'编号', title: '编号',
align:"center", align: "center",
dataIndex: 'nums' dataIndex: 'nums'
}, },
{ {
title:'模块名称', title: '模块名称',
align:"center", align: "center",
dataIndex: 'modularName' dataIndex: 'modularName'
}, },
{ {
title:'描述', title: '制衣模块类型',
align:"center", align: "center",
dataIndex: 'modularType_dictText'
},
{
title: '描述',
align: "center",
dataIndex: 'description' dataIndex: 'description'
}, },
{ {
title:'衣服类型', title: '衣服类型',
align:"center", align: "center",
dataIndex: 'clothsTypeId_dictText' dataIndex: 'clothsTypeId_dictText'
}, },
{ {
title:'企业', title: '企业',
align:"center", align: "center",
dataIndex: 'enterpriseId' dataIndex: 'enterpriseId_dictText'
}, },
{ {
title:'图片地址', title: '图片地址',
align:"center", align: "center",
dataIndex: 'pictureUrl', dataIndex: 'pictureUrl',
scopedSlots: {customRender: 'imgSlot'} scopedSlots: {customRender: 'imgSlot'}
}, },
{
title: '创建时间',
align: "center",
dataIndex: 'createTime'
},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
align:"center", align: "center",
fixed:"right", fixed: "right",
width:147, width: 147,
scopedSlots: { customRender: 'action' } scopedSlots: {customRender: 'action'}
} }
], ],
url: { url: {
@ -170,34 +195,34 @@
importExcelUrl: "base/zyClothsModular/importExcel", importExcelUrl: "base/zyClothsModular/importExcel",
}, },
dictOptions:{}, dictOptions: {},
superFieldList:[], superFieldList: [],
} }
}, },
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: {
initDictConfig(){ initDictConfig() {
}, },
getSuperFieldList(){ getSuperFieldList() {
let fieldList=[]; let fieldList = [];
fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''}) fieldList.push({type: 'string', value: 'nums', text: '编号', dictCode: ''})
fieldList.push({type:'string',value:'modularName',text:'模块名称',dictCode:''}) fieldList.push({type: 'string', value: 'modularName', text: '模块名称', dictCode: ''})
fieldList.push({type:'string',value:'description',text:'描述',dictCode:''}) fieldList.push({type: 'string', value: 'description', text: '描述', dictCode: ''})
fieldList.push({type:'string',value:'clothsTypeId',text:'衣服类型',dictCode:'zy_cloths_type,type_name,id'}) fieldList.push({type: 'string', value: 'clothsTypeId', text: '衣服类型', dictCode: 'zy_cloths_type,type_name,id'})
fieldList.push({type:'string',value:'enterpriseId',text:'企业',dictCode:''}) fieldList.push({type: 'string', value: 'enterpriseId', text: '企业', dictCode: ''})
fieldList.push({type:'string',value:'pictureUrl',text:'图片地址',dictCode:''}) fieldList.push({type: 'string', value: 'pictureUrl', text: '图片地址', dictCode: ''})
this.superFieldList = fieldList this.superFieldList = fieldList
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
</style> </style>

6
ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
Unescape View File

@ -267,6 +267,12 @@ export default {
align: "center", align: "center",
dataIndex: 'totalMachine' dataIndex: 'totalMachine'
}, },
// {
// title: '企业名称',
// align: "center",
// dataIndex: 'enterpriseId_dictText'
// },
{ {
title: '创建时间', title: '创建时间',
align: "center", align: "center",

17
ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
Unescape View File

@ -13,6 +13,11 @@
<a-input v-model="model.partsName" placeholder="请输入部件名称" ></a-input> <a-input v-model="model.partsName" placeholder="请输入部件名称" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24">
<a-form-model-item label="部件类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="componentType">
<a-input v-model="model.componentType" placeholder="请输入部件类型" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description"> <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
<a-input v-model="model.description" placeholder="请输入描述" ></a-input> <a-input v-model="model.description" placeholder="请输入描述" ></a-input>
@ -28,9 +33,19 @@
<j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" /> <j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24">
<a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">
<j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">-->
<!-- <a-input v-model="model.enterpriseId" placeholder="请输入企业" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId"> <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
<a-input v-model="model.enterpriseId" placeholder="请输入企业" ></a-input> <j-select-depart v-model="model.enterpriseId" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>

10
ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue
Unescape View File

@ -8,16 +8,22 @@
<a-input v-model="model.nums" placeholder="请输入编码" ></a-input> <a-input v-model="model.nums" placeholder="请输入编码" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24">
<a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">
<j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />
</a-form-model-item>
</a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName"> <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">
<a-input v-model="model.partsName" placeholder="请输入部件名称" ></a-input> <a-input v-model="model.partsName" placeholder="请输入部件名称" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <!-- <a-col :span="24">
<a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType"> <a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">
<a-input v-model="model.modularType" placeholder="请输入制衣模块类型" ></a-input> <a-input v-model="model.modularType" placeholder="请输入制衣模块类型" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="部件id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="componentId"> <a-form-model-item label="部件id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="componentId">
<a-input v-model="model.componentId" placeholder="请输入部件id" ></a-input> <a-input v-model="model.componentId" placeholder="请输入部件id" ></a-input>

12
ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
Unescape View File

@ -13,6 +13,11 @@
<a-input v-model="model.modularName" placeholder="请输入模块名称" ></a-input> <a-input v-model="model.modularName" placeholder="请输入模块名称" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24">
<a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">
<j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />
</a-form-model-item>
</a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description"> <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
<a-input v-model="model.description" placeholder="请输入描述" ></a-input> <a-input v-model="model.description" placeholder="请输入描述" ></a-input>
@ -23,9 +28,14 @@
<j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" /> <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">-->
<!-- <a-input v-model="model.enterpriseId" placeholder="请输入企业" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId"> <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
<a-input v-model="model.enterpriseId" placeholder="请输入企业" ></a-input> <j-select-depart v-model="model.enterpriseId" placeholder="请选择企业"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">

19
ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
Unescape View File

@ -112,10 +112,15 @@
<!-- <a-form-model-item label="是否为瓶颈工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isBottleneck">--> <!-- <a-form-model-item label="是否为瓶颈工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isBottleneck">-->
<!-- <a-input-number v-model="model.isBottleneck" placeholder="请输入是否为瓶颈工序" style="width: 100%" />--> <!-- <a-input-number v-model="model.isBottleneck" placeholder="请输入是否为瓶颈工序" style="width: 100%" />-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="企业名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">-->
<!-- <a-input v-model="model.enterpriseId" placeholder="请输入企业名称" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>--> <!-- </a-col>-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="企业名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId"> <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
<a-input v-model="model.enterpriseId" placeholder="请输入企业名称" ></a-input> <j-select-depart v-model="model.enterpriseId" placeholder="请输入企业名称" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<!-- <a-col :span="24">--> <!-- <a-col :span="24">-->
@ -128,11 +133,11 @@
<!-- <a-input v-model="model.styleId" placeholder="请输入款式名称" ></a-input>--> <!-- <a-input v-model="model.styleId" placeholder="请输入款式名称" ></a-input>-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </a-col>--> <!-- </a-col>-->
<a-col :span="24"> <!-- <a-col :span="24">-->
<a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId"> <!-- <a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId">-->
<j-dict-select-tag v-model="model.styleId" placeholder="请输入款式名称" dictCode="zy_cloths_style,style_names,id" /> <!-- <j-dict-select-tag v-model="model.styleId" placeholder="请输入款式名称" dictCode="zy_cloths_style,style_names,id" />-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="工段代码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="worksectionCode"> <a-form-model-item label="工段代码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="worksectionCode">
<a-input v-model="model.worksectionCode" placeholder="请输入工段代码" ></a-input> <a-input v-model="model.worksectionCode" placeholder="请输入工段代码" ></a-input>

11
ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue
Unescape View File

@ -180,12 +180,21 @@
align:"center", align:"center",
dataIndex: 'shape_dictText' dataIndex: 'shape_dictText'
}, },
{ {
title:'企业', title:'企业',
align:"center", align:"center",
dataIndex: 'enterpriseId_dictText' dataIndex: 'enterpriseId_dictText'
}, },
// {
// title:'折叠搭配及包装',
// align:"center",
// dataIndex: 'foldingPackaging_dictText'
// },
// {
// title:'缝纫形式',
// align:"center",
// dataIndex: 'sewingForm_dictText'
// },
{ {
title:'创建时间', title:'创建时间',
align:"center", align:"center",

2
ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
Unescape View File

@ -94,7 +94,7 @@
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="缝纫形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sewingForm"> <a-form-model-item label="缝纫形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sewingForm">
<j-dict-select-tag v-model="model.sewingForm" placeholder="请输入缝纫形式" dict-code="sewingForm"/> <j-dict-select-tag v-model="model.sewingForm" placeholder="请选择缝纫形式" dict-code="sewingForm"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">

108
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
Unescape View File

@ -1,52 +1,35 @@
package org.jeecg.modules.demo.base.controller; package org.jeecg.modules.demo.base.controller;
import java.util.Arrays; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.Map; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.stream.Collectors; import io.swagger.annotations.Api;
import java.io.IOException; import io.swagger.annotations.ApiOperation;
import java.io.UnsupportedEncodingException; import lombok.extern.slf4j.Slf4j;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.base.entity.ZyClothsComponent; import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
import org.jeecg.modules.demo.base.entity.ZyClothsModular;
import org.jeecg.modules.demo.base.entity.ZyClothsType;
import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo; import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo;
import org.jeecg.modules.demo.base.service.IZyClothsComponentService; import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.base.service.IZyClothsModularService; import org.jeecg.modules.demo.base.service.IZyClothsModularService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/** import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/**
* @Description: zy_cloths_component * @Description: zy_cloths_component
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2021-11-10 * @Date: 2021-11-10
* @Version: V1.0 * @Version: V1.0
*/ */
@Api(tags="zy_cloths_component") @Api(tags = "zy_cloths_component")
@RestController @RestController
@RequestMapping("/base/zyClothsComponent") @RequestMapping("/base/zyClothsComponent")
@Slf4j @Slf4j
@ -66,11 +49,11 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
* @return * @return
*/ */
@AutoLog(value = "zy_cloths_component-分页列表查询") @AutoLog(value = "zy_cloths_component-分页列表查询")
@ApiOperation(value="zy_cloths_component-分页列表查询", notes="zy_cloths_component-分页列表查询") @ApiOperation(value = "zy_cloths_component-分页列表查询", notes = "zy_cloths_component-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<?> queryPageList(ZyClothsComponent zyClothsComponent, public Result<?> queryPageList(ZyClothsComponent zyClothsComponent,
@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<ZyClothsComponent> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsComponent, req.getParameterMap()); QueryWrapper<ZyClothsComponent> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsComponent, req.getParameterMap());
Page<ZyClothsComponent> page = new Page<ZyClothsComponent>(pageNo, pageSize); Page<ZyClothsComponent> page = new Page<ZyClothsComponent>(pageNo, pageSize);
@ -78,22 +61,23 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
return Result.OK(pageList); return Result.OK(pageList);
} }
@AutoLog(value = "zy_cloths_component-查询所有") // @AutoLog(value = "zy_cloths_component-查询所有")
@ApiOperation(value="zy_cloths_component-查询所有", notes="zy_cloths_component-查询所有") // @ApiOperation(value="zy_cloths_component-查询所有", notes="zy_cloths_component-查询所有")
@GetMapping(value = "/findAll") // @GetMapping(value = "/findAll")
public Result<?> findAll() { // public Result<?> findAll() {
List<ZyClothsComponent> list = zyClothsComponentService.list(); // List<ZyClothsComponent> list = zyClothsComponentService.list();
//
// for(ZyClothsComponent zycl : list){
// String id = zycl.getModularId();
// String enterpriseId = zycl.getEnterpriseId();
// if(id!=null && enterpriseId !=null){
// ZyClothsModular byId = zyClothsModularService.getById(id);
// zycl.setModularId(byId.getModularName());
// }
// }
// return Result.OK(list);
// }
for(ZyClothsComponent zycl : list){
String id = zycl.getModularId();
String enterpriseId = zycl.getEnterpriseId();
if(id!=null && enterpriseId !=null){
ZyClothsModular byId = zyClothsModularService.getById(id);
zycl.setModularId(byId.getModularName());
}
}
return Result.OK(list);
}
/** /**
* 添加 * 添加
* *
@ -101,7 +85,7 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
* @return * @return
*/ */
@AutoLog(value = "zy_cloths_component-添加") @AutoLog(value = "zy_cloths_component-添加")
@ApiOperation(value="zy_cloths_component-添加", notes="zy_cloths_component-添加") @ApiOperation(value = "zy_cloths_component-添加", notes = "zy_cloths_component-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyClothsComponent zyClothsComponent) { public Result<?> add(@RequestBody ZyClothsComponent zyClothsComponent) {
zyClothsComponentService.save(zyClothsComponent); zyClothsComponentService.save(zyClothsComponent);
@ -115,7 +99,7 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
* @return * @return
*/ */
@AutoLog(value = "zy_cloths_component-编辑") @AutoLog(value = "zy_cloths_component-编辑")
@ApiOperation(value="zy_cloths_component-编辑", notes="zy_cloths_component-编辑") @ApiOperation(value = "zy_cloths_component-编辑", notes = "zy_cloths_component-编辑")
@PutMapping(value = "/edit") @PutMapping(value = "/edit")
public Result<?> edit(@RequestBody ZyClothsComponent zyClothsComponent) { public Result<?> edit(@RequestBody ZyClothsComponent zyClothsComponent) {
zyClothsComponentService.updateById(zyClothsComponent); zyClothsComponentService.updateById(zyClothsComponent);
@ -129,9 +113,9 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
* @return * @return
*/ */
@AutoLog(value = "zy_cloths_component-通过id删除") @AutoLog(value = "zy_cloths_component-通过id删除")
@ApiOperation(value="zy_cloths_component-通过id删除", notes="zy_cloths_component-通过id删除") @ApiOperation(value = "zy_cloths_component-通过id删除", notes = "zy_cloths_component-通过id删除")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) { public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
zyClothsComponentService.removeById(id); zyClothsComponentService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
@ -143,9 +127,9 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
* @return * @return
*/ */
@AutoLog(value = "zy_cloths_component-批量删除") @AutoLog(value = "zy_cloths_component-批量删除")
@ApiOperation(value="zy_cloths_component-批量删除", notes="zy_cloths_component-批量删除") @ApiOperation(value = "zy_cloths_component-批量删除", notes = "zy_cloths_component-批量删除")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.zyClothsComponentService.removeByIds(Arrays.asList(ids.split(","))); this.zyClothsComponentService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
@ -157,16 +141,16 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
* @return * @return
*/ */
@AutoLog(value = "zy_cloths_component-通过id查询") @AutoLog(value = "zy_cloths_component-通过id查询")
@ApiOperation(value="zy_cloths_component-通过id查询", notes="zy_cloths_component-通过id查询") @ApiOperation(value = "zy_cloths_component-通过id查询", notes = "zy_cloths_component-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) { public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
QueryWrapper<ZyClothsComponent> zyClothsComponentQueryWrapper=new QueryWrapper<>(); QueryWrapper<ZyClothsComponent> zyClothsComponentQueryWrapper = new QueryWrapper<>();
zyClothsComponentQueryWrapper.eq("nums",id); zyClothsComponentQueryWrapper.eq("nums", id);
ZyClothsComponent zyClothsComponent = zyClothsComponentService.getOne(zyClothsComponentQueryWrapper); ZyClothsComponent zyClothsComponent = zyClothsComponentService.getOne(zyClothsComponentQueryWrapper);
List<ZyProcessVo> zyProcessVoList = zyClothsComponentService.selectList(id); List<ZyProcessVo> zyProcessVoList = zyClothsComponentService.selectList(id);
if (zyProcessVoList!=null) if (zyProcessVoList != null)
zyClothsComponent.setZyProcessVoList(zyProcessVoList); zyClothsComponent.setZyProcessVoList(zyProcessVoList);
if(zyClothsComponent==null) { if (zyClothsComponent == null) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
return Result.OK(zyClothsComponent); return Result.OK(zyClothsComponent);

41
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java
Unescape View File

@ -1,25 +1,22 @@
package org.jeecg.modules.demo.base.entity; package org.jeecg.modules.demo.base.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; 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 com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
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.demo.base.entity.vo.ZyProcessVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.List;
/** /**
* @Description: zy_cloths_component * @Description: zy_cloths_component
@ -60,20 +57,34 @@ public class ZyClothsComponent implements Serializable {
@Dict(dictTable = "zy_cloths_modular", dicText = "modular_name", dicCode = "id") @Dict(dictTable = "zy_cloths_modular", dicText = "modular_name", dicCode = "id")
@ApiModelProperty(value = "模块") @ApiModelProperty(value = "模块")
private java.lang.String modularId; private java.lang.String modularId;
/**制衣模块类型*/
@Excel(name = "制衣模块类型", width = 15)
@ApiModelProperty(value = "制衣模块类型")
@Dict(dicCode = "zyModularType")
private java.lang.String modularType;
/**部件类型*/
@Excel(name = "部件类型", width = 15)
@ApiModelProperty(value = "部件类型")
private java.lang.String componentType;
/**企业*/ /**企业*/
@Excel(name = "企业", width = 15) @Excel(name = "企业", width = 15)
@ApiModelProperty(value = "企业") @ApiModelProperty(value = "企业")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private java.lang.String enterpriseId; private java.lang.String enterpriseId;
/**createTime*/ /**createTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "createTime") @ApiModelProperty(value = "createTime")
private java.util.Date createTime; private java.util.Date createTime;
/**updateTime*/ /**updateTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime") @ApiModelProperty(value = "updateTime")
private java.util.Date updateTime; private java.util.Date updateTime;
@TableField(exist = false) @TableField(exist = false)
private List<ZyProcessVo> zyProcessVoList; private List<ZyProcessVo> zyProcessVoList;
} }

30
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModular.java
Unescape View File

@ -1,21 +1,19 @@
package org.jeecg.modules.demo.base.entity; package org.jeecg.modules.demo.base.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
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 com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
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.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/** /**
* @Description: zy_cloths_modular * @Description: zy_cloths_modular
@ -43,6 +41,13 @@ public class ZyClothsModular implements Serializable {
@Excel(name = "模块名称", width = 15) @Excel(name = "模块名称", width = 15)
@ApiModelProperty(value = "模块名称") @ApiModelProperty(value = "模块名称")
private java.lang.String modularName; private java.lang.String modularName;
/**制衣模块类型*/
@Excel(name = "制衣模块类型", width = 15)
@ApiModelProperty(value = "制衣模块类型")
@Dict(dicCode = "zyModularType")
private java.lang.String modularType;
/**描述*/ /**描述*/
@Excel(name = "描述", width = 15) @Excel(name = "描述", width = 15)
@ApiModelProperty(value = "描述") @ApiModelProperty(value = "描述")
@ -55,19 +60,20 @@ public class ZyClothsModular implements Serializable {
/**企业*/ /**企业*/
@Excel(name = "企业", width = 15) @Excel(name = "企业", width = 15)
@ApiModelProperty(value = "企业") @ApiModelProperty(value = "企业")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private java.lang.String enterpriseId; private java.lang.String enterpriseId;
/**图片地址*/ /**图片地址*/
@Excel(name = "图片地址", width = 15) @Excel(name = "图片地址", width = 15)
@ApiModelProperty(value = "图片地址") @ApiModelProperty(value = "图片地址")
private java.lang.String pictureUrl; private java.lang.String pictureUrl;
/**createTime*/ /**createTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "createTime") @ApiModelProperty(value = "createTime")
private java.util.Date createTime; private java.util.Date createTime;
/**updateTime*/ /**updateTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime") @ApiModelProperty(value = "updateTime")
private java.util.Date updateTime; private java.util.Date updateTime;
} }

16
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModularCompent.java
Unescape View File

@ -1,21 +1,20 @@
package org.jeecg.modules.demo.base.entity; package org.jeecg.modules.demo.base.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
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 com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
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.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/** /**
* @Description: 制衣模块部件中间表 * @Description: 制衣模块部件中间表
@ -65,6 +64,7 @@ public class ZyClothsModularCompent implements Serializable {
/**制衣模块类型*/ /**制衣模块类型*/
@Excel(name = "制衣模块类型", width = 15) @Excel(name = "制衣模块类型", width = 15)
@ApiModelProperty(value = "制衣模块类型") @ApiModelProperty(value = "制衣模块类型")
@Dict(dicCode = "zyModularType")
private String modularType; private String modularType;
/**部件id*/ /**部件id*/
@Excel(name = "部件id", width = 15) @Excel(name = "部件id", width = 15)

155
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
Unescape View File

@ -1,25 +1,22 @@
package org.jeecg.modules.demo.base.entity; package org.jeecg.modules.demo.base.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; 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 com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.modules.demo.base.entity.vo.ZyClothActionVo;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
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.demo.base.entity.vo.ZyClothActionVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.List;
/** /**
* @Description: zy_process * @Description: zy_process
@ -31,43 +28,61 @@ import lombok.experimental.Accessors;
@TableName("zy_process") @TableName("zy_process")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="zy_process对象", description="zy_process") @ApiModel(value = "zy_process对象", description = "zy_process")
public class ZyProcess implements Serializable { public class ZyProcess implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**工序表id*/ /**
* 工序表id
*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "工序表id") @ApiModelProperty(value = "工序表id")
private java.lang.String id; private java.lang.String id;
/**工序代码*/ /**
* 工序代码
*/
@Excel(name = "工序代码", width = 15) @Excel(name = "工序代码", width = 15)
@ApiModelProperty(value = "工序代码") @ApiModelProperty(value = "工序代码")
private java.lang.String processCode; private java.lang.String processCode;
/**工序名称*/ /**
* 工序名称
*/
@Excel(name = "工序名称", width = 15) @Excel(name = "工序名称", width = 15)
@ApiModelProperty(value = "工序名称") @ApiModelProperty(value = "工序名称")
private java.lang.String processName; private java.lang.String processName;
/**工艺描述*/ /**
* 工艺描述
*/
@Excel(name = "工艺描述", width = 15) @Excel(name = "工艺描述", width = 15)
@ApiModelProperty(value = "工艺描述") @ApiModelProperty(value = "工艺描述")
private java.lang.String processDescribe; private java.lang.String processDescribe;
/**做工说明*/ /**
* 做工说明
*/
@Excel(name = "做工说明", width = 15) @Excel(name = "做工说明", width = 15)
@ApiModelProperty(value = "做工说明") @ApiModelProperty(value = "做工说明")
private java.lang.String mkExplain; private java.lang.String mkExplain;
/**品质要求*/ /**
* 品质要求
*/
@Excel(name = "品质要求", width = 15) @Excel(name = "品质要求", width = 15)
@ApiModelProperty(value = "品质要求") @ApiModelProperty(value = "品质要求")
private java.lang.String qualityRequire; private java.lang.String qualityRequire;
/**工序时间*/ /**
* 工序时间
*/
@Excel(name = "工序时间", width = 15) @Excel(name = "工序时间", width = 15)
@ApiModelProperty(value = "工序时间") @ApiModelProperty(value = "工序时间")
private java.lang.String processTime; private java.lang.String processTime;
/**工序单价*/ /**
* 工序单价
*/
@Excel(name = "工序单价", width = 15) @Excel(name = "工序单价", width = 15)
@ApiModelProperty(value = "工序单价") @ApiModelProperty(value = "工序单价")
private java.lang.Double price; private java.lang.Double price;
/**工序等级*/ /**
* 工序等级
*/
@Excel(name = "工序等级", width = 15) @Excel(name = "工序等级", width = 15)
@ApiModelProperty(value = "工序等级") @ApiModelProperty(value = "工序等级")
private java.lang.String grade; private java.lang.String grade;
@ -79,7 +94,9 @@ public class ZyProcess implements Serializable {
// @Excel(name = "面料等级", width = 15) // @Excel(name = "面料等级", width = 15)
// @ApiModelProperty(value = "面料等级") // @ApiModelProperty(value = "面料等级")
// private java.lang.String fabricGrade; // private java.lang.String fabricGrade;
/**针距（针/厘米）*/ /**
* 针距（针/厘米）
*/
@Excel(name = "针距（针/厘米）", width = 15) @Excel(name = "针距（针/厘米）", width = 15)
@ApiModelProperty(value = "针距（针/厘米）") @ApiModelProperty(value = "针距（针/厘米）")
private java.lang.Integer needlePitch; private java.lang.Integer needlePitch;
@ -88,35 +105,51 @@ public class ZyProcess implements Serializable {
// @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") // @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
// @ApiModelProperty(value = "机器名") // @ApiModelProperty(value = "机器名")
// private java.lang.String machineId; // private java.lang.String machineId;
/**手工宽放*/ /**
* 手工宽放
*/
@Excel(name = "手工宽放", width = 15) @Excel(name = "手工宽放", width = 15)
@ApiModelProperty(value = "手工宽放") @ApiModelProperty(value = "手工宽放")
private java.lang.String manualWide; private java.lang.String manualWide;
/**手工时间*/ /**
* 手工时间
*/
@Excel(name = "手工时间", width = 15) @Excel(name = "手工时间", width = 15)
@ApiModelProperty(value = "手工时间") @ApiModelProperty(value = "手工时间")
private java.lang.Double manualTime; private java.lang.Double manualTime;
/**机器转速*/ /**
* 机器转速
*/
@Excel(name = "机器转速", width = 15) @Excel(name = "机器转速", width = 15)
@ApiModelProperty(value = "机器转速") @ApiModelProperty(value = "机器转速")
private java.lang.Integer machineSpeed; private java.lang.Integer machineSpeed;
/**机器宽放*/ /**
* 机器宽放
*/
@Excel(name = "机器宽放", width = 15) @Excel(name = "机器宽放", width = 15)
@ApiModelProperty(value = "机器宽放") @ApiModelProperty(value = "机器宽放")
private java.lang.String machineWide; private java.lang.String machineWide;
/**机器时间*/ /**
* 机器时间
*/
@Excel(name = "机器时间", width = 15) @Excel(name = "机器时间", width = 15)
@ApiModelProperty(value = "机器时间") @ApiModelProperty(value = "机器时间")
private java.lang.Double machineTime; private java.lang.Double machineTime;
/**机器浮于*/ /**
* 机器浮于
*/
@Excel(name = "机器浮于", width = 15) @Excel(name = "机器浮于", width = 15)
@ApiModelProperty(value = "机器浮于") @ApiModelProperty(value = "机器浮于")
private java.lang.String machineFloat; private java.lang.String machineFloat;
/**绑包宽放*/ /**
* 绑包宽放
*/
@Excel(name = "绑包宽放", width = 15) @Excel(name = "绑包宽放", width = 15)
@ApiModelProperty(value = "绑包宽放") @ApiModelProperty(value = "绑包宽放")
private java.lang.String bundleWide; private java.lang.String bundleWide;
/**绑包时间*/ /**
* 绑包时间
*/
@Excel(name = "绑包时间", width = 15) @Excel(name = "绑包时间", width = 15)
@ApiModelProperty(value = "绑包时间") @ApiModelProperty(value = "绑包时间")
private java.lang.String bundleTime; private java.lang.String bundleTime;
@ -129,21 +162,28 @@ public class ZyProcess implements Serializable {
// @Excel(name = "是否为瓶颈工序", width = 15) // @Excel(name = "是否为瓶颈工序", width = 15)
// @ApiModelProperty(value = "是否为瓶颈工序") // @ApiModelProperty(value = "是否为瓶颈工序")
// private java.lang.Integer isBottleneck; // private java.lang.Integer isBottleneck;
/**企业名称*/ /**
* 企业名称
*/
@Excel(name = "企业名称", width = 15) @Excel(name = "企业名称", width = 15)
@ApiModelProperty(value = "企业名称") @ApiModelProperty(value = "企业名称")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private java.lang.String enterpriseId; private java.lang.String enterpriseId;
/**工具名称*/ /**工具名称*/
// @Excel(name = "工具名称", width = 15, dictTable = "zy_tool", dicText = "name", dicCode = "id") // @Excel(name = "工具名称", width = 15, dictTable = "zy_tool", dicText = "name", dicCode = "id")
// @Dict(dictTable = "zy_tool", dicText = "name", dicCode = "id") // @Dict(dictTable = "zy_tool", dicText = "name", dicCode = "id")
// @ApiModelProperty(value = "工具名称") // @ApiModelProperty(value = "工具名称")
// private java.lang.String toolId; // private java.lang.String toolId;
/**款式名称*/ /**
* 款式名称
*/
@Excel(name = "款式名称", width = 15) @Excel(name = "款式名称", width = 15)
@ApiModelProperty(value = "款式名称") @ApiModelProperty(value = "款式名称")
@Dict(dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id") @Dict(dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id")
private java.lang.String styleId; private java.lang.String styleId;
/**工段代码*/ /**
* 工段代码
*/
@Excel(name = "工段代码", width = 15) @Excel(name = "工段代码", width = 15)
@ApiModelProperty(value = "工段代码") @ApiModelProperty(value = "工段代码")
private java.lang.String worksectionCode; private java.lang.String worksectionCode;
@ -151,49 +191,70 @@ public class ZyProcess implements Serializable {
// @Excel(name = "合同号", width = 15) // @Excel(name = "合同号", width = 15)
// @ApiModelProperty(value = "合同号") // @ApiModelProperty(value = "合同号")
// private java.lang.String contractNum; // private java.lang.String contractNum;
/**合计（手工TMU）*/ /**
* 合计（手工TMU）
*/
@Excel(name = "合计（手工TMU）", width = 15) @Excel(name = "合计（手工TMU）", width = 15)
@ApiModelProperty(value = "合计（手工TMU）") @ApiModelProperty(value = "合计（手工TMU）")
private java.lang.Integer totalManualTmu; private java.lang.Integer totalManualTmu;
/**合计（机器TMU）*/ /**
* 合计（机器TMU）
*/
@Excel(name = "合计（机器TMU）", width = 15) @Excel(name = "合计（机器TMU）", width = 15)
@ApiModelProperty(value = "合计（机器TMU）") @ApiModelProperty(value = "合计（机器TMU）")
private java.lang.Integer totalMachineTmu; private java.lang.Integer totalMachineTmu;
/**合计（手工秒）*/ /**
* 合计（手工秒）
*/
@Excel(name = "合计（手工秒）", width = 15) @Excel(name = "合计（手工秒）", width = 15)
@ApiModelProperty(value = "合计（手工秒）") @ApiModelProperty(value = "合计（手工秒）")
private java.lang.Integer totalMaunal; private java.lang.Integer totalMaunal;
/**合计（机器秒）*/ /**
* 合计（机器秒）
*/
@Excel(name = "合计（机器秒）", width = 15) @Excel(name = "合计（机器秒）", width = 15)
@ApiModelProperty(value = "合计（机器秒）") @ApiModelProperty(value = "合计（机器秒）")
private java.lang.Integer totalMachine; private java.lang.Integer totalMachine;
/**图片*/ /**
* 图片
*/
@Excel(name = "图片", width = 15) @Excel(name = "图片", width = 15)
@ApiModelProperty(value = "图片") @ApiModelProperty(value = "图片")
private java.lang.String image; private java.lang.String image;
/**视频*/ /**
* 视频
*/
@Excel(name = "视频", width = 15) @Excel(name = "视频", width = 15)
@ApiModelProperty(value = "视频") @ApiModelProperty(value = "视频")
private java.lang.String vedio; private java.lang.String vedio;
@TableField(exist = false) @TableField(exist = false)
private List<ZyClothActionVo> zyClothAction; private List<ZyClothActionVo> zyClothAction;
/**创建人*/ /**
* 创建人
*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private java.lang.String createBy; private java.lang.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 java.util.Date createTime; private java.util.Date createTime;
/**更新人*/ /**
* 更新人
*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private java.lang.String updateBy; private java.lang.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 java.util.Date updateTime; private java.util.Date updateTime;
@Excel(name = "工序类型", width = 15) @Excel(name = "工序类型", width = 15)
@ApiModelProperty(value = "工序类型") @ApiModelProperty(value = "工序类型")
private int processType; private int processType;

2
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
Unescape View File

@ -11,11 +11,13 @@ import java.util.Objects;
/** /**
* <p> * <p>
* 部门表 存储树结构数据的实体类 * 部门表 存储树结构数据的实体类
* sys_depart
* <p> * <p>
* *
* @Author Steve * @Author Steve
* @Since 2019-01-22 * @Since 2019-01-22
*/ */
public class SysDepartTreeModel implements Serializable{ public class SysDepartTreeModel implements Serializable{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

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

@ -100,6 +100,7 @@ public class ZyClothsStyle implements Serializable {
/**折叠搭配及包装*/ /**折叠搭配及包装*/
@Excel(name = "折叠搭配及包装", width = 15) @Excel(name = "折叠搭配及包装", width = 15)
@ApiModelProperty(value = "折叠搭配及包装") @ApiModelProperty(value = "折叠搭配及包装")
@Dict(dicCode = "foldingPackaging")
private String foldingPackaging; private String foldingPackaging;
/**配件及标志*/ /**配件及标志*/
@Excel(name = "配件及标志", width = 15) @Excel(name = "配件及标志", width = 15)
@ -108,6 +109,7 @@ public class ZyClothsStyle implements Serializable {
/**缝纫形式*/ /**缝纫形式*/
@Excel(name = "缝纫形式", width = 15) @Excel(name = "缝纫形式", width = 15)
@ApiModelProperty(value = "缝纫形式") @ApiModelProperty(value = "缝纫形式")
@Dict(dicCode = "sewingForm")
private String sewingForm; private String sewingForm;
/**企业id*/ /**企业id*/
@Excel(name = "企业id", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @Excel(name = "企业id", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")

Write Preview
Loading…
Cancel
Save