Merge remote-tracking branch 'origin/master' into zhc4dev

zhc4dev
zhc077 2 years ago
commit 41c10baf3f
  1. 22
      ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
  2. 14
      ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
  3. 87
      ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue
  4. 35
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
  5. 38
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
  6. 10
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentForm.vue
  7. 30
      ant-design-vue-jeecg/src/views/process/modules/list/ZyClothsComponentList.vue
  8. 80
      ant-design-vue-jeecg/src/views/process/modules/list/ZyClothsModularCompentListDetails.vue
  9. 10
      ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue
  10. 10
      ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue
  11. 10
      ant-design-vue-jeecg/src/views/product/pdmachine/ProductMachineList.vue
  12. 10
      ant-design-vue-jeecg/src/views/product/pdoperationtool/ProductOperationtoolList.vue
  13. 86
      ant-design-vue-jeecg/src/views/zyProcessModular/ZyProcessModularList.vue
  14. 6
      ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue
  15. 7
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/controller/ZyStyleModularController.java
  16. 17
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularCompentController.java
  17. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
  18. 30
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java
  19. 7
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/IZyStyleFabricService.java
  20. 12
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/impl/ZyStyleFabricServiceImpl.java
  21. 11
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/impl/ZyStyleModelServiceImpl.java

@ -3,13 +3,14 @@
<a-modal
width="70%"
:title="biaoTi"
style="font-size: 30px; color: #333"
title=""
style="font-size: 30px; color: #333;padding-left: 40%"
:visible="visible"
:confirm-loading="confirmLoading"
@ok="handleOk"
@cancel="handleCancel"
>
<p style="font-size: 20px;color:#333;padding-left: 40%"> {{biaoTi}} </p>
<!-- <p style="font-size: 20px;color:#333"> {{biaoTi}} 模块部件管理 </p>-->
<!-- 查询区域 -->
<!-- <div class="table-page-search-wrapper">-->
@ -88,10 +89,9 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical"/>
<a @click="handleDetail(record)">详情</a>
<!-- <a @click="handleEdit(record)">编辑</a>-->
<!-- <a-divider type="vertical"/>-->
<a @click="viewDetails(record.id)">详情</a>
<a-divider type="vertical"/>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
@ -103,6 +103,7 @@
</div>
<zy-cloths-modular-compent-modal ref="modalForm" @ok="modalFormOk"></zy-cloths-modular-compent-modal>
<ZyClothsModularCompentListDetails ref="ZyClothsModularCompentListDetails"></ZyClothsModularCompentListDetails>
</a-modal>
</template>
@ -113,12 +114,15 @@ import '@/assets/less/TableExpand.less'
import {mixinDevice} from '@/utils/mixin'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import ZyClothsModularCompentModal from './modules/ZyClothsModularCompentModal'
import ZyClothsComponentListDetail from "@views/process/modules/ZyClothsComponentListDetail";
import ZyClothsModularCompentListDetails from "@views/process/modules/list/ZyClothsModularCompentListDetails";
export default {
name: 'ZyClothsModularCompentList',
mixins: [JeecgListMixin, mixinDevice],
components: {
ZyClothsModularCompentListDetails,
ZyClothsModularCompentModal
},
data() {
@ -127,7 +131,7 @@ export default {
visible: false,
confirmLoading: false,
yid: '',
biaoTi: "",
biaoTi: '',
//
columns: [
{
@ -193,6 +197,10 @@ export default {
},
},
methods: {
viewDetails(id) {
this.$refs.ZyClothsModularCompentListDetails.showModal(id);
},
edit1(record) {
this.model = Object.assign({}, record);
//this.ax= this.model.id;

@ -192,11 +192,11 @@ export default {
align: "center",
dataIndex: 'modularName'
},
// {
// title: '',
// align: "center",
// dataIndex: 'modularType_dictText'
// },
{
title: '模块类型',
align: "center",
dataIndex: 'modularType_dictText'
},
// {
// title: '',
// align: "center",
@ -270,13 +270,13 @@ export default {
viewVid(record) {
this.$refs.ZyClothsModularCompentList.showModal1();
this.$refs.ZyClothsModularCompentList.edit1(record);
console.log("制衣模块传给模块部件的id zyclothsMclist" + record.id);
//console.log("id zyclothsMclist" + record.id);
this.$refs.ZyClothsModularCompentList.disableSubmit = false;
},
viewVid2(record) {
this.$refs.ZyProcessModularList.showModal1();
this.$refs.ZyProcessModularList.edit1(record);
console.log("父弹窗ID++++++:" + record.id);
//console.log("ID++++++" + record.id);
this.$refs.ZyProcessModularList.disableSubmit = false;
},
initDictConfig() {

@ -2,16 +2,30 @@
<!-- <a-card :bordered="false">-->
<a-modal
width="70%"
title="部件工序管理"
title=""
:visible="visible"
:confirm-loading="confirmLoading"
@ok="handleOk"
@cancel="handleCancel"
>
<p style="font-size: 25px;color:#333; padding-left: 40% ">{{biaoTi}} 部件工序管理</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="工序" >
<j-dict-select-tag v-model="queryParam.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序" />
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -102,7 +116,7 @@
</a-table>
</div>
<zy-process-component-modal ref="modalForm" @ok="modalFormOk"></zy-process-component-modal>
<zy-process-component-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-component-modal>
<ZyProcessComponentFormDetail ref="ZyProcessComponentFormDetail"></ZyProcessComponentFormDetail>
</a-modal>
</template>
@ -115,6 +129,8 @@
import ZyProcessComponentModal from './modules/ZyProcessComponentModal'
import ZyProcessComponentFormDetail from './modules/ZyProcessComponentFormDetail'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import {filterObj} from "@/utils/util";
import {getAction} from "@api/manage";
export default {
name: 'ZyProcessComponentList',
@ -151,11 +167,11 @@
align:"center",
dataIndex: 'processId_dictText'
},
{
title:'是否瓶颈工序',
align:"center",
dataIndex: 'bottleneck_dictText'
},
// {
// title:'',
// align:"center",
// dataIndex: 'bottleneck_dictText'
// },
{
title:'创建时间',
align:"center",
@ -178,6 +194,9 @@
importExcelUrl: "pro/zyProcessComponent/importExcel",
},
//
loadRouteType: false,
biaoTi: '',
dictOptions:{},
superFieldList:[],
}
@ -194,12 +213,66 @@
edit2(record) {
this.model = Object.assign({}, record);
this.componentId1 = this.model.id;
this.biaoTi = this.model.partsName;
//console.log(topicid);
this.queryParam.componentId = this.model.id;
//console.log( this.queryParam.topicid);
this.loadData();
this.visible = true;
},
valueChange(value) {
if (value) this.loadData()
},
//
loadParameter() {
if (this.loadRouteType === false) {
this.loadRouteType = true;
}
},
loadData(arg) {
if (!this.url.list) {
this.$message.error("请设置url.list属性!");
return
}
// 1
if (arg === 1) {
this.ipagination.current = 1;
}
this.loadParameter();
const params = this.getQueryParams();//
this.loading = true;
getAction(this.url.list, params).then((res) => {
if (res.success) {
//update-begin---author:zhangyafei Date:20201118 for------------
this.dataSource = res.result.records || res.result;
if (res.result.total) {
this.ipagination.total = res.result.total;
} else {
this.ipagination.total = 0;
}
//update-end---author:zhangyafei Date:20201118 for------------
} else {
this.$message.warning(res.message)
}
}).finally(() => {
this.loading = false
})
},
getQueryParams() {
//
let sqp = {}
if (this.superQueryParams) {
sqp['superQueryParams'] = encodeURI(this.superQueryParams)
sqp['superQueryMatchType'] = this.superQueryMatchType
}
const param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
param.field = this.getQueryField();
param.pageNo = this.ipagination.current;
param.pageSize = this.ipagination.pageSize;
//param.id=this.id;
param.componentId = this.componentId1;
return filterObj(param);
},
showModal2() {
this.visible = true;
},

@ -24,26 +24,35 @@
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="48">
<a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">
<a-input v-model="model.partsName" placeholder="请输入部件名称" ></a-input>
<a-col :span="478">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
<a-input v-model="model.nums" placeholder="请输入编号" disabled=""></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="48">
<a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">
<j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" />
<a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">
<a-input v-model="model.partsName" placeholder="请输入部件名称" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
<!-- <a-row>-->
<!-- <a-col :span="48">-->
<!-- <a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">-->
<!-- <j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- </a-row>-->
<a-row>
<a-col :span="48">
<a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">
<a-form-model-item label="模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">
<j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType"
placeholder="请选择制衣模块类型"/>
placeholder="请选择模块类型"/>
</a-form-model-item>
</a-col>
</a-row>
@ -68,11 +77,7 @@
<!-- <j-select-depart v-model="model.enterpriseId" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">-->
<!-- <a-input v-model="model.nums" placeholder="请输入编号" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">-->
<!-- <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" />-->
@ -196,14 +201,14 @@
});
}
this.model.nums = res.result
console.log('res.result')
console.log(res.result)
//console.log('res.result')
//console.log(res.result)
//this.confirmLoading = false
// if (this.data.length === 0) {
// this.data.push(res.result)
// }
console.log("制衣部件List 编号 "+this.model.nums);
//console.log("List "+this.model.nums);
},
// bianHao() {
// getAction(this.url.sort, {id: this.model.clothsTypeId}).then((res) => {

@ -9,15 +9,7 @@
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="48">
<a-form-model-item label="模块名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularName">
<a-input v-model="model.modularName" placeholder="请输入模块名称"></a-input>
<!-- <a-input v-model="model.modularName" placeholder="请输入模块名称(最多30字)" :maxLength="30"></a-input>-->
<!-- <a-input v-model="model.modularName" placeholder="请输入模块名称" ></a-input>-->
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<!-- <a-col :span="48">-->
<!-- <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">-->
@ -37,13 +29,31 @@
</a-row>
<a-row>
<a-col>
<a-col :span="48">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
<a-input v-model="model.nums" placeholder="请输入编号" disabled></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="48">
<a-form-model-item label="模块名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularName">
<a-input v-model="model.modularName" placeholder="请输入模块名称"></a-input>
<!-- <a-input v-model="model.modularName" placeholder="请输入模块名称(最多30字)" :maxLength="30"></a-input>-->
<!-- <a-input v-model="model.modularName" placeholder="请输入模块名称" ></a-input>-->
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="48">
<a-form-model-item label="模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">
<j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择模块类型" />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="48">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
@ -72,11 +82,7 @@
<!-- <a-input v-model="model.modularName" placeholder="请输入模块名称" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">-->
<!-- <j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">-->
@ -143,7 +149,7 @@ export default {
modularName: [
{required: true, message: '请输入模块名称!'},
//{ pattern: /^[0-9A-Za-z\u4e00-\u9fa5.,;!()?]{0,50}$/, message: ''},
{min: 1, max: 30, message: '最多输入30字!', trigger: 'blur'},
{min: 1, max: 50, message: '最多输入50字!', trigger: 'blur'},
],
clothsTypeId: [
{required: true, message: '请选择衣服类型!'},

@ -13,11 +13,11 @@
<j-dict-select-tag type="list" v-model="model.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="是否瓶颈工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
<j-dict-select-tag v-model="model.bottleneck" type="radioButton" title="是否瓶颈工序" dictCode="pingjing" placeholder=""/>
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="是否瓶颈工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">-->
<!-- <j-dict-select-tag v-model="model.bottleneck" type="radioButton" title="是否瓶颈工序" dictCode="pingjing" placeholder=""/>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
</a-row>
</a-form-model>
</j-form-container>

@ -125,11 +125,11 @@ export default {
align:"center",
dataIndex: 'nums'
},
{
title:'模块类型',
align:"center",
dataIndex: 'modularType'
},
// {
// title:'',
// align:"center",
// dataIndex: 'modularType'
// },
{
title:'部件名称',
align:"center",
@ -140,11 +140,11 @@ export default {
// align:"center",
// dataIndex: 'componentType'
// },
// {
// title: '',
// align: "center",
// dataIndex: 'clothsTypeId_dictText'
// },
{
title: '服装类型',
align: "center",
dataIndex: 'clothsTypeId_dictText'
},
// {
// title:'',
// align:"center",
@ -161,11 +161,11 @@ export default {
// align:"center",
// dataIndex: 'modularId_dictText'
// },
// {
// title:'',
// align:"center",
// dataIndex: 'modularType_dictText'
// },
{
title:'模块类型',
align:"center",
dataIndex: 'modularType_dictText'
},
// {
// title:'',
// align:"center",

@ -0,0 +1,80 @@
<template>
<div>
<a-modal
title="制衣部件详情"
:visible="visible"
:confirm-loading="confirmLoading"
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<!-- <p class="title">制衣部件详情</p>-->
<a-descriptions title="" bordered>
<a-descriptions-item label="企业">{{model.enterpriseId}}</a-descriptions-item>
<a-descriptions-item label="服装类型">{{model.clothsTypeId}}</a-descriptions-item>
<a-descriptions-item label="部件名称">{{model.partsName}}</a-descriptions-item>
<a-descriptions-item label="模块">{{model.modularId}}</a-descriptions-item>
<a-descriptions-item label="描述" :span="2">{{model.description}}</a-descriptions-item>
<a-descriptions-item label="图片" :span="3">
<img v-if="model.pictureUrl" :src="model.pictureUrl" alt="无法显示"></img>
<span v-else>暂无图片</span>
</a-descriptions-item>
</a-descriptions>
<!-- <p class="title">部件工序详情</p>-->
<!-- <a-table :columns="columns1" :data-source="data1" rowKey="id" bordered :pagination="false">-->
<!-- </a-table>-->
</a-spin>
</a-modal>
</div>
</template>
<script>
export default {
name: "ZyClothsModularCompentListDetails",
data() {
return {
visible: false,
confirmLoading: true,
model: {
},
//data1:[],
//columns1,
}
},
methods: {
showModal(id) {
this.visible = true;
this.$http.get('/base/zyClothsModularCompent/detail?id=' + id).then(
res => {
if (res.code !== 200) {
this.$message({
type: 'error',
message: '未查询到数据!'
});
}
this.model = res.result
//this.data1 = res.result.zyProcessComponents
this.confirmLoading = false
}
)
},
handleOk(e) {
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel(e) {
this.visible = false;
},
},
}
</script>
<style scoped>
.title {
font-size: 18px;
margin: 1em 0;
font-weight: bold;
}
</style>

@ -1,5 +1,6 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@ -22,6 +23,7 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="fanhui" type="primary" icon="plus">返回</a-button>
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('产品辅料表')">导出</a-button>-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
@ -114,6 +116,7 @@
return {
description: '产品辅料表管理页面',
accessoriesId:'',
biaoTi: '',
//
columns: [
{
@ -186,6 +189,12 @@
},
},
methods: {
fanhui(){
this.$router.push({
/*返回产品*/
path: '',/*在引号中填写返回vue*/
});
},
initDictConfig(){
},
getSuperFieldList(){
@ -200,6 +209,7 @@
loadParameter() {
if (this.loadRouteType === false) {
this.id = this.$route.query.id;
this.biaoTi = this.$route.query.styleNames+"产品辅料管理";
console.log("***********")
this.loadRouteType = true;
}

@ -1,5 +1,6 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@ -35,6 +36,7 @@
<!-- </a-menu>-->
<!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
<!-- </a-dropdown>-->
<a-button @click="fanhui" type="primary" icon="plus">返回</a-button>
</div>
<!-- table区域-begin -->
@ -113,6 +115,7 @@
return {
description: '产品面料表管理页面',
fabricId:'',
biaoTi: '',
//
columns: [
{
@ -182,6 +185,12 @@
methods: {
initDictConfig(){
},
fanhui(){
this.$router.push({
/*返回产品*/
path: '',/*在引号中填写返回vue*/
});
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'productId',text:'产品id',dictCode:''})
@ -194,6 +203,7 @@
loadParameter() {
if (this.loadRouteType === false) {
this.id = this.$route.query.id;
this.biaoTi = this.$route.query.styleNames+"产品面料管理";
console.log("***********")
this.loadRouteType = true;
}

@ -1,5 +1,6 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@ -35,6 +36,7 @@
<!-- </a-menu>-->
<!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
<!-- </a-dropdown>-->
<a-button @click="fanhui" type="primary" icon="plus">返回</a-button>
</div>
<!-- table区域-begin -->
@ -114,6 +116,7 @@
return {
description: '产品设备表管理页面',
machineId:'',
biaoTi: '',
//
columns: [
{
@ -182,6 +185,12 @@
},
},
methods: {
fanhui(){
this.$router.push({
/*返回产品*/
path: '',/*在引号中填写返回vue*/
});
},
up(id){
getAction(this.url.up,{id:id}).then((res)=>{
if(res.success){
@ -213,6 +222,7 @@
loadParameter() {
if (this.loadRouteType === false) {
this.id = this.$route.query.id;
this.biaoTi = this.$route.query.styleNames+"产品设备管理";
console.log("***********")
this.loadRouteType = true;
}

@ -1,5 +1,6 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@ -35,6 +36,7 @@
<!-- </a-menu>-->
<!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
<!-- </a-dropdown>-->
<a-button @click="fanhui" type="primary" icon="plus">返回</a-button>
</div>
<!-- table区域-begin -->
@ -114,6 +116,7 @@
return {
description: '产品工具表管理页面',
operationtoolId:'',
biaoTi: '',
//
columns: [
{
@ -182,6 +185,12 @@
},
},
methods: {
fanhui(){
this.$router.push({
/*返回产品*/
path: '',/*在引号中填写返回vue*/
});
},
up(id){
getAction(this.url.up,{id:id}).then((res)=>{
if(res.success){
@ -213,6 +222,7 @@
loadParameter() {
if (this.loadRouteType === false) {
this.id = this.$route.query.id;
this.biaoTi = this.$route.query.styleNames+"产品工具管理";
console.log("***********")
this.loadRouteType = true;
}

@ -2,16 +2,37 @@
<!-- <a-card :bordered="false">-->
<a-modal
width="70%"
title="模块工序管理"
title=""
:visible="visible"
:confirm-loading="confirmLoading"
@ok="handleOk"
@cancel="handleCancel"
>
<p style="font-size: 20px;color:#333;padding-left: 40%">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="模块名称">
<j-dict-select-tag v-model="queryParam.modularId"
dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块名称"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="工序名称">
<j-dict-select-tag v-model="queryParam.processId"
dictCode="zy_process,process_name,id" placeholder="请选择工序名称"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -102,7 +123,7 @@
</a-table>
</div>
<zy-process-modular-modal ref="modalForm" @ok="modalFormOk"></zy-process-modular-modal>
<zy-process-modular-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-modular-modal>
</a-modal>
</template>
@ -112,6 +133,8 @@ import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyProcessModularModal from './modules/ZyProcessModularModal'
import {getAction} from "@api/manage";
import {filterObj} from "@/utils/util";
export default {
name: 'ZyProcessModularList',
@ -125,6 +148,9 @@ export default {
visible: false,
confirmLoading: false,
modularId1: '',
biaoTi: '',
//
loadRouteType: false,
//
columns: [
{
@ -176,6 +202,7 @@ export default {
},
created() {
this.getSuperFieldList();
//this.loadParameter();
},
computed: {
importExcelUrl: function(){
@ -186,6 +213,7 @@ export default {
edit1(record) {
this.model = Object.assign({}, record);
this.modularId1= this.model.id;
this.biaoTi = record.modularName+"模块工序管理";
//console.log(topicid);
this.queryParam.modularId = this.model.id;
console.log("子弹窗拿到的ID++++++:"+ this.queryParam.modularId);
@ -195,6 +223,60 @@ export default {
showModal1() {
this.visible = true;
},
valueChange(value) {
if (value) this.loadData()
},
loadData(arg) {
if (!this.url.list) {
this.$message.error("请设置url.list属性!");
return
}
// 1
if (arg === 1) {
this.ipagination.current = 1;
}
this.loadParameter();
var params = this.getQueryParams();//
this.loading = true;
getAction(this.url.list, params).then((res) => {
if (res.success) {
//update-begin---author:zhangyafei Date:20201118 for------------
this.dataSource = res.result.records || res.result;
if (res.result.total) {
this.ipagination.total = res.result.total;
} else {
this.ipagination.total = 0;
}
//update-end---author:zhangyafei Date:20201118 for------------
} else {
this.$message.warning(res.message)
}
}).finally(() => {
this.loading = false
})
},
getQueryParams() {
//
let sqp = {}
if (this.superQueryParams) {
sqp['superQueryParams'] = encodeURI(this.superQueryParams)
sqp['superQueryMatchType'] = this.superQueryMatchType
}
var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
param.field = this.getQueryField();
param.pageNo = this.ipagination.current;
param.pageSize = this.ipagination.pageSize;
//param.id=this.id;
param.modularId = this.modularId1;
//console.log("param.modularId "+param.modularId);
return filterObj(param);
},
//
loadParameter() {
if (this.loadRouteType === false) {
this.loadRouteType = true;
}
},
handleOk(e) {
this.ModalText = 'The modal will be closed after two seconds';
this.confirmLoading = true;

@ -251,9 +251,9 @@ export default {
this.id = this.$route.query.id;
this.typeId = this.$route.query.typeId;
this.biaoTi = this.$route.query.styleNames + "款式模块管理";
console.log('款式模块********id对应的为款式style_id: ' + this.id);
console.log('款式模块********biaoTi: ' + this.biaoTi);
console.log('款式模块******typeId此为类型typeId: ' + this.typeId);
//console.log('********idstyle_id: ' + this.id);
//console.log('********biaoTi: ' + this.biaoTi);
//console.log('******typeIdtypeId: ' + this.typeId);
this.loadRouteType = true;
}
},

@ -68,12 +68,15 @@ public class ZyStyleModularController extends JeecgController<ZyStyleModular, IZ
@AutoLog(value = "款式工序表-分页列表查询")
@ApiOperation(value = "款式工序表-分页列表查询", notes = "款式工序表-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(ZyStyleModular zyStyleModular, String id,String processId,
public Result<?> queryPageList(ZyStyleModular zyStyleModular,
@RequestParam(value = "id", required = false) String id,
@RequestParam(value = "processId", required = false) String processId,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
//QueryWrapper<ZyStyleModular> queryWrapper = QueryGenerator.initQueryWrapper(zyStyleModular, req.getParameterMap());
//System.err.println("id "+id);
//System.err.println("processId "+processId);
QueryWrapper<ZyStyleModular> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(StringUtils.hasText(id), "style_id", id);
queryWrapper.eq(StringUtils.hasText(processId), "process_id", processId);

@ -12,6 +12,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
import org.jeecg.modules.demo.base.entity.ZyClothsModularCompent;
import org.jeecg.modules.demo.base.entity.vo.ZyClothsComponentDetail;
import org.jeecg.modules.demo.base.mapper.ZyClothsModularCompentMapper;
import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
import org.jeecg.modules.demo.base.service.IZyClothsModularCompentService;
@ -64,7 +65,7 @@ public class ZyClothsModularCompentController extends JeecgController<ZyClothsMo
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
String modularId,
HttpServletRequest req) {
System.out.println("模块部件 接受到的modularId: "+modularId);
//System.out.println("模块部件 接受到的modularId: "+modularId);
QueryWrapper<ZyClothsModularCompent> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsModularCompent, req.getParameterMap());
queryWrapper.eq(StringUtils.hasText(modularId),"modular_id", modularId);
//queryWrapper.eq("modular_id", modularId);
@ -143,6 +144,20 @@ public class ZyClothsModularCompentController extends JeecgController<ZyClothsMo
return Result.OK("删除成功!");
}
/**
* 详情
*/
@AutoLog(value = "制衣模块部件中间表详情")
@ApiOperation(value = "制衣模块部件中间表详情", notes = "根据制衣模块部件中间表id进行查询")
@GetMapping(value = "/detail")
public Result<?> detail(@RequestParam(name = "id", required = true) String id) {
ZyClothsModularCompent modularComponent = zyClothsModularCompentService.getById(id);
System.err.println("controller层接受到的id:制衣模块部件中间表 Id: "+id);
ZyClothsComponentDetail detail = zyClothsComponentService.queryDetail(modularComponent.getComponentId());
return Result.OK(detail.getZyClothsComponent());
}
/**
* 批量删除
*

@ -73,7 +73,7 @@ public class ZyClothsModularController extends JeecgController<ZyClothsModular,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
System.out.println("clothsTypeId "+clothsTypeId);
//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);

@ -73,6 +73,7 @@ public class ZyStyleFabricController extends JeecgController<ZyStyleFabric, IZyS
if (id != null) {
queryWrapper.eq("style_id", id);
}
//查询用的
if (zyStyleFabric.getStyleId() != null || zyStyleFabric.getFabricId() != null) {
if (zyStyleFabric.getStyleId() != null) {
queryWrapper.eq("style_id", zyStyleFabric.getStyleId());
@ -83,34 +84,7 @@ public class ZyStyleFabricController extends JeecgController<ZyStyleFabric, IZyS
}
List<ZyStyleFabric> list = zyStyleFabricService.list(queryWrapper);
List<NewZyStyleFabric> newZyStyleFabrics = new ArrayList<>();
for (ZyStyleFabric zyStyleF : list) {
System.out.println("****" + zyStyleF);
NewZyStyleFabric newZySF = new NewZyStyleFabric();
//编辑回显
newZySF.setId(zyStyleF.getId());
newZySF.setFabricId(zyStyleF.getFabricId());
newZySF.setStyleId(zyStyleF.getStyleId());
//拿到服装类型名称
String typeName = zyStyleFabricMapper.getTypeName(newZySF.getStyleId());
newZySF.setTypeName(typeName);
//款式编号和名称
String styleId = zyStyleF.getStyleId();
ZyClothsStyle styleById = zyClothsStyleService.getById(styleId);
newZySF.setStyleNums(styleById.getNums());
newZySF.setStyleNames(styleById.getStyleNames());
//模块编号和名称
String fabricId = zyStyleF.getFabricId();
ZyFabric fabricById = zyFabricService.getById(fabricId);
newZySF.setFabricNumber(fabricById.getFabricNumber());
newZySF.setFabricName(fabricById.getName());
newZySF.setCreateTime(zyStyleF.getCreateTime());
newZyStyleFabrics.add(newZySF);
}
List<NewZyStyleFabric> newZyStyleFabrics = zyStyleFabricService.changeList(list);
IPage<NewZyStyleFabric> pageList = new Page<>(pageNo, pageSize, list.size());
pageList.setRecords(newZyStyleFabrics);
return Result.OK(pageList);

@ -19,4 +19,11 @@ public interface IZyStyleFabricService extends IService<ZyStyleFabric> {
List<NewZyStyleFabric> detail(String id);
ZyStyleFabricDetailVo queryDetail(String id);
/**
* 改变List中的实体类 类型
* @param list 原实体类ZyStyleFabric
* @return 新实体类 NewZyStyleFabric
*/
List<NewZyStyleFabric> changeList(List<ZyStyleFabric> list);
}

@ -10,6 +10,7 @@ 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.service.IZyStyleFabricService;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -39,7 +40,12 @@ public class ZyStyleFabricServiceImpl extends ServiceImpl<ZyStyleFabricMapper, Z
@Override
public List<NewZyStyleFabric> detail(String id) {
List<ZyStyleFabric> list = zyStyleFabricMapper.listByStyleId(id);
List<NewZyStyleFabric> newZyStyleFabrics = new ArrayList<>();
return changeList(list);
}
@Override
public List<NewZyStyleFabric> changeList(@NotNull List<ZyStyleFabric> list) {
List<NewZyStyleFabric> newFabrics = new ArrayList<>();
for (ZyStyleFabric zyStyleF : list) {
//System.out.println("****" + zyStyleF);
NewZyStyleFabric newZySF = new NewZyStyleFabric();
@ -65,9 +71,9 @@ public class ZyStyleFabricServiceImpl extends ServiceImpl<ZyStyleFabricMapper, Z
newZySF.setFabricNumber(fabricById.getFabricNumber());
newZySF.setFabricName(fabricById.getName());
newZySF.setCreateTime(zyStyleF.getCreateTime());
newZyStyleFabrics.add(newZySF);
newFabrics.add(newZySF);
}
return newZyStyleFabrics;
return newFabrics;
}
@Override

@ -10,6 +10,7 @@ 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.service.IZyStyleModelService;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -116,7 +117,8 @@ public class ZyStyleModelServiceImpl extends ServiceImpl<ZyStyleModelMapper, ZyS
public String aHandleNumberA(String num){
@Contract(pure = true)
private String aHandleNumberA(@NotNull String num){
switch (num) {
case "1":
return "80A";
@ -140,7 +142,12 @@ public class ZyStyleModelServiceImpl extends ServiceImpl<ZyStyleModelMapper, ZyS
return num;
}
public String bHandleNumberB(String num){
/**
* @ Contract(pure = true) 声明这个方法为纯函数
*
*/
@Contract(pure = true)
private String bHandleNumberB(@NotNull String num){
switch (num) {
case "1":
return "160";

Loading…
Cancel
Save