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

2022-12-21 修改产品管理部分问题

Browse Source
zhc4dev
赵玉瑞 2 years ago
parent e326dec258
commit 661cce79cb
10 changed files with 452 additions and 389 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. 781
      ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
  2. 9
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/ZyStyleModularMapper.java
  3. 8
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/service/impl/ZyStyleModularServiceImpl.java
  4. 4
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java
  5. 8
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsModularCompentServiceImpl.java
  6. 7
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessComponentServiceImpl.java
  7. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/service/impl/ZyStyleAccessoriesServiceImpl.java
  8. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/vo/AllClothStyle.java
  9. 10
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java
  10. 8
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java

781
ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
Unescape View File

@ -8,410 +8,425 @@
:width='1000' :width='1000'
@ok="handleOk" @ok="handleOk"
@cancel="handleCancel"> @cancel="handleCancel">
<!-- <table border="1" style="width: 98%;font-size:14px;margin:30px auto 0" class="table">--> <!-- <table border="1" style="width: 98%;font-size:14px;margin:30px auto 0" class="table">-->
<!-- <tr>--> <!-- <tr>-->
<!-- <td><span>款式名称：</span>tttt</td>--> <!-- <td><span>款式名称：</span>tttt</td>-->
<!-- <td><span>款式编号：</span>QIYE80301100000130</td>--> <!-- <td><span>款式编号：</span>QIYE80301100000130</td>-->
<!-- <td><span>款式规格：</span>123</td>--> <!-- <td><span>款式规格：</span>123</td>-->
<!-- <td><span>款式形式：</span>预制</td>--> <!-- <td><span>款式形式：</span>预制</td>-->
<!-- </tr>--> <!-- </tr>-->
<!-- <tr>--> <!-- <tr>-->
<!-- <td><span>企业：</span>黄淮服装智能制造中心</td>--> <!-- <td><span>企业：</span>黄淮服装智能制造中心</td>-->
<!-- <td><span>款式创建时间：</span>2022-12-06 10:02:59</td>--> <!-- <td><span>款式创建时间：</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 模块&ndash;&gt;--> <!-- &lt;!&ndash; 模块&ndash;&gt;-->
<!-- <td><span>服装类型：</span>tttt</td>--> <!-- <td><span>服装类型：</span>tttt</td>-->
<!-- <td><span>模块编号：</span>QIYE80301100000130</td>--> <!-- <td><span>模块编号：</span>QIYE80301100000130</td>-->
<!-- </tr>--> <!-- </tr>-->
<!-- <tr>--> <!-- <tr>-->
<!-- <td><span>模块名称：</span>2</td>--> <!-- <td><span>模块名称：</span>2</td>-->
<!-- <td><span>模块创建时间：</span>2022-12-06 10:02:59</td>--> <!-- <td><span>模块创建时间：</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 面料&ndash;&gt;--> <!-- &lt;!&ndash; 面料&ndash;&gt;-->
<!-- <td><span>面料编号：</span>2</td>--> <!-- <td><span>面料编号：</span>2</td>-->
<!-- <td><span>面料名称：</span>2A01</td>--> <!-- <td><span>面料名称：</span>2A01</td>-->
<!-- </tr>--> <!-- </tr>-->
<!-- <tr>--> <!-- <tr>-->
<!-- <td><span>面料创建时间：</span>2022-12-06 10:02:59</td>--> <!-- <td><span>面料创建时间：</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 辅料&ndash;&gt;--> <!-- &lt;!&ndash; 辅料&ndash;&gt;-->
<!-- <td><span>辅料名称：</span>2A01</td>--> <!-- <td><span>辅料名称：</span>2A01</td>-->
<!-- <td><span>辅料创建时间：</span>2022-12-06 10:02:59</td>--> <!-- <td><span>辅料创建时间：</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 工序&ndash;&gt;--> <!-- &lt;!&ndash; 工序&ndash;&gt;-->
<!-- <td><span>工序名称：</span>2A01</td>--> <!-- <td><span>工序名称：</span>2A01</td>-->
<!-- </tr>--> <!-- </tr>-->
<!-- <tr>--> <!-- <tr>-->
<!-- <td><span>工序创建时间：</span>2022-12-06 10:02:59</td>--> <!-- <td><span>工序创建时间：</span>2022-12-06 10:02:59</td>-->
<!-- <td><span>面料编号：</span>2</td>--> <!-- <td><span>面料编号：</span>2</td>-->
<!-- <td><span>面料名称：</span>2A01</td>--> <!-- <td><span>面料名称：</span>2A01</td>-->
<!-- <td><span>面料名称：</span>2A01</td>--> <!-- <td><span>面料名称：</span>2A01</td>-->
<!-- </tr>--> <!-- </tr>-->
<!-- </table>--> <!-- </table>-->
<a-spin :spinning="confirmLoading"> <a-spin :spinning="confirmLoading">
<h3 style="width: 98%;;margin:0px auto">款式详情</h3> <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 style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1" bordered
</a-table> rowKey="nums" :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理模块</h3> <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 style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns" :data-source="data" rowKey="id"
</a-table> bordered :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理面料</h3> <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 style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns2" :data-source="data2"
rowKey="id" bordered :pagination="false">
</a-table> </a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理辅料</h3> <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 style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns3" :data-source="data3"
rowKey="id" bordered :pagination="false">
</a-table> </a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理型号</h3> <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" bordered :pagination="false">--> <!-- <a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns4" :data-source="data4" bordered :pagination="false">-->
<!-- </a-table>--> <!-- </a-table>-->
<h3 style="width: 98%;;margin:20px auto 0">管理工序</h3> <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 style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns5" :data-source="data5"
rowKey="id" bordered :pagination="false">
</a-table> </a-table>
</a-spin> </a-spin>
</a-modal> </a-modal>
</div> </div>
</template> </template>
<script> <script>
const columns1 = [ const columns1 = [
{ {
title: '款式名称', title: '款式名称',
dataIndex: 'styleNames', dataIndex: 'styleNames',
key: 'styleNames', key: 'styleNames',
align:'center' align: 'center'
}, },
{ {
title: '款式编号', title: '款式编号',
dataIndex: 'nums', dataIndex: 'nums',
key: 'nums', key: 'nums',
align:'center' align: 'center'
}, },
{ {
title: '款式规格', title: '款式规格',
dataIndex: 'specification', dataIndex: 'specification',
key: 'specification', key: 'specification',
align:'center' align: 'center'
}, },
{ {
title: '款式形式', title: '款式形式',
dataIndex: 'shape', dataIndex: 'shape',
key: 'shape', key: 'shape',
align:'center' align: 'center'
}, },
{ {
title: '企业', title: '企业',
dataIndex: 'enterpriseId', dataIndex: 'enterpriseId',
key: 'enterpriseId', key: 'enterpriseId',
align:'center' align: 'center'
}, },
{ {
title: '款式创建时间', title: '款式创建时间',
dataIndex: 'createTime', dataIndex: 'createTime',
key: 'createTime', key: 'createTime',
align:'center' align: 'center'
}, }
]; ];
const columns = [ const columns = [
{ {
title: '服装类型', title: '服装类型',
dataIndex: 'typeName', dataIndex: 'typeName',
key: 'typeName', key: 'typeName',
align:'center' align: 'center'
}, },
{ {
title: '款式编号', title: '款式编号',
dataIndex: 'styleNums', dataIndex: 'styleNums',
key: 'styleNums', key: 'styleNums',
align:'center' align: 'center'
}, },
{ {
title: '款式名称', title: '款式名称',
dataIndex: 'styleNames', dataIndex: 'styleNames',
key: 'styleNames', key: 'styleNames',
align:'center' align: 'center'
}, },
{ {
title: '模块编号', title: '模块编号',
dataIndex: 'modularNums', dataIndex: 'modularNums',
key: 'modularNums', key: 'modularNums',
align:'center' align: 'center'
}, },
{ {
title: '模块名称', title: '模块名称',
dataIndex: 'modularName', dataIndex: 'modularName',
key: 'modularName', key: 'modularName',
align:'center' align: 'center'
}, },
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createTime', dataIndex: 'createTime',
key: 'createTime', key: 'createTime',
align:'center' align: 'center'
} }
]; ];
const columns2 = [ const columns2 = [
{ {
title: '服装类型', title: '服装类型',
dataIndex: 'typeName', dataIndex: 'typeName',
key: 'typeName', key: 'typeName',
align:'center' align: 'center'
}, },
{ {
title: '款式编号', title: '款式编号',
dataIndex: 'styleNums', dataIndex: 'styleNums',
key: 'styleNums', key: 'styleNums',
align:'center' align: 'center'
}, },
{ {
title: '款式名称', title: '款式名称',
dataIndex: 'styleNames', dataIndex: 'styleNames',
key: 'styleNames', key: 'styleNames',
align:'center' align: 'center'
}, },
{ {
title: '面料编号', title: '面料编号',
dataIndex: 'fabricNumber', dataIndex: 'fabricNumber',
key: 'fabricNumber', key: 'fabricNumber',
align:'center' align: 'center'
}, },
{ {
title: '面料名称', title: '面料名称',
dataIndex: 'fabricName', dataIndex: 'fabricName',
key: 'fabricName', key: 'fabricName',
align:'center' align: 'center'
}, },
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createTime', dataIndex: 'createTime',
key: 'createTime', key: 'createTime',
align:'center' align: 'center'
} }
]; ];
const columns3 = [ const columns3 = [
{ {
title: '服装类型名称', title: '服装类型名称',
dataIndex: 'typeName', dataIndex: 'typeName',
key: 'typeName', key: 'typeName',
align:'center' align: 'center'
}, },
{ {
title: '款式名称', title: '款式名称',
dataIndex: 'styleId', dataIndex: 'styleId',
key: 'styleId', key: 'styleId',
align:'center' align: 'center'
}, },
{ {
title: '辅料名称', title: '辅料名称',
dataIndex: 'accessoriesId', dataIndex: 'accessoriesId',
key: 'accessoriesId', key: 'accessoriesId',
align:'center' align: 'center'
}, },
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createTime', dataIndex: 'createTime',
key: 'createTime', key: 'createTime',
align:'center' align: 'center'
} }
]; ];
const columns4 = [ const columns4 = [
{ {
title: '服装款式', title: '服装款式',
dataIndex: 'a', dataIndex: 'a',
key: 'a', key: 'a',
align:'center' align: 'center'
}, },
{ {
title: '是否默认尺码', title: '是否默认尺码',
dataIndex: 'c', dataIndex: 'c',
key: 'c', key: 'c',
align:'center' align: 'center'
}, },
{ {
title: '型号编码', title: '型号编码',
dataIndex: 'e', dataIndex: 'e',
key: 'e', key: 'e',
align:'center' align: 'center'
}, },
{ {
title: '码数', title: '码数',
dataIndex: 'f', dataIndex: 'f',
key: 'f', key: 'f',
align:'center' align: 'center'
}, },
{ {
title: '型', title: '型',
dataIndex: 'a', dataIndex: 'a',
key: 'a', key: 'a',
align:'center' align: 'center'
}, },
{ {
title: '号', title: '号',
dataIndex: 'a', dataIndex: 'a',
key: 'a', key: 'a',
align:'center' align: 'center'
}, },
{ {
title: '领大', title: '领大',
dataIndex: 'c', dataIndex: 'c',
key: 'c', key: 'c',
align:'center' align: 'center'
}, },
{ {
title: '胸围', title: '胸围',
dataIndex: 'e', dataIndex: 'e',
key: 'e', key: 'e',
align:'center' align: 'center'
}, },
{ {
title: '袖长', title: '袖长',
dataIndex: 'f', dataIndex: 'f',
key: 'f', key: 'f',
align:'center' align: 'center'
}, },
{ {
title: '连肩袖长', title: '连肩袖长',
dataIndex: 'e', dataIndex: 'e',
key: 'e', key: 'e',
align:'center' align: 'center'
}, },
{ {
title: '总肩宽', title: '总肩宽',
dataIndex: 'f', dataIndex: 'f',
key: 'f', key: 'f',
align:'center' align: 'center'
}, },
{ {
title: '袖口', title: '袖口',
dataIndex: 'f', dataIndex: 'f',
key: 'f', key: 'f',
align:'center' align: 'center'
}, },
{ {
title: '腰围', title: '腰围',
dataIndex: 'f', dataIndex: 'f',
key: 'f', key: 'f',
align:'center' align: 'center'
}, },
{ {
title: '下摆', title: '下摆',
dataIndex: 'f', dataIndex: 'f',
key: 'f', key: 'f',
align:'center' align: 'center'
} }
]; ];
const data4 = [ const data4 = [
{ {
key: '1', key: '1',
a:'女衬衫', a: '女衬衫',
c:'test010', c: 'test010',
e:'123', e: '123',
f:'2022-12-06 10:02:59', f: '2022-12-06 10:02:59',
} }
]; ];
const columns5 = [ const columns5 = [
{ {
title: '款式名称', title: '款式名称',
dataIndex: 'styleId', dataIndex: 'styleId',
key: 'styleId', key: 'styleId',
align:'center' align: 'center'
}, },
{ {
title: '工序', title: '工序',
dataIndex: 'processId', dataIndex: 'processId',
key: 'processId', key: 'processId',
align:'center' align: 'center'
}, },
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createTime', dataIndex: 'createTime',
key: 'createTime', key: 'createTime',
align:'center' align: 'center'
}
];
export default {
name: 'ZyClothsStyleListDetail',//此处填组件名称
data() {
return {
visible: false,
model: {},
confirmLoading: true,
// 管理模块
data: [],
columns,
// 款式详情
data1: [],
columns1,
// 管理面料
data2: [],
columns2,
// 管理辅料
data3: [],
columns3,
// 管理型号
columns4,
data4,
// 管理工序
columns5,
data5: [],
url: {
detail: "/zyclothsstyle/zyClothsStyle/detail",
},
id: '',
} }
]; },
export default { methods: {
name: 'ZyClothsStyleListDetail',//此处填组件名称 showModal(id) {
data () { this.visible = true;
return { this.id = id
visible: false, // this.$http.get('/zyclothsstyle/zyClothsStyle/detail?id='+record.id).then(
model:{ // res=>{
}, // console.log('res')
confirmLoading:true, // console.log(res.result.zyClothsStyle)
// 管理模块 // this.data1.push(res.result.zyClothsStyle)
data:[], // }
columns, // )
// 款式详情 this.getDetailData()
data1:[], },
columns1, async getDetailData() {
// 管理面料 const {data: res} = await this.$axios.get('/jeecg-boot/zyclothsstyle/zyClothsStyle/detail?id=' + this.id)
data2:[], if (res.code !== 200) {
columns2, this.$message({
// 管理辅料 type: 'error',
data3:[], message: '未查询到数据！'
columns3, });
// 管理型号
columns4,
data4,
// 管理工序
columns5,
data5:[],
url: {
detail: "/zyclothsstyle/zyClothsStyle/detail",
},
id:'',
} }
}, this.confirmLoading = false
methods: { if (this.data1.length === 0) {
showModal(id) { this.data1.push(res.result.zyClothsStyles)
this.visible = true; }
this.id = id this.data1 = res.result.zyClothsStyles
// this.$http.get('/zyclothsstyle/zyClothsStyle/detail?id='+record.id).then( this.data2 = res.result.zyStyleFabricList
// res=>{ this.data3 = res.result.zyStyleAccessoriesList
// console.log('res') this.data = res.result.zyStyleModuleList
// console.log(res.result.zyClothsStyle) this.data5 = res.result.zyStyleModularList
// this.data1.push(res.result.zyClothsStyle) },
// } handleOk(e) {
// ) this.confirmLoading = true;
this.getDetailData() setTimeout(() => {
},
async getDetailData(){
const {data:res} = await this.$axios.get('/jeecg-boot/zyclothsstyle/zyClothsStyle/detail?id='+this.id)
if (res.code !== 200) {
this.$message({
type: 'error',
message: '未查询到数据！'
});
}
this.confirmLoading = false
if(this.data1.length == 0){
this.data1.push(res.result.zyClothsStyle)
}
this.data2 = res.result.zyStyleFabricList
this.data3 = res.result.zyStyleAccessoriesList
this.data = res.result.zyStyleModuleList
this.data5 = res.result.zyStyleModularList
},
handleOk(e) {
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel(e) {
this.visible = false; this.visible = false;
}, this.confirmLoading = false;
}, 1);
}, },
} handleCancel(e) {
</script > this.visible = false;
},
},
}
</script>
<style scoped> <style scoped>
.table{border-color:#d9d9d9;border-radius: 3px} .table {
.table td{padding: 10px 20px;max-width: 380px; } border-color: #d9d9d9;
.table td span{color: #333} border-radius: 3px
}
.table td {
padding: 10px 20px;
max-width: 380px;
}
.table td span {
color: #333
}
</style> </style>

9
jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/ZyStyleModularMapper.java
Unescape View File

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.zyStyleModular.mapper;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular; import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -16,4 +17,12 @@ public interface ZyStyleModularMapper extends BaseMapper<ZyStyleModular> {
List<ZyStyleModular> selectListByStyleId(String styleId); List<ZyStyleModular> selectListByStyleId(String styleId);
/**根据styleId 拿到 款式名称*/
@Select("select style_names from zy_cloths_style where id = #{styleId}")
String getStyleNameByStyleId(String styleId);
/**根据工序id 拿到 工序名称*/
@Select("select process_name from zy_process where id = #{processId}")
String getProcessNameByStyleId(String processId);
} }

8
jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/service/impl/ZyStyleModularServiceImpl.java
Unescape View File

@ -13,7 +13,7 @@ import java.util.List;
/** /**
* @Description: 款式工序表 * @Description: 款式工序表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2022-11-14 * @Date: 2022-11-14
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service
@ -25,6 +25,12 @@ public class ZyStyleModularServiceImpl extends ServiceImpl<ZyStyleModularMapper,
@Override @Override
public List<ZyStyleModular> detail(String id) { public List<ZyStyleModular> detail(String id) {
List<ZyStyleModular> list = zyStyleModularMapper.selectListByStyleId(id); List<ZyStyleModular> list = zyStyleModularMapper.selectListByStyleId(id);
for (ZyStyleModular zy : list) {
String styleName = zyStyleModularMapper.getStyleNameByStyleId(zy.getStyleId());
zy.setStyleId(styleName);
String processName = zyStyleModularMapper.getProcessNameByStyleId(zy.getProcessId());
zy.setProcessId(processName);
}
return list; return list;
} }
} }

4
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java
Unescape View File

@ -92,6 +92,10 @@ public class ZyClothsComponentServiceImpl extends ServiceImpl<ZyClothsComponentM
} }
String name = containChinese(zyClothsComponent.getEnterpriseId()); String name = containChinese(zyClothsComponent.getEnterpriseId());
zyClothsComponent.setEnterpriseId(name); zyClothsComponent.setEnterpriseId(name);
String modularName = zyClothsModularMapper.getModularNameByModularId(zyClothsComponent.getModularId());
if (StringUtils.hasText(modularName)) {
zyClothsComponent.setModularId(modularName);
}
return zyClothsComponent; return zyClothsComponent;
} }

8
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsModularCompentServiceImpl.java
Unescape View File

@ -4,12 +4,14 @@ import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
import org.jeecg.modules.demo.base.entity.ZyClothsModularCompent; import org.jeecg.modules.demo.base.entity.ZyClothsModularCompent;
import org.jeecg.modules.demo.base.mapper.ZyClothsComponentMapper; import org.jeecg.modules.demo.base.mapper.ZyClothsComponentMapper;
import org.jeecg.modules.demo.base.mapper.ZyClothsModularCompentMapper; import org.jeecg.modules.demo.base.mapper.ZyClothsModularCompentMapper;
import org.jeecg.modules.demo.base.mapper.ZyClothsModularMapper;
import org.jeecg.modules.demo.base.service.IZyClothsComponentService; import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
import org.jeecg.modules.demo.base.service.IZyClothsModularCompentService; import org.jeecg.modules.demo.base.service.IZyClothsModularCompentService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.util.StringUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
@ -31,6 +33,8 @@ public class ZyClothsModularCompentServiceImpl extends ServiceImpl<ZyClothsModul
private ZyClothsComponentMapper zyClothsComponentMapper; private ZyClothsComponentMapper zyClothsComponentMapper;
@Resource @Resource
private ZyClothsModularCompentMapper zyClothsModularCompentMapper; private ZyClothsModularCompentMapper zyClothsModularCompentMapper;
@Resource
private ZyClothsModularMapper zyClothsModularMapper;
/** /**
* 把部件信息查出来 赋给模块部件表 * 把部件信息查出来 赋给模块部件表
* @param componentId 部件id * @param componentId 部件id
@ -57,6 +61,10 @@ public class ZyClothsModularCompentServiceImpl extends ServiceImpl<ZyClothsModul
ZyClothsComponent byId = zyClothsComponentService.getById(partsName); ZyClothsComponent byId = zyClothsComponentService.getById(partsName);
s.setPartsName(byId.getPartsName()); s.setPartsName(byId.getPartsName());
} }
if (StringUtils.hasText(s.getModularId())){
String modularName = zyClothsModularMapper.getModularNameByModularId(s.getModularId());
s.setModularId(modularName);
}
} }
return zyClothsModularComponents; return zyClothsModularComponents;
} }

7
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessComponentServiceImpl.java
Unescape View File

@ -46,6 +46,13 @@ public class ZyProcessComponentServiceImpl extends ServiceImpl<ZyProcessComponen
}else{ }else{
processComponent.setComponentId("null"); processComponent.setComponentId("null");
} }
if (processComponent.getBottleneck().equals("1")){
processComponent.setBottleneck("是");
}else if (processComponent.getBottleneck().equals("2")){
processComponent.setBottleneck("否");
}else {
processComponent.setBottleneck(null);
}
} }
return zyProcessComponents; return zyProcessComponents;
} }

4
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/service/impl/ZyStyleAccessoriesServiceImpl.java
Unescape View File

@ -32,6 +32,10 @@ public class ZyStyleAccessoriesServiceImpl extends ServiceImpl<ZyStyleAccessorie
for (ZyStyleAccessories zy : list) { for (ZyStyleAccessories zy : list) {
String typeName = zyStyleFabricMapper.getTypeName(zy.getStyleId()); String typeName = zyStyleFabricMapper.getTypeName(zy.getStyleId());
zy.setTypeName(typeName); zy.setTypeName(typeName);
String styleName = zyStyleFabricMapper.getStyleNameByStyleId(zy.getStyleId());
zy.setStyleId(styleName);
String accessoriesName = zyStyleFabricMapper.getAccessoriesNameByStyleId(zy.getAccessoriesId());
zy.setAccessoriesId(accessoriesName);
} }
return list; return list;
} }

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

@ -12,7 +12,7 @@ import java.util.List;
@Data @Data
public class AllClothStyle { public class AllClothStyle {
/**服装款式*/ /**服装款式*/
private ZyClothsStyle zyClothsStyle; private List<ZyClothsStyle> zyClothsStyles;
/**子模块 款式模块*/ /**子模块 款式模块*/
private List<NewStyleModule> zyStyleModuleList; private List<NewStyleModule> zyStyleModuleList;
/**子模块 款式面料*/ /**子模块 款式面料*/

10
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java
Unescape View File

@ -53,8 +53,8 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, Z
public AllClothStyle queryDetail(String id) { public AllClothStyle queryDetail(String id) {
AllClothStyle zyAllClothStyle = new AllClothStyle(); AllClothStyle zyAllClothStyle = new AllClothStyle();
//服装款式详情 //服装款式详情
ZyClothsStyle zyClothsStyle = detail(id); List<ZyClothsStyle> zyClothsStyles = detail(id);
zyAllClothStyle.setZyClothsStyle(zyClothsStyle); zyAllClothStyle.setZyClothsStyles(zyClothsStyles);
//服装 款式 模块详情 //服装 款式 模块详情
List<NewStyleModule> zyStyleModuleList = zyStyleModuleService.detail(id); List<NewStyleModule> zyStyleModuleList = zyStyleModuleService.detail(id);
zyAllClothStyle.setZyStyleModuleList(zyStyleModuleList); zyAllClothStyle.setZyStyleModuleList(zyStyleModuleList);
@ -72,7 +72,7 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, Z
return zyAllClothStyle; return zyAllClothStyle;
} }
public ZyClothsStyle detail(String id){ public List<ZyClothsStyle> detail(String id){
ZyClothsStyle zyClothsStyle = zyClothsStyleMapper.selectById(id); ZyClothsStyle zyClothsStyle = zyClothsStyleMapper.selectById(id);
//翻译规格 shape 和企业 //翻译规格 shape 和企业
String shape = zyClothsStyle.getShape(); String shape = zyClothsStyle.getShape();
@ -90,7 +90,9 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, Z
zyClothsStyle.setEnterpriseId("null"); zyClothsStyle.setEnterpriseId("null");
} }
System.out.println("zyClothsStyle 服装款式详情"+zyClothsStyle); System.out.println("zyClothsStyle 服装款式详情"+zyClothsStyle);
return zyClothsStyle; List<ZyClothsStyle> zyClothsStyles = new ArrayList<>();
zyClothsStyles.add(zyClothsStyle);
return zyClothsStyles;
} }

8
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java
Unescape View File

@ -25,4 +25,12 @@ public interface ZyStyleFabricMapper extends BaseMapper<ZyStyleFabric> {
@Select("SELECT * FROM zy_style_fabric WHERE style_id = #{id}") @Select("SELECT * FROM zy_style_fabric WHERE style_id = #{id}")
List<ZyStyleFabric> listByStyleId(String id); List<ZyStyleFabric> listByStyleId(String id);
/**根据styleId 拿到 款式名称*/
@Select("select style_names from zy_cloths_style where id = #{styleId}")
String getStyleNameByStyleId(String styleId);
/**根据styleId 拿到 面料名称*/
@Select("select contents from zy_accessories where id = #{styleId}")
String getAccessoriesNameByStyleId(String styleId);
} }

Write Preview
Loading…
Cancel
Save