修改产品管理部分问题

zhc4dev
赵玉瑞 2 years ago
parent 35e868ae14
commit 3a9948373a
  1. 16
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
  2. 17
      ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue
  3. 160
      ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccListDetail.vue
  4. 13
      ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue
  5. 174
      ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricListDetail.vue
  6. 9
      ant-design-vue-jeecg/src/views/zystylemodel/ZyStyleModelList.vue
  7. 221
      ant-design-vue-jeecg/src/views/zystylemodel/modules/ZyStyleModelListDetails.vue
  8. 31
      ant-design-vue-jeecg/src/views/zystylemodular/ZyStyleModularList.vue
  9. 26
      ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue
  10. 155
      ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularListDetails.vue
  11. 38
      ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue
  12. 22
      ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue
  13. 172
      ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleListDetail.vue
  14. 136
      ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue
  15. 29
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/controller/ZyStyleModularController.java
  16. 13
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModularDetailsVO.java
  17. 3
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/service/IZyStyleModularService.java
  18. 12
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/service/impl/ZyStyleModularServiceImpl.java
  19. 19
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
  20. 8
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
  21. 5
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModular.java
  22. 5
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsType.java
  23. 4
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsTypeMapper.java
  24. 10
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
  25. 15
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/controller/ZyStyleAccessoriesController.java
  26. 17
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/entity/ZyStyleAccDetailVO.java
  27. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/service/IZyStyleAccessoriesService.java
  28. 18
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/service/impl/ZyStyleAccessoriesServiceImpl.java
  29. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/IZyClothsStyleService.java
  30. 39
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java
  31. 17
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/entity/ZyStyleFabricDetailVo.java
  32. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/IZyStyleFabricService.java
  33. 14
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/impl/ZyStyleFabricServiceImpl.java
  34. 27
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/controller/ZyStyleModelController.java
  35. 13
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/entity/ZyStyleModelDetailsVO.java
  36. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/IZyStyleModelService.java
  37. 70
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/impl/ZyStyleModelServiceImpl.java
  38. 21
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java
  39. 13
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/ZyStyleModuleDetailVO.java
  40. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/IZyStyleModuleService.java
  41. 13
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java

@ -58,7 +58,7 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <!-- <a-row>-->
<!-- <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">-->
<!-- <j-select-depart v-model="model.enterpriseId" placeholder="请选择企业"/>--> <!-- <j-select-depart v-model="model.enterpriseId" placeholder="请选择企业"/>-->
@ -99,7 +99,7 @@
<!-- <j-image-upload isMultiple v-model="model.pictureUrl" ></j-image-upload>--> <!-- <j-image-upload isMultiple v-model="model.pictureUrl" ></j-image-upload>-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
<!-- </a-col>--> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
</a-form-model> </a-form-model>
</j-form-container> </j-form-container>
</a-spin> </a-spin>
@ -107,9 +107,9 @@
<script> <script>
import {httpAction, getAction} from '@/api/manage' import {httpAction, getAction} from '@/api/manage';
import {validateDuplicateValue} from '@/utils/util' import {validateDuplicateValue} from '@/utils/util';
import JTreeSelect from '@/components/jeecg/JTreeSelect' import JTreeSelect from '@/components/jeecg/JTreeSelect';
export default { export default {
name: 'ZyClothsModularForm', name: 'ZyClothsModularForm',
@ -191,7 +191,8 @@ export default {
submitForm() { submitForm() {
const that = this; const that = this;
// //
this.$refs.form.validate(valid => { // this.$refs.form.validate(valid => {
this.$refs.model.validate(valid => {
if (valid) { if (valid) {
that.confirmLoading = true; that.confirmLoading = true;
let httpurl = ''; let httpurl = '';
@ -214,8 +215,11 @@ export default {
that.confirmLoading = false; that.confirmLoading = false;
}) })
} }
}) })
}, },
} }
} }
</script> </script>

@ -1,6 +1,6 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<p style="font-size: 30px;color:#333">{{biaoTi}}</p> <p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
<!-- 查询区域 --> <!-- 查询区域 -->
<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">
@ -115,9 +115,11 @@
<!-- <a @click="handleDetail(record)">详情</a>--> <!-- <a @click="handleDetail(record)">详情</a>-->
<!-- </a-menu-item>--> <!-- </a-menu-item>-->
<!-- <a-menu-item>--> <!-- <a-menu-item>-->
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a @click="viewDetail(record.id)">详情</a>
<a>删除</a> <a-divider type="vertical" />
</a-popconfirm> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
<!-- </a-menu-item>--> <!-- </a-menu-item>-->
<!-- </a-menu>--> <!-- </a-menu>-->
<!-- </a-dropdown>--> <!-- </a-dropdown>-->
@ -128,6 +130,7 @@
<zy-style-accessories-modal @valueChange="valueChange" ref="modalForm" <zy-style-accessories-modal @valueChange="valueChange" ref="modalForm"
@ok="modalFormOk"></zy-style-accessories-modal> @ok="modalFormOk"></zy-style-accessories-modal>
<ZyStyleAccListDetail ref="ZyStyleAccListDetail"></ZyStyleAccListDetail>
</a-card> </a-card>
</template> </template>
@ -139,11 +142,13 @@ import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import ZyStyleAccessoriesModal from './modules/ZyStyleAccessoriesModal' import ZyStyleAccessoriesModal from './modules/ZyStyleAccessoriesModal'
import {getAction} from "@api/manage"; import {getAction} from "@api/manage";
import {filterObj} from "@/utils/util"; import {filterObj} from "@/utils/util";
import ZyStyleAccListDetail from "@views/zystyleaccessories/modules/ZyStyleAccListDetail";
export default { export default {
name: 'ZyStyleAccessoriesList', name: 'ZyStyleAccessoriesList',
mixins: [JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
components: { components: {
ZyStyleAccListDetail,
ZyStyleAccessoriesModal ZyStyleAccessoriesModal
}, },
data() { data() {
@ -215,6 +220,10 @@ export default {
}, },
}, },
methods: { methods: {
//
viewDetail(id) {
this.$refs.ZyStyleAccListDetail.showModal(id)
},
fanHui() { fanHui() {
this.$router.push({ this.$router.push({
path: '/src/views/zyclothsstyle/ZyClothsStyleList', path: '/src/views/zyclothsstyle/ZyClothsStyleList',

@ -0,0 +1,160 @@
<template>
<div>
<a-modal
title="服装款式详情"
:visible="visible"
:confirm-loading="confirmLoading"
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<h3 style="width: 98%;;margin:0px auto">款式详情</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1"
bordered rowKey="nums" :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理辅料</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns3" :data-source="data3"
rowKey="id" bordered :pagination="false">
</a-table>
</a-spin>
</a-modal>
</div>
</template>
<script>
const columns1 = [
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align: 'center'
},
{
title: '款式编号',
dataIndex: 'nums',
key: 'nums',
align: 'center'
},
{
title: '款式规格',
dataIndex: 'specification',
key: 'specification',
align: 'center'
},
{
title: '款式形式',
dataIndex: 'shape',
key: 'shape',
align: 'center'
},
{
title: '企业',
dataIndex: 'enterpriseId',
key: 'enterpriseId',
align: 'center'
},
{
title: '款式创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
const columns3 = [
{
title: '服装类型名称',
dataIndex: 'typeName',
key: 'typeName',
align: 'center'
},
{
title: '款式名称',
dataIndex: 'styleId',
key: 'styleId',
align: 'center'
},
{
title: '辅料名称',
dataIndex: 'accessoriesId',
key: 'accessoriesId',
align: 'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
export default {
name: "ZyStyleAccListDetail",
data() {
return {
visible: false,
model: {},
confirmLoading: true,
//
data1: [],
columns1,
//
data3: [],
columns3,
id: '',
}
},
methods: {
showModal(id) {
this.visible = true;
this.id = id;
this.getDetailData()
},
async getDetailData() {
const {data: res} = await this.$axios.get('/jeecg-boot/zyaccessories/zyStyleAccessories/detail?id=' + this.id)
if (res.code !== 200) {
this.$message({
type: 'error',
message: '未查询到数据!'
});
}
console.log('res.result'+res.result)
this.confirmLoading = false
if (this.data1.length === 0) {
this.data1.push(res.result.zyClothsStyles)
}
this.data1 = res.result.zyClothsStyles
this.data3 = res.result.zyStyleAccessoriesList
},
handleOk(e) {
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel(e) {
this.visible = false;
},
},
}
</script>
<style scoped>
.table {
border-color: #d9d9d9;
border-radius: 3px
}
.table td {
padding: 10px 20px;
max-width: 380px;
}
.table td span {
color: #333
}
</style>

@ -1,6 +1,6 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<p style="font-size: 30px;color:#333">{{biaoTi}}</p> <p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
<!-- 查询区域 --> <!-- 查询区域 -->
<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">
@ -99,8 +99,8 @@
<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 @click="handleDetail(record)">详情</a>--> <a @click="viewDetail(record.id)">详情</a>
<!-- <a-divider type="vertical" />--> <a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
@ -110,6 +110,7 @@
</div> </div>
<zy-style-fabric-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-style-fabric-modal> <zy-style-fabric-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-style-fabric-modal>
<ZyStyleFabricListDetail ref="ZyStyleFabricListDetail"></ZyStyleFabricListDetail>
</a-card> </a-card>
</template> </template>
@ -122,11 +123,13 @@ import ZyStyleFabricModal from './modules/ZyStyleFabricModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import {getAction} from "@api/manage"; import {getAction} from "@api/manage";
import {filterObj} from "@/utils/util"; import {filterObj} from "@/utils/util";
import ZyStyleFabricListDetail from "@views/zystylefabric/modules/ZyStyleFabricListDetail";
export default { export default {
name: 'ZyStyleFabricList', name: 'ZyStyleFabricList',
mixins: [JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
components: { components: {
ZyStyleFabricListDetail,
ZyStyleFabricModal ZyStyleFabricModal
}, },
data() { data() {
@ -277,6 +280,10 @@ export default {
param.id = this.id; param.id = this.id;
return filterObj(param); return filterObj(param);
}, },
//
viewDetail(id) {
this.$refs.ZyStyleFabricListDetail.showModal(id)
},
getSuperFieldList() { getSuperFieldList() {
let fieldList = []; let fieldList = [];
fieldList.push({type: 'string', value: 'styleId', text: '款式id', dictCode: "zy_cloths_style,id,style_names"}) fieldList.push({type: 'string', value: 'styleId', text: '款式id', dictCode: "zy_cloths_style,id,style_names"})

@ -0,0 +1,174 @@
<template>
<div>
<a-modal
title="服装款式面料详情"
:visible="visible"
:confirm-loading="confirmLoading"
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<h3 style="width: 98%;;margin:0px auto">款式详情</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1"
bordered rowKey="nums" :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理面料</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns2" :data-source="data2"
rowKey="id" bordered :pagination="false">
</a-table>
</a-spin>
</a-modal>
</div>
</template>
<script>
const columns1 = [
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align: 'center'
},
{
title: '款式编号',
dataIndex: 'nums',
key: 'nums',
align: 'center'
},
{
title: '款式规格',
dataIndex: 'specification',
key: 'specification',
align: 'center'
},
{
title: '款式形式',
dataIndex: 'shape',
key: 'shape',
align: 'center'
},
{
title: '企业',
dataIndex: 'enterpriseId',
key: 'enterpriseId',
align: 'center'
},
{
title: '款式创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
const columns2 = [
{
title: '服装类型',
dataIndex: 'typeName',
key: 'typeName',
align: 'center'
},
{
title: '款式编号',
dataIndex: 'styleNums',
key: 'styleNums',
align: 'center'
},
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align: 'center'
},
{
title: '面料编号',
dataIndex: 'fabricNumber',
key: 'fabricNumber',
align: 'center'
},
{
title: '面料名称',
dataIndex: 'fabricName',
key: 'fabricName',
align: 'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
export default {
name: "ZyStyleFabricListDetail",
data() {
return {
visible: false,
model: {},
confirmLoading: true,
//
data1: [],
columns1,
//
data2: [],
columns2,
id: '',
}
},
methods: {
showModal(id) {
this.visible = true;
this.id = id;
this.getDetailData()
},
async getDetailData() {
const {data: res} = await this.$axios.get('/jeecg-boot/zystylefabric/zyStyleFabric/detail?id=' + this.id)
if (res.code !== 200) {
this.$message({
type: 'error',
message: '未查询到数据!'
});
}
console.log('res.result'+res.result)
this.confirmLoading = false
if (this.data1.length === 0) {
this.data1.push(res.result.zyClothsStyles)
}
this.data1 = res.result.zyClothsStyles
this.data2 = res.result.zyStyleFabricList
},
handleOk(e) {
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel(e) {
this.visible = false;
},
},
}
</script>
<style scoped>
.table {
border-color: #d9d9d9;
border-radius: 3px
}
.table td {
padding: 10px 20px;
max-width: 380px;
}
.table td span {
color: #333
}
</style>

@ -38,6 +38,8 @@
<template v-slot:action="props"> <template v-slot:action="props">
<a @click="submitForm(props)">保存</a> <a @click="submitForm(props)">保存</a>
<a-divider type="vertical"/> <a-divider type="vertical"/>
<a @click="viewDetail(props.rowId)">详情</a>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="handleDelete(props.rowId)"> <a-popconfirm title="确定删除吗?" @confirm="handleDelete(props.rowId)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
@ -46,6 +48,7 @@
</div> </div>
<zy-style-model-modal ref="modalForm" @ok="modalFormOk"></zy-style-model-modal> <zy-style-model-modal ref="modalForm" @ok="modalFormOk"></zy-style-model-modal>
<ZyStyleModelListDetails ref="ZyStyleModelListDetails"></ZyStyleModelListDetails>
</a-card> </a-card>
</template> </template>
@ -59,11 +62,13 @@ import ZyStyleModelModal from './modules/ZyStyleModelModal'
import {deleteAction, getAction, postAction, putAction, postFormAction, httpAction} from "@api/manage"; import {deleteAction, getAction, postAction, putAction, postFormAction, httpAction} from "@api/manage";
import store from "@/store"; import store from "@/store";
import {filterObj, validateDuplicateValue} from '@/utils/util' import {filterObj, validateDuplicateValue} from '@/utils/util'
import ZyStyleModelListDetails from "@views/zystylemodel/modules/ZyStyleModelListDetails";
export default { export default {
name: 'ZyStyleModelList', name: 'ZyStyleModelList',
mixins: [JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
components: { components: {
ZyStyleModelListDetails,
ZyStyleModelModal ZyStyleModelModal
}, },
data() { data() {
@ -173,6 +178,10 @@ export default {
}, },
}, },
methods: { methods: {
//
viewDetail(id) {
this.$refs.ZyStyleModelListDetails.showModal(id)
},
fanHui() { fanHui() {
this.$router.push({ this.$router.push({
path: '/src/views/zyclothsstyle/ZyClothsStyleList', path: '/src/views/zyclothsstyle/ZyClothsStyleList',

@ -0,0 +1,221 @@
<template>
<div>
<a-modal
title="服装款式详情"
:visible="visible"
:confirm-loading="confirmLoading"
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<h3 style="width: 98%;;margin:0px auto">款式详情</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1" bordered
rowKey="nums" :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理型号</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns4" :data-source="data4" rowKey="id" bordered :pagination="false">
</a-table>
</a-spin>
</a-modal>
</div>
</template>
<script>
const columns1 = [
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align: 'center'
},
{
title: '款式编号',
dataIndex: 'nums',
key: 'nums',
align: 'center'
},
{
title: '款式规格',
dataIndex: 'specification',
key: 'specification',
align: 'center'
},
{
title: '款式形式',
dataIndex: 'shape',
key: 'shape',
align: 'center'
},
{
title: '企业',
dataIndex: 'enterpriseId',
key: 'enterpriseId',
align: 'center'
},
{
title: '款式创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
const columns4 = [
{
title: '服装款式',
dataIndex: 'styleId',
key: 'styleId',
align: 'center'
},
{
title: '是否默认尺码',
dataIndex: 'isDefaultSize',
key: 'isDefaultSize',
align: 'center'
},
{
title: '型号编码',
dataIndex: 'modelNumber',
key: 'modelNumber',
align: 'center'
},
{
title: '码数',
dataIndex: 'size',
key: 'size',
align: 'center'
},
{
title: '型',
dataIndex: 'anumbers',
key: 'anumbers',
align: 'center'
},
{
title: '号',
dataIndex: 'bnumbers',
key: 'bnumbers',
align: 'center'
},
{
title: '领大',
dataIndex: 'collarLarge',
key: 'collarLarge',
align: 'center'
},
{
title: '胸围',
dataIndex: 'bust',
key: 'bust',
align: 'center'
},
{
title: '袖长',
dataIndex: 'sleeveLength',
key: 'sleeveLength',
align: 'center'
},
{
title: '连肩袖长',
dataIndex: 'shslLength',
key: 'shslLength',
align: 'center'
},
{
title: '总肩宽',
dataIndex: 'tsWidth',
key: 'tsWidth',
align: 'center'
},
{
title: '袖口',
dataIndex: 'cuff',
key: 'cuff',
align: 'center'
},
{
title: '腰围',
dataIndex: 'waistline',
key: 'waistline',
align: 'center'
},
{
title: '下摆',
dataIndex: 'hem',
key: 'hem',
align: 'center'
}
];
export default {
name: "ZyStyleModelListDetails",
data() {
return {
visible: false,
model: {},
confirmLoading: true,
//
data1: [],
columns1,
//
columns4,
data4:[],
id: '',
}
},
methods: {
showModal(id) {
this.visible = true;
this.id = id
this.getDetailData()
},
async getDetailData() {
const {data: res} = await this.$axios.get('/jeecg-boot/zystylemodel/zyStyleModel/detail?id=' + this.id)
if (res.code !== 200) {
this.$message({
type: 'error',
message: '未查询到数据!'
});
}
console.log('res.result')
console.log(res.result)
this.confirmLoading = false
if (this.data1.length === 0) {
this.data1.push(res.result.zyClothsStyles)
}
this.data1 = res.result.zyClothsStyles
this.data4 = res.result.zyStyleModels
},
handleOk(e) {
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel(e) {
this.visible = false;
},
},
}
</script>
<style scoped>
.table {
border-color: #d9d9d9;
border-radius: 3px
}
.table td {
padding: 10px 20px;
max-width: 380px;
}
.table td span {
color: #333
}
</style>

@ -1,14 +1,26 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<p style="font-size: 30px;color:#333;margin-bottom: 0px">{{biaoTi}}</p> <!--<p style="font-size: 30px;color:#333;margin-bottom: 0px">{{biaoTi}}</p>-->
<p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
<!-- 查询区域 --> <!-- 查询区域 -->
<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> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<!-- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a-button type="primary">{{biaoTi}}</a-button>--> <!-- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a-button type="primary">{{biaoTi}}</a-button>-->
<!-- <a-button type="primary">{{biaoTi}}</a-button>--> <!-- <a-button type="primary">{{biaoTi}}</a-button>-->
<a-form-model-item label="工序" >
<j-dict-select-tag v-model="queryParam.processId" placeholder="请选择工序"
dict-code="zy_process,process_name,id" />
</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-col>
</a-row> </a-row>
</a-form> </a-form>
@ -87,15 +99,18 @@
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a @click="viewDetail(record.id)">详情</a>
<a>删除</a> <a-divider type="vertical" />
</a-popconfirm> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</span> </span>
</a-table> </a-table>
</div> </div>
<zy-style-modular-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-style-modular-modal> <zy-style-modular-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-style-modular-modal>
<ZyStyleModularListDetails ref="ZyStyleModularListDetails"></ZyStyleModularListDetails>
</a-card> </a-card>
</template> </template>
@ -107,11 +122,13 @@ import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import ZyStyleModularModal from './modules/ZyStyleModularModal' import ZyStyleModularModal from './modules/ZyStyleModularModal'
import {getAction} from "@api/manage"; import {getAction} from "@api/manage";
import {filterObj} from "@/utils/util"; import {filterObj} from "@/utils/util";
import ZyStyleModularListDetails from "@views/zystylemodular/modules/ZyStyleModularListDetails";
export default { export default {
name: 'ZyStyleModularList', name: 'ZyStyleModularList',
mixins: [JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
components: { components: {
ZyStyleModularListDetails,
ZyStyleModularModal ZyStyleModularModal
}, },
data() { data() {
@ -178,6 +195,10 @@ export default {
}, },
}, },
methods: { methods: {
//
viewDetail(id) {
this.$refs.ZyStyleModularListDetails.showModal(id)
},
fanHui() { fanHui() {
this.$router.push({ this.$router.push({
path: '/src/views/zyclothsstyle/ZyClothsStyleList', path: '/src/views/zyclothsstyle/ZyClothsStyleList',

@ -93,9 +93,7 @@ import {filterObj} from "@/utils/util";
export default { export default {
name: 'ZyProcessList', name: 'ZyProcessList',
mixins: [JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
components: { components: {},
},
data() { data() {
return { return {
description: 'zy_process管理页面', description: 'zy_process管理页面',
@ -167,17 +165,17 @@ export default {
methods: { methods: {
initDictConfig() { initDictConfig() {
}, },
add(){ add() {
}, },
onSelectChange1(selectedRowKeys, selectionRows) { onSelectChange1(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys; this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows; this.selectionRows = selectionRows;
let ids = ""; let ids = "";
for (var a = 0; a < this.selectedRowKeys.length; a++) { for (var a = 0; a < this.selectedRowKeys.length; a++) {
ids += this.selectedRowKeys[a] + ","; ids += this.selectedRowKeys[a] + ",";
} }
this.$emit('onChangeRowKey',ids) this.$emit('onChangeRowKey', ids)
}, },
// //
loadParameter() { loadParameter() {
if (this.loadRouteType === false) { if (this.loadRouteType === false) {

@ -0,0 +1,155 @@
<template>
<div>
<a-modal
title="服装款式详情"
:visible="visible"
:confirm-loading="confirmLoading"
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<h3 style="width: 98%;;margin:0px auto">款式详情</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1" bordered
rowKey="nums" :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理工序</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns5" :data-source="data5"
rowKey="id" bordered :pagination="false" >
</a-table>
</a-spin>
</a-modal>
</div>
</template>
<script>
const columns1 = [
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align: 'center'
},
{
title: '款式编号',
dataIndex: 'nums',
key: 'nums',
align: 'center'
},
{
title: '款式规格',
dataIndex: 'specification',
key: 'specification',
align: 'center'
},
{
title: '款式形式',
dataIndex: 'shape',
key: 'shape',
align: 'center'
},
{
title: '企业',
dataIndex: 'enterpriseId',
key: 'enterpriseId',
align: 'center'
},
{
title: '款式创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
const columns5 = [
{
title: '款式名称',
dataIndex: 'styleId',
key: 'styleId',
align: 'center'
},
{
title: '工序',
dataIndex: 'processId',
key: 'processId',
align: 'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
export default {
name: "ZyStyleModularListDetails",
data() {
return {
visible: false,
model: {},
confirmLoading: true,
//
data1: [],
columns1,
//
columns5,
data5: [],
id: '',
}
},
methods: {
showModal(id) {
this.visible = true;
this.id = id
this.getDetailData()
},
async getDetailData() {
const {data: res} = await this.$axios.get('/jeecg-boot/zyStyleModular/zyStyleModular/detail?id=' + this.id)
if (res.code !== 200) {
this.$message({
type: 'error',
message: '未查询到数据!'
});
}
console.log('res.result')
console.log(res.result)
this.confirmLoading = false
if (this.data1.length === 0) {
this.data1.push(res.result.zyClothsStyles)
}
this.data1 = res.result.zyClothsStyles
this.data5 = res.result.zyStyleModularList
},
handleOk(e) {
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel(e) {
this.visible = false;
},
},
}
</script>
<style scoped>
.table {
border-color: #d9d9d9;
border-radius: 3px
}
.table td {
padding: 10px 20px;
max-width: 380px;
}
.table td span {
color: #333
}
</style>

@ -1,6 +1,6 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<p style="font-size: 30px;color:#333; padding-left: 40% ">{{biaoTi}}</p> <p style="font-size: 30px;color:#333; padding-left: 40% ">{{biaoTi}}</p>
<!-- 查询区域 --> <!-- 查询区域 -->
<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">
@ -29,7 +29,7 @@
<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-button type="primary">{{biaoTi}}</a-button>--> <!-- <a-button type="primary">{{biaoTi}}</a-button>-->
</a-row> </a-row>
</a-form> </a-form>
@ -41,7 +41,7 @@
<div class="table-operator"> <div class="table-operator">
<a-button @click="styleModuleHandleAdd(id,typeId)" type="primary" icon="plus">新增</a-button> <a-button @click="styleModuleHandleAdd(id,typeId)" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('款式模块表')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('款式模块表')">导出</a-button>
<a-button type="primary" icon="rollback" @click="fanHui()">返回</a-button> <a-button type="primary" icon="rollback" @click="fanHui()">返回</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>
@ -106,9 +106,9 @@
<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 @click="handleDetail(record)">详情</a>--> <a @click="viewDetail(record.id)">详情</a>
<!-- <a-divider type="vertical"/>--> <a-divider type="vertical"/>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
@ -118,23 +118,26 @@
</div> </div>
<zy-style-module-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-style-module-modal> <zy-style-module-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-style-module-modal>
<ZyStyleModuleListDetail ref="ZyStyleModuleListDetail"></ZyStyleModuleListDetail>
</a-card> </a-card>
</template> </template>
<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 ZyStyleModuleModal from './modules/ZyStyleModuleModal' import ZyStyleModuleModal from './modules/ZyStyleModuleModal';
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil';
import {getAction} from "@api/manage"; import {getAction} from "@api/manage";
import {filterObj} from "@/utils/util"; import {filterObj} from "@/utils/util";
import ZyStyleModuleListDetail from '@views/zystylemodule/modules/ZyStyleModuleListDetail';
export default { export default {
name: 'ZyStyleModuleList', name: 'ZyStyleModuleList',
mixins: [JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
components: { components: {
ZyStyleModuleListDetail,
ZyStyleModuleModal ZyStyleModuleModal
}, },
data() { data() {
@ -226,6 +229,7 @@ export default {
}, },
}, },
methods: { methods: {
fanHui() { fanHui() {
this.$router.push({ this.$router.push({
path: '/src/views/zyclothsstyle/ZyClothsStyleList', path: '/src/views/zyclothsstyle/ZyClothsStyleList',
@ -246,10 +250,10 @@ export default {
if (this.loadRouteType === false) { if (this.loadRouteType === false) {
this.id = this.$route.query.id; this.id = this.$route.query.id;
this.typeId = this.$route.query.typeId; this.typeId = this.$route.query.typeId;
this.biaoTi = this.$route.query.styleNames+"款式模块管理"; this.biaoTi = this.$route.query.styleNames + "款式模块管理";
console.log('********id对应的为款式style_id: ' + this.id); console.log('款式模块********id对应的为款式style_id: ' + this.id);
console.log('********biaoTi: ' + this.biaoTi); console.log('款式模块********biaoTi: ' + this.biaoTi);
console.log('******typeId此为类型typeId: ' + this.typeId); console.log('款式模块******typeId此为类型typeId: ' + this.typeId);
this.loadRouteType = true; this.loadRouteType = true;
} }
}, },
@ -297,6 +301,10 @@ export default {
param.id = this.$route.query.id; param.id = this.$route.query.id;
return filterObj(param); return filterObj(param);
}, },
//
viewDetail(id) {
this.$refs.ZyStyleModuleListDetail.showModal(id)
},
getSuperFieldList() { getSuperFieldList() {
let fieldList = []; let fieldList = [];
fieldList.push({type: 'string', value: 'typeId', text: '类型id', dictCode: "zy_cloths_type,id,type_name"}) fieldList.push({type: 'string', value: 'typeId', text: '类型id', dictCode: "zy_cloths_type,id,type_name"})

@ -81,6 +81,8 @@ 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 {filterMultiDictText} from '@/components/dict/JDictSelectUtil' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import {filterObj} from "@/utils/util";
import {getAction} from "@api/manage";
export default { export default {
name: 'ZyClothsModularList', name: 'ZyClothsModularList',
@ -89,6 +91,9 @@ export default {
data() { data() {
return { return {
description: '制衣模块 zy_cloths_modular管理页面', description: '制衣模块 zy_cloths_modular管理页面',
model: {
clothsTypeId: '',
},
// //
columns: [ columns: [
{ {
@ -111,9 +116,14 @@ export default {
align: "center", align: "center",
dataIndex: 'modularName' dataIndex: 'modularName'
}, },
{
title: '服装类型',
align: "center",
dataIndex: 'clothsTypeId_dictText'
},
], ],
url: { url: {
list: "/base/zyClothsModular/list", list: "/base/zyClothsModular/listAnother",
delete: "/base/zyClothsModular/delete", delete: "/base/zyClothsModular/delete",
deleteBatch: "/base/zyClothsModular/deleteBatch", deleteBatch: "/base/zyClothsModular/deleteBatch",
exportXlsUrl: "/base/zyClothsModular/exportXls", exportXlsUrl: "/base/zyClothsModular/exportXls",
@ -143,6 +153,16 @@ export default {
this.$emit('onChangeRowKey', ids) this.$emit('onChangeRowKey', ids)
}, },
add(id, typeId) { add(id, typeId) {
//zy_cloths_style id typeId
//typeIdzy_cloth_typeid
console.log("新增中拿到的id: "+id)
console.log("新增中拿到的typeId "+typeId)
this.model.clothsTypeId = typeId;
this.queryParam.clothsTypeId = typeId;
//
this.url.list='/base/zyClothsModular/listAnother';
this.loadData();
//this.visible = true;
}, },
initDictConfig() { initDictConfig() {
}, },

@ -0,0 +1,172 @@
<template>
<div>
<a-modal
title="服装款式详情"
:visible="visible"
:confirm-loading="confirmLoading"
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<h3 style="width: 98%;;margin:0px auto">款式详情</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1"
bordered rowKey="nums" :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理模块</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns" :data-source="data"
rowKey="id" bordered :pagination="false">
</a-table>
</a-spin>
</a-modal>
</div>
</template>
<script>
const columns1 = [
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align: 'center'
},
{
title: '款式编号',
dataIndex: 'nums',
key: 'nums',
align: 'center'
},
{
title: '款式规格',
dataIndex: 'specification',
key: 'specification',
align: 'center'
},
{
title: '款式形式',
dataIndex: 'shape',
key: 'shape',
align: 'center'
},
{
title: '企业',
dataIndex: 'enterpriseId',
key: 'enterpriseId',
align: 'center'
},
{
title: '款式创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
const columns = [
{
title: '服装类型',
dataIndex: 'typeName',
key: 'typeName',
align: 'center'
},
{
title: '款式编号',
dataIndex: 'styleNums',
key: 'styleNums',
align: 'center'
},
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align: 'center'
},
{
title: '模块编号',
dataIndex: 'modularNums',
key: 'modularNums',
align: 'center'
},
{
title: '模块名称',
dataIndex: 'modularName',
key: 'modularName',
align: 'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
export default {
name: "ZyStyleModuleListDetail",
data() {
return {
visible: false,
model: {},
confirmLoading: true,
//
data1: [],
columns1,
//
data: [],
columns,
id: '',
}
},
methods: {
showModal(id) {
this.visible = true;
this.id = id;
this.getDetailData()
},
async getDetailData() {
const {data: res} = await this.$axios.get('/jeecg-boot/zystylemodule/zyStyleModule/detail?id=' + this.id)
if (res.code !== 200) {
this.$message({
type: 'error',
message: '未查询到数据!'
});
}
console.log('res.result'+res.result)
this.confirmLoading = false
if (this.data1.length === 0) {
this.data1.push(res.result.zyClothsStyles)
}
this.data1 = res.result.zyClothsStyles
this.data = res.result.zyStyleModuleList
},
handleOk(e) {
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel(e) {
this.visible = false;
},
},
}
</script>
<style scoped>
.table {
border-color: #d9d9d9;
border-radius: 3px
}
.table td {
padding: 10px 20px;
max-width: 380px;
}
.table td span {
color: #333
}
</style>

@ -8,81 +8,83 @@
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }" :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel" @cancel="handleCancel"
cancelText="关闭"> cancelText="关闭">
<!-- <zy-style-module-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-style-module-form>--> <!-- <zy-style-module-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-style-module-form>-->
<zy-cloths-modular-list ref="realForm" @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-cloths-modular-list> <zy-cloths-modular-list ref="realForm" @onChangeRowKey="chuancan" @ok="submitCallback"
:disabled="disableSubmit"></zy-cloths-modular-list>
</j-modal> </j-modal>
</template> </template>
<script> <script>
import ZyStyleModuleForm from './ZyStyleModuleForm' import ZyStyleModuleForm from './ZyStyleModuleForm'
import ZyClothsModularList from "./ZyClothsModularList"; import ZyClothsModularList from "./ZyClothsModularList";
import {postAction} from "../../../api/manage"; import {postAction} from "../../../api/manage";
export default {
name: 'ZyStyleModuleModal',
components: {
ZyClothsModularList,
ZyStyleModuleForm
},
data () {
return {
model:{
styleId:'',
typeId:'',
modularId:'',
},
title:'',
width:800,
visible: false,
disableSubmit: false,
url: {
add: "/zystylemodule/zyStyleModule/add",
edit: "/zystylemodule/zyStyleModule/edit",
queryById: "/zystylemodule/zyStyleModule/queryById"
}
}
},
methods: {
add (id,typeId) {
this.model.styleId=id;
this.model.typeId=typeId;
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add(id,typeId);
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
chuancan(res){
this.model.modularId=res;
},
handleOk () {
postAction(this.url.add,this.model).then((res)=>{
if(res.success){
this.$message.success(res.message);
}else{
this.$message.warning(res.message);
}
this.$emit('valueChange',1)
this.close()
}) export default {
}, name: 'ZyStyleModuleModal',
submitCallback(){ components: {
this.$emit('ok'); ZyClothsModularList,
this.visible = false; ZyStyleModuleForm
},
data() {
return {
model: {
styleId: '',
typeId: '',
modularId: '',
}, },
handleCancel () { title: '',
this.close() width: 800,
visible: false,
disableSubmit: false,
url: {
add: "/zystylemodule/zyStyleModule/add",
edit: "/zystylemodule/zyStyleModule/edit",
queryById: "/zystylemodule/zyStyleModule/queryById"
} }
} }
},
methods: {
add(id, typeId) {
this.model.styleId = id;
this.model.typeId = typeId;
this.visible = true
this.$nextTick(() => {
this.$refs.realForm.add(id, typeId);
})
},
edit(record) {
this.visible = true
this.$nextTick(() => {
this.$refs.realForm.edit(record);
})
},
close() {
this.$emit('close');
this.visible = false;
},
chuancan(res) {
this.model.modularId = res;
},
handleOk() {
postAction(this.url.add, this.model).then((res) => {
if (res.success) {
this.$message.success(res.message);
} else {
this.$message.warning(res.message);
}
this.$emit('valueChange', 1)
this.close()
})
},
submitCallback() {
this.$emit('ok');
this.visible = false;
},
handleCancel() {
this.close()
}
} }
}
</script> </script>

@ -15,6 +15,7 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular; import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular;
import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModularDetailsVO;
import org.jeecg.modules.demo.zyStyleModular.mapper.ZyStyleModularMapper; import org.jeecg.modules.demo.zyStyleModular.mapper.ZyStyleModularMapper;
import org.jeecg.modules.demo.zyStyleModular.service.IZyStyleModularService; import org.jeecg.modules.demo.zyStyleModular.service.IZyStyleModularService;
@ -30,6 +31,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController; 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.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
@ -66,15 +68,19 @@ public class ZyStyleModularController extends JeecgController<ZyStyleModular, IZ
@AutoLog(value = "款式工序表-分页列表查询") @AutoLog(value = "款式工序表-分页列表查询")
@ApiOperation(value = "款式工序表-分页列表查询", notes = "款式工序表-分页列表查询") @ApiOperation(value = "款式工序表-分页列表查询", notes = "款式工序表-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<?> queryPageList(ZyStyleModular zyStyleModular, String id, public Result<?> queryPageList(ZyStyleModular zyStyleModular, String id,String processId,
@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<ZyStyleModular> queryWrapper = QueryGenerator.initQueryWrapper(zyStyleModular, req.getParameterMap()); //QueryWrapper<ZyStyleModular> queryWrapper = QueryGenerator.initQueryWrapper(zyStyleModular, req.getParameterMap());
Page<ZyStyleModular> page = new Page<ZyStyleModular>(pageNo, pageSize);
QueryWrapper<ZyStyleModular> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(StringUtils.hasText(id), "style_id", id);
queryWrapper.eq(StringUtils.hasText(processId), "process_id", processId);
Page<ZyStyleModular> page = new Page<>(pageNo, pageSize);
IPage<ZyStyleModular> pageList = zyStyleModularService.page(page, queryWrapper); IPage<ZyStyleModular> pageList = zyStyleModularService.page(page, queryWrapper);
List<ZyStyleModular> list = zyStyleModularMapper.selectListByStyleId(id); //List<ZyStyleModular> list = zyStyleModularMapper.selectListByStyleId(id);
pageList.setRecords(list); //pageList.setRecords(list);
return Result.OK(pageList); return Result.OK(pageList);
} }
@ -131,6 +137,19 @@ public class ZyStyleModularController extends JeecgController<ZyStyleModular, IZ
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/**
* 详情
*/
@AutoLog(value = "款式辅料管理-详情")
@ApiOperation(value = "款式辅料管理-详情", notes = "款式辅料管理-详情")
@GetMapping(value = "/detail")
public Result<?> detail(@RequestParam(name = "id", required = true) String id) {
//System.out.println("款式辅料管理 /detail controller层接受到的id: : "+id);
ZyStyleModularDetailsVO detailVO = zyStyleModularService.queryDetails(id);
return Result.OK(detailVO);
}
/** /**
* 批量删除 * 批量删除
* *

@ -0,0 +1,13 @@
package org.jeecg.modules.demo.zyStyleModular.entity;
import lombok.Data;
import java.util.List;
@Data
public class ZyStyleModularDetailsVO {
/*服装款式*/
//private List<ZyClothsStyle> zyClothsStyles;
/**子模块 款式工序*/
private List<ZyStyleModular> zyStyleModularList;
}

@ -2,6 +2,7 @@ package org.jeecg.modules.demo.zyStyleModular.service;
import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular; import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModularDetailsVO;
import java.util.List; import java.util.List;
@ -14,4 +15,6 @@ import java.util.List;
public interface IZyStyleModularService extends IService<ZyStyleModular> { public interface IZyStyleModularService extends IService<ZyStyleModular> {
List<ZyStyleModular> detail(String id); List<ZyStyleModular> detail(String id);
ZyStyleModularDetailsVO queryDetails(String id);
} }

@ -1,8 +1,10 @@
package org.jeecg.modules.demo.zyStyleModular.service.impl; package org.jeecg.modules.demo.zyStyleModular.service.impl;
import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular; import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular;
import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModularDetailsVO;
import org.jeecg.modules.demo.zyStyleModular.mapper.ZyStyleModularMapper; import org.jeecg.modules.demo.zyStyleModular.mapper.ZyStyleModularMapper;
import org.jeecg.modules.demo.zyStyleModular.service.IZyStyleModularService; import org.jeecg.modules.demo.zyStyleModular.service.IZyStyleModularService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -19,6 +21,7 @@ import java.util.List;
@Service @Service
public class ZyStyleModularServiceImpl extends ServiceImpl<ZyStyleModularMapper, ZyStyleModular> implements IZyStyleModularService { public class ZyStyleModularServiceImpl extends ServiceImpl<ZyStyleModularMapper, ZyStyleModular> implements IZyStyleModularService {
@Resource @Resource
private ZyStyleModularMapper zyStyleModularMapper; private ZyStyleModularMapper zyStyleModularMapper;
@ -33,4 +36,13 @@ public class ZyStyleModularServiceImpl extends ServiceImpl<ZyStyleModularMapper,
} }
return list; return list;
} }
@Override
public ZyStyleModularDetailsVO queryDetails(String id) {
ZyStyleModular modular = getById(id);
List<ZyStyleModular> list = detail(modular.getStyleId());
ZyStyleModularDetailsVO detailsVo = new ZyStyleModularDetailsVO();
detailsVo.setZyStyleModularList(list);
return detailsVo;
}
} }

@ -1,5 +1,6 @@
package org.jeecg.modules.demo.base.controller; package org.jeecg.modules.demo.base.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;
@ -16,6 +17,7 @@ import org.jeecg.modules.demo.base.entity.vo.ZyClothsModularDetail;
import org.jeecg.modules.demo.base.service.IZyClothsModularService; import org.jeecg.modules.demo.base.service.IZyClothsModularService;
import org.jeecg.modules.demo.base.service.IZyClothsTypeService; import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
@ -63,6 +65,23 @@ public class ZyClothsModularController extends JeecgController<ZyClothsModular,
return Result.OK(pageList); return Result.OK(pageList);
} }
@AutoLog(value = "zy_cloths_modular-分页列表查询")
@ApiOperation(value = "zy_cloths_modular-分页列表查询", notes = "zy_cloths_modular-分页列表查询")
@GetMapping(value = "/listAnother")
public Result<?> queryList(ZyClothsModular zyClothsModular,
@RequestParam(name = "clothsTypeId", required = true) String clothsTypeId,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
System.out.println("clothsTypeId "+clothsTypeId);
LambdaQueryWrapper<ZyClothsModular> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(StringUtils.hasText(clothsTypeId), ZyClothsModular::getClothsTypeId, clothsTypeId);
Page<ZyClothsModular> page = new Page<>(pageNo, pageSize);
IPage<ZyClothsModular> pageList = zyClothsModularService.page(page, queryWrapper);
return Result.OK(pageList);
}
@AutoLog(value = "zy_cloths_modular-查询所有") @AutoLog(value = "zy_cloths_modular-查询所有")
@ApiOperation(value = "zy_cloths_modular-查询所有", notes = "zy_cloths_modular-查询所有") @ApiOperation(value = "zy_cloths_modular-查询所有", notes = "zy_cloths_modular-查询所有")
@GetMapping(value = "/findAll") @GetMapping(value = "/findAll")

@ -104,8 +104,14 @@ public class ZyClothsTypeController extends JeecgController<ZyClothsType, IZyClo
if (zyClothsType.getTypeId().equals("1455487094925819901")) { if (zyClothsType.getTypeId().equals("1455487094925819901")) {
zyClothsType.setTypeId(null); zyClothsType.setTypeId(null);
} }
//根据type_id拿到类型名称
if (StringUtils.hasText(zyClothsType.getTypeId())){
String nameByTypeId = zyClothsTypeMapper.getNameByTypeId(zyClothsType.getTypeId());
zyClothsType.setTypeIdName(nameByTypeId);
}
//生成编号 nums,编号,varchar,10,非空,不重复,企业缩写(4)+顺序号(6)在service层处理 //生成编号 nums,编号,varchar,10,非空,不重复,企业缩写(4)+顺序号(6)在service层处理
// zyClothsType.setNums(zyClothsTypeService.generateNumber()); //zyClothsType.setNums(zyClothsTypeService.generateNumber());
//将企业id转化成企业名称 否则在其它form里面的服装类型里面的企业查出来的为id //将企业id转化成企业名称 否则在其它form里面的服装类型里面的企业查出来的为id
//@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") //@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
//String enterpriseName = zyClothsTypeMapper.getEnterprisenameById(zyClothsType.getEnterpriseId()); //String enterpriseName = zyClothsTypeMapper.getEnterprisenameById(zyClothsType.getEnterpriseId());

@ -53,10 +53,11 @@ public class ZyClothsModular implements Serializable {
@ApiModelProperty(value = "描述") @ApiModelProperty(value = "描述")
private java.lang.String description; private java.lang.String description;
/**衣服类型*/ /**衣服类型*/
@Excel(name = "衣服类型", width = 15, dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "id") @Excel(name = "衣服类型 款式类型", width = 15, dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "id")
@Dict(dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "id") @Dict(dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "id")
@ApiModelProperty(value = "衣服类型") @ApiModelProperty(value = "衣服类型 款式类型")
private java.lang.String clothsTypeId; private java.lang.String clothsTypeId;
/**企业*/ /**企业*/
@Excel(name = "企业", width = 15) @Excel(name = "企业", width = 15)
@ApiModelProperty(value = "企业") @ApiModelProperty(value = "企业")

@ -40,6 +40,11 @@ public class ZyClothsType implements Serializable {
@Dict(dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "id") @Dict(dictTable = "zy_cloths_type", dicText = "type_name", dicCode = "id")
@ApiModelProperty(value = "父类ID") @ApiModelProperty(value = "父类ID")
private java.lang.String typeId; private java.lang.String typeId;
/**父类ID名称*/
@Excel(name = "上级类型 父类ID名称")
@ApiModelProperty(value = "父类ID名称")
private java.lang.String typeIdName;
/**编号*/ /**编号*/
@Excel(name = "编号", width = 15) @Excel(name = "编号", width = 15)
@ApiModelProperty(value = "编号") @ApiModelProperty(value = "编号")

@ -35,4 +35,8 @@ public interface ZyClothsTypeMapper extends BaseMapper<ZyClothsType> {
@Select("select nums from zy_cloths_type where id = #{id} ") @Select("select nums from zy_cloths_type where id = #{id} ")
String selectNumOne(String id); String selectNumOne(String id);
/**根据type_id拿到类型名称*/
@Select("select type_name from zy_cloths_type where type_id = #{id} ")
String getNameByTypeId(String id);
} }

@ -62,17 +62,17 @@ public class ZyClothsTypeServiceImpl extends ServiceImpl<ZyClothsTypeMapper, ZyC
} }
switch (enterpriseName) { switch (enterpriseName) {
case "生产车间": case "生产车间":
return "SCCJ"; return "ZYCJ";
case "黄淮服装智能制造中心": case "黄淮服装智能制造中心":
return "HHZZ"; return "HHZY";
case "销售部": case "销售部":
return "XSBU"; return "ZYXS";
case "顺丰控股股份有限公司": case "顺丰控股股份有限公司":
return "SFKG"; return "SFKG";
case "设计部": case "设计部":
return "SJBU"; return "ZYSJ";
case "仓库": case "仓库":
return "CAKU"; return "ZYCK";
case "黄淮服装销售中心": case "黄淮服装销售中心":
return "HHXS"; return "HHXS";
case "平台": case "平台":

@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccDetailVO;
import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories; import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories;
import org.jeecg.modules.demo.zyaccessories.mapper.ZyStyleAccessoriesMapper; import org.jeecg.modules.demo.zyaccessories.mapper.ZyStyleAccessoriesMapper;
import org.jeecg.modules.demo.zyaccessories.service.IZyStyleAccessoriesService; import org.jeecg.modules.demo.zyaccessories.service.IZyStyleAccessoriesService;
@ -23,6 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabricDetailVo;
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@ -137,6 +139,19 @@ public class ZyStyleAccessoriesController extends JeecgController<ZyStyleAccesso
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/**
* 详情
*/
@AutoLog(value = "款式辅料管理-详情")
@ApiOperation(value = "款式辅料管理-详情", notes = "款式辅料管理-详情")
@GetMapping(value = "/detail")
public Result<?> detail(@RequestParam(name = "id", required = true) String id) {
//System.out.println("款式辅料管理 /detail controller层接受到的id: : "+id);
ZyStyleAccDetailVO detailVO = zyStyleAccessoriesService.queryDetail(id);
return Result.OK(detailVO);
}
/** /**
* 批量删除 * 批量删除
* *

@ -0,0 +1,17 @@
package org.jeecg.modules.demo.zyaccessories.entity;
import lombok.Data;
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import java.util.List;
@Data
public class ZyStyleAccDetailVO {
/**服装款式*/
private List<ZyClothsStyle> zyClothsStyles;
/**子模块 款式辅料*/
private List<ZyStyleAccessories> zyStyleAccessoriesList;
}

@ -1,7 +1,9 @@
package org.jeecg.modules.demo.zyaccessories.service; package org.jeecg.modules.demo.zyaccessories.service;
import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccDetailVO;
import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories; import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabricDetailVo;
import java.util.List; import java.util.List;
@ -14,4 +16,6 @@ import java.util.List;
public interface IZyStyleAccessoriesService extends IService<ZyStyleAccessories> { public interface IZyStyleAccessoriesService extends IService<ZyStyleAccessories> {
List<ZyStyleAccessories> detail(String id); List<ZyStyleAccessories> detail(String id);
ZyStyleAccDetailVO queryDetail(String id);
} }

@ -1,10 +1,15 @@
package org.jeecg.modules.demo.zyaccessories.service.impl; package org.jeecg.modules.demo.zyaccessories.service.impl;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccDetailVO;
import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories; import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories;
import org.jeecg.modules.demo.zyaccessories.mapper.ZyStyleAccessoriesMapper; import org.jeecg.modules.demo.zyaccessories.mapper.ZyStyleAccessoriesMapper;
import org.jeecg.modules.demo.zyaccessories.service.IZyStyleAccessoriesService; import org.jeecg.modules.demo.zyaccessories.service.IZyStyleAccessoriesService;
import org.jeecg.modules.zyclothsstyle.entity.vo.AllClothStyle;
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabricDetailVo;
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -20,12 +25,15 @@ import java.util.List;
*/ */
@Service @Service
public class ZyStyleAccessoriesServiceImpl extends ServiceImpl<ZyStyleAccessoriesMapper, ZyStyleAccessories> implements IZyStyleAccessoriesService { public class ZyStyleAccessoriesServiceImpl extends ServiceImpl<ZyStyleAccessoriesMapper, ZyStyleAccessories> implements IZyStyleAccessoriesService {
@Autowired
private IZyClothsStyleService zyClothsStyleService;
@Resource @Resource
private ZyStyleAccessoriesMapper zyStyleAccessoriesMapper; private ZyStyleAccessoriesMapper zyStyleAccessoriesMapper;
@Resource @Resource
private ZyStyleFabricMapper zyStyleFabricMapper; private ZyStyleFabricMapper zyStyleFabricMapper;
@Override @Override
public List<ZyStyleAccessories> detail(String id) { public List<ZyStyleAccessories> detail(String id) {
List<ZyStyleAccessories> list = zyStyleAccessoriesMapper.listByStyleId(id); List<ZyStyleAccessories> list = zyStyleAccessoriesMapper.listByStyleId(id);
@ -39,4 +47,14 @@ public class ZyStyleAccessoriesServiceImpl extends ServiceImpl<ZyStyleAccessorie
} }
return list; return list;
} }
@Override
public ZyStyleAccDetailVO queryDetail(String id) {
ZyStyleAccessories accessories = getById(id);
AllClothStyle detail = zyClothsStyleService.queryDetail(accessories.getStyleId());
ZyStyleAccDetailVO detailVO = new ZyStyleAccDetailVO();
detailVO.setZyClothsStyles(detail.getZyClothsStyles());
detailVO.setZyStyleAccessoriesList(detail.getZyStyleAccessoriesList());
return detailVO;
}
} }

@ -20,7 +20,7 @@ public interface IZyClothsStyleService extends IService<ZyClothsStyle> {
/** /**
* 服装类型详情 * 服装类型详情
* @param id 根据服装款式id进行查询 * @param id 一般为style_id 根据服装款式id进行查询
*/ */
AllClothStyle queryDetail(String id); AllClothStyle queryDetail(String id);

@ -1,36 +1,34 @@
package org.jeecg.modules.zystylefabric.controller; package org.jeecg.modules.zystylefabric.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
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;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.demo.fabric.entity.ZyFabric; import org.jeecg.modules.demo.fabric.entity.ZyFabric;
import org.jeecg.modules.demo.fabric.service.IZyFabricService; import org.jeecg.modules.demo.fabric.service.IZyFabricService;
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric;
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric;
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabricDetailVo;
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper;
import org.jeecg.modules.zystylefabric.service.INewZyStyleFabricService; import org.jeecg.modules.zystylefabric.service.INewZyStyleFabricService;
import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService; import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService;
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.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import javax.annotation.Resource;
import org.jeecg.common.aspect.annotation.AutoLog; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/** /**
* @Description: 款式面料表 * @Description: 款式面料表
@ -173,6 +171,17 @@ public class ZyStyleFabricController extends JeecgController<ZyStyleFabric, IZyS
zyStyleFabricService.removeById(id); zyStyleFabricService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/**
* 详情
*/
@AutoLog(value = "款式面料表-详情")
@ApiOperation(value = "款式面料表-详情", notes = "款式面料表-详情")
@GetMapping(value = "/detail")
public Result<?> detail(@RequestParam(name = "id", required = true) String id) {
//System.out.println("款式面料表 /detail controller层接受到的id: : "+id);
ZyStyleFabricDetailVo detailVO = zyStyleFabricService.queryDetail(id);
return Result.OK(detailVO);
}
/** /**
* 批量删除 * 批量删除

@ -0,0 +1,17 @@
package org.jeecg.modules.zystylefabric.entity;
import lombok.Data;
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import java.util.List;
@Data
public class ZyStyleFabricDetailVo {
/**服装款式*/
private List<ZyClothsStyle> zyClothsStyles;
/**子模块 款式面料*/
private List<NewZyStyleFabric> zyStyleFabricList;
}

@ -4,6 +4,7 @@ package org.jeecg.modules.zystylefabric.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric;
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric;
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabricDetailVo;
import java.util.List; import java.util.List;
@ -16,4 +17,6 @@ import java.util.List;
public interface IZyStyleFabricService extends IService<ZyStyleFabric> { public interface IZyStyleFabricService extends IService<ZyStyleFabric> {
List<NewZyStyleFabric> detail(String id); List<NewZyStyleFabric> detail(String id);
ZyStyleFabricDetailVo queryDetail(String id);
} }

@ -3,9 +3,11 @@ package org.jeecg.modules.zystylefabric.service.impl;
import org.jeecg.modules.demo.fabric.entity.ZyFabric; import org.jeecg.modules.demo.fabric.entity.ZyFabric;
import org.jeecg.modules.demo.fabric.service.IZyFabricService; import org.jeecg.modules.demo.fabric.service.IZyFabricService;
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
import org.jeecg.modules.zyclothsstyle.entity.vo.AllClothStyle;
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric;
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric;
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabricDetailVo;
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper;
import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService; import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -39,7 +41,7 @@ public class ZyStyleFabricServiceImpl extends ServiceImpl<ZyStyleFabricMapper, Z
List<ZyStyleFabric> list = zyStyleFabricMapper.listByStyleId(id); List<ZyStyleFabric> list = zyStyleFabricMapper.listByStyleId(id);
List<NewZyStyleFabric> newZyStyleFabrics = new ArrayList<>(); List<NewZyStyleFabric> newZyStyleFabrics = new ArrayList<>();
for (ZyStyleFabric zyStyleF : list) { for (ZyStyleFabric zyStyleF : list) {
System.out.println("****" + zyStyleF); //System.out.println("****" + zyStyleF);
NewZyStyleFabric newZySF = new NewZyStyleFabric(); NewZyStyleFabric newZySF = new NewZyStyleFabric();
//编辑回显 //编辑回显
newZySF.setId(zyStyleF.getId()); newZySF.setId(zyStyleF.getId());
@ -67,4 +69,14 @@ public class ZyStyleFabricServiceImpl extends ServiceImpl<ZyStyleFabricMapper, Z
} }
return newZyStyleFabrics; return newZyStyleFabrics;
} }
@Override
public ZyStyleFabricDetailVo queryDetail(String id) {
ZyStyleFabric fabric = getById(id);
AllClothStyle detail = zyClothsStyleService.queryDetail(fabric.getStyleId());
ZyStyleFabricDetailVo detailVo = new ZyStyleFabricDetailVo();
detailVo.setZyClothsStyles(detail.getZyClothsStyles());
detailVo.setZyStyleFabricList(detail.getZyStyleFabricList());
return detailVo;
}
} }

@ -22,7 +22,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccDetailVO;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModel; import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModelDetailsVO;
import org.jeecg.modules.zystylemodel.service.IZyStyleModelService; import org.jeecg.modules.zystylemodel.service.IZyStyleModelService;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@ -53,7 +55,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class ZyStyleModelController extends JeecgController<ZyStyleModel, IZyStyleModelService> { public class ZyStyleModelController extends JeecgController<ZyStyleModel, IZyStyleModelService> {
@Autowired @Autowired
private IZyStyleModelService zyStyleModelService; private IZyStyleModelService zyStyleModelService;
/** /**
* 分页列表查询 * 分页列表查询
* *
@ -77,7 +79,7 @@ public class ZyStyleModelController extends JeecgController<ZyStyleModel, IZySty
IPage<ZyStyleModel> pageList = zyStyleModelService.page(page, queryWrapper); IPage<ZyStyleModel> pageList = zyStyleModelService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }
/** /**
* 添加 * 添加
* *
@ -90,11 +92,11 @@ public class ZyStyleModelController extends JeecgController<ZyStyleModel, IZySty
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<String> add(@RequestBody ZyStyleModel zyStyleModel) { public Result<String> add(@RequestBody ZyStyleModel zyStyleModel) {
zyStyleModel.setId(null); zyStyleModel.setId(null);
System.out.println(zyStyleModel); System.out.println("zyStyleModel add"+zyStyleModel);
zyStyleModelService.save(zyStyleModel); zyStyleModelService.save(zyStyleModel);
return Result.OK("添加成功!"); return Result.OK("添加成功!");
} }
/** /**
* 编辑 * 编辑
* *
@ -109,7 +111,7 @@ public class ZyStyleModelController extends JeecgController<ZyStyleModel, IZySty
zyStyleModelService.updateById(zyStyleModel); zyStyleModelService.updateById(zyStyleModel);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
/** /**
* 通过id删除 * 通过id删除
* *
@ -124,7 +126,18 @@ public class ZyStyleModelController extends JeecgController<ZyStyleModel, IZySty
zyStyleModelService.removeById(id); zyStyleModelService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/**
* 详情
*/
@AutoLog(value = "zy_style_model-详情")
@ApiOperation(value = "zy_style_model-详情", notes = "zy_style_model-详情")
@GetMapping(value = "/detail")
public Result<?> detail(@RequestParam(name = "id", required = true) String id) {
ZyStyleModelDetailsVO detailVO = zyStyleModelService.queryDetails(id);
return Result.OK(detailVO);
}
/** /**
* 批量删除 * 批量删除
* *
@ -143,7 +156,7 @@ public class ZyStyleModelController extends JeecgController<ZyStyleModel, IZySty
//this.zyStyleModelService.removeByIds(Arrays.asList(map.get("deleteIds").split(","))); //this.zyStyleModelService.removeByIds(Arrays.asList(map.get("deleteIds").split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
/** /**
* 通过id查询 * 通过id查询
* *

@ -0,0 +1,13 @@
package org.jeecg.modules.zystylemodel.entity;
import lombok.Data;
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
import java.util.List;
@Data
public class ZyStyleModelDetailsVO {
/**服装款式*/
private List<ZyClothsStyle> zyClothsStyles;
/**子模块 款式型号 */
private List<ZyStyleModel> zyStyleModels;
}

@ -3,6 +3,7 @@ package org.jeecg.modules.zystylemodel.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModel; import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModelDetailsVO;
import java.util.List; import java.util.List;
@ -15,4 +16,6 @@ import java.util.List;
public interface IZyStyleModelService extends IService<ZyStyleModel> { public interface IZyStyleModelService extends IService<ZyStyleModel> {
List<ZyStyleModel> detail(String id); List<ZyStyleModel> detail(String id);
ZyStyleModelDetailsVO queryDetails(String id);
} }

@ -2,11 +2,18 @@ package org.jeecg.modules.zystylemodel.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.math.NumberUtils;
import org.jeecg.modules.zyclothsstyle.entity.vo.AllClothStyle;
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModel; import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModelDetailsVO;
import org.jeecg.modules.zystylemodel.mapper.ZyStyleModelMapper; import org.jeecg.modules.zystylemodel.mapper.ZyStyleModelMapper;
import org.jeecg.modules.zystylemodel.service.IZyStyleModelService; import org.jeecg.modules.zystylemodel.service.IZyStyleModelService;
import org.jetbrains.annotations.NotNull;
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.StringUtils; import org.springframework.util.StringUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -22,6 +29,9 @@ import java.util.List;
@Service @Service
public class ZyStyleModelServiceImpl extends ServiceImpl<ZyStyleModelMapper, ZyStyleModel> implements IZyStyleModelService { public class ZyStyleModelServiceImpl extends ServiceImpl<ZyStyleModelMapper, ZyStyleModel> implements IZyStyleModelService {
@Autowired
private IZyClothsStyleService zyClothsStyleService;
@Resource @Resource
private ZyStyleModelMapper zyStyleModelMapper; private ZyStyleModelMapper zyStyleModelMapper;
@Resource @Resource
@ -46,22 +56,67 @@ public class ZyStyleModelServiceImpl extends ServiceImpl<ZyStyleModelMapper, ZyS
} else { } else {
zy.setIsDefaultSize(null); zy.setIsDefaultSize(null);
} }
//型号编码
if (StringUtils.hasText(zy.getModelNumber())){
zy.setModelNumber(handleModelNumber(zy.getModelNumber()));
}
//码数 //码数
zy.setSize(zy.getSize()+36); if (!ObjectUtils.isEmpty(zy.getSize())){
zy.setSize(zy.getSize()+36);
}
//型 //型
zy.setAnumbers(aHandleNumberA(zy.getAnumbers())); if (!ObjectUtils.isEmpty(zy.getSize())){
zy.setAnumbers(aHandleNumberA(zy.getAnumbers()));
}
//号 //号
zy.setBnumbers(bHandleNumberB(zy.getBnumbers())); if (!ObjectUtils.isEmpty(zy.getSize())){
zy.setBnumbers(bHandleNumberB(zy.getBnumbers()));
}
} }
return zyStyleModels; return zyStyleModels;
} }
public String handleModelNumber(String modelNumber) {
if (NumberUtils.isNumber(modelNumber)){
if (modelNumber.equals("001")){
modelNumber = "S";
}
if (modelNumber.equals("002")){
modelNumber = "M";
}
if (modelNumber.equals("003")){
modelNumber = "L";
}
if (modelNumber.equals("004")){
modelNumber = "XL";
}
if (modelNumber.equals("005")){
modelNumber = "2XL";
}
if (modelNumber.equals("006")){
modelNumber = "3XL";
}
if (modelNumber.equals("007")){
modelNumber = "4XL";
}
}
return modelNumber;
}
@Override
public ZyStyleModelDetailsVO queryDetails(String id) {
ZyStyleModel model = getById(id);
AllClothStyle detail = zyClothsStyleService.queryDetail(model.getStyleId());
ZyStyleModelDetailsVO detailsVO = new ZyStyleModelDetailsVO();
detailsVO.setZyClothsStyles(detail.getZyClothsStyles());
detailsVO.setZyStyleModels(detail.getZyStyleModels());
return detailsVO;
}
public String aHandleNumberA(String num){ public String aHandleNumberA(String num){
if (StringUtils.isEmpty(num)){
return "null";
}
switch (num) { switch (num) {
case "1": case "1":
return "80A"; return "80A";
@ -86,9 +141,6 @@ public class ZyStyleModelServiceImpl extends ServiceImpl<ZyStyleModelMapper, ZyS
} }
public String bHandleNumberB(String num){ public String bHandleNumberB(String num){
if (StringUtils.isEmpty(num)){
return "null";
}
switch (num) { switch (num) {
case "1": case "1":
return "160"; return "160";

@ -20,11 +20,13 @@ import org.jeecg.modules.demo.base.entity.ZyClothsType;
import org.jeecg.modules.demo.base.service.IZyClothsModularService; import org.jeecg.modules.demo.base.service.IZyClothsModularService;
import org.jeecg.modules.demo.base.service.IZyClothsTypeService; import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
import org.jeecg.modules.zyclothsstyle.entity.vo.AllClothStyle;
import org.jeecg.modules.zyclothsstyle.mapper.ZyClothsStyleMapper; import org.jeecg.modules.zyclothsstyle.mapper.ZyClothsStyleMapper;
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule; import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModuleDetailVO;
import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper; import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper;
import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService; import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
@ -72,17 +74,18 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS
@ApiOperation(value = "款式模块表-分页列表查询", notes = "款式模块表-分页列表查询") @ApiOperation(value = "款式模块表-分页列表查询", notes = "款式模块表-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<?> queryPageList(ZyStyleModule zyStyleModule2, public Result<?> queryPageList(ZyStyleModule zyStyleModule2,
@RequestParam(name = "id" )String id, @RequestParam(name = "id" )String id,String modularId,
@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) {
System.err.println("ZyStyleModule 款式模块表 传来的 " + id); //System.err.println("ZyStyleModule 款式模块表 传来的 " + id);
QueryWrapper<ZyStyleModule> queryWrapper = new QueryWrapper<>(); QueryWrapper<ZyStyleModule> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(StringUtils.hasText(id),"style_id", id); queryWrapper.eq(StringUtils.hasText(id),"style_id", id);
queryWrapper.eq(StringUtils.hasText(modularId),"modular_id", modularId);
Page<ZyStyleModule> page = new Page<>(pageNo, pageSize); Page<ZyStyleModule> page = new Page<>(pageNo, pageSize);
IPage<ZyStyleModule> pageList = zyStyleModuleService.page(page, queryWrapper); IPage<ZyStyleModule> pageList = zyStyleModuleService.page(page, queryWrapper);
System.out.println(pageList.getRecords());
//List<ZyStyleModule> zyStyleModules = zyStyleModuleMapper.getListByStyleId(id); //List<ZyStyleModule> zyStyleModules = zyStyleModuleMapper.getListByStyleId(id);
//改变list中的实体类 类型 //改变list中的实体类 类型
@ -139,6 +142,18 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS
return Result.OK(pageList); return Result.OK(pageList);
} }
/**
* 详情
*/
@AutoLog(value = "款式模块表-详情")
@ApiOperation(value = "款式模块表-详情", notes = "款式模块表-详情")
@GetMapping(value = "/detail")
public Result<?> detail(@RequestParam(name = "id", required = true) String id) {
System.out.println("款式模块表 /detail controller层接受到的id: : "+id);
ZyStyleModuleDetailVO detailVO = zyStyleModuleService.queryDetail(id);
return Result.OK(detailVO);
}
/** /**
* 添加 * 添加
* *

@ -0,0 +1,13 @@
package org.jeecg.modules.zystylemodule.entity;
import lombok.Data;
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
import java.util.List;
@Data
public class ZyStyleModuleDetailVO {
/**服装款式*/
private List<ZyClothsStyle> zyClothsStyles;
/**子模块 款式模块*/
private List<NewStyleModule> zyStyleModuleList;
}

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule; import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModuleDetailVO;
import java.util.List; import java.util.List;
@ -23,4 +24,5 @@ public interface IZyStyleModuleService extends IService<ZyStyleModule> {
*/ */
List<NewStyleModule> changeList(List<ZyStyleModule> zyStyleModules); List<NewStyleModule> changeList(List<ZyStyleModule> zyStyleModules);
ZyStyleModuleDetailVO queryDetail(String id);
} }

@ -4,10 +4,12 @@ package org.jeecg.modules.zystylemodule.service.impl;
import org.jeecg.modules.demo.base.entity.ZyClothsModular; import org.jeecg.modules.demo.base.entity.ZyClothsModular;
import org.jeecg.modules.demo.base.service.IZyClothsModularService; import org.jeecg.modules.demo.base.service.IZyClothsModularService;
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
import org.jeecg.modules.zyclothsstyle.entity.vo.AllClothStyle;
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule; import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModuleDetailVO;
import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper; import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper;
import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService; import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -83,4 +85,15 @@ public class ZyStyleModuleServiceImpl extends ServiceImpl<ZyStyleModuleMapper, Z
return newStyleModuleList; return newStyleModuleList;
} }
@Override
public ZyStyleModuleDetailVO queryDetail(String id) {
ZyStyleModuleDetailVO detailVO = new ZyStyleModuleDetailVO();
ZyStyleModule zyStyleModule = getById(id);
String styleId = zyStyleModule.getStyleId();
AllClothStyle allClothStyle = zyClothsStyleService.queryDetail(styleId);
detailVO.setZyClothsStyles(allClothStyle.getZyClothsStyles());
detailVO.setZyStyleModuleList(allClothStyle.getZyStyleModuleList());
return detailVO;
}
} }

Loading…
Cancel
Save