Merge remote-tracking branch 'origin/master'

zhc4dev
lenovo 2 years ago
commit de81882e7e
  1. 11
      ant-design-vue-jeecg/src/components/procedure/basicAction.vue
  2. 9
      ant-design-vue-jeecg/src/components/procedure/processFabric.vue
  3. 90
      ant-design-vue-jeecg/src/components/procedure/zyProcess.vue
  4. 9
      ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue
  5. 83
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentFormDetail.vue
  6. 116
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
  7. 21
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
  8. 21
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
  9. 55
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java
  10. 136
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/NewZyProcessComponent.java
  11. 74
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/controller/ZyClothsStyleController.java

@ -34,6 +34,12 @@
<script> <script>
export default { export default {
name: 'basicAction', name: 'basicAction',
// props:{
// tableModel:{
// type:Array,
// default: () =>({})
// }
// },
props:['tableModel'], props:['tableModel'],
data () { data () {
return { return {
@ -47,8 +53,9 @@
validatorRules: { validatorRules: {
}, },
}}, }},
methods: { created() {
} },
methods: {}
} }
</script> </script>
<style scoped> <style scoped>

@ -31,6 +31,15 @@
validatorRules: { validatorRules: {
}, },
}}, }},
created() {
console.log('this.tableModel')
console.log(this.tableModel)
},
mounted() {
console.log('this.tableModel')
console.log(this.tableModel)
}
} }
</script> </script>
<style scoped> <style scoped>

@ -0,0 +1,90 @@
<template>
<div style="padding: 15px 25px;">
<div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between;margin-bottom: 20px;" class="coin">
<img :src="data.image?data.image:img1" style="width:32%;">
<table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table">
<tr>
<td><span>工序代码</span>{{data.processCode}}</td>
<td><span>工序名称</span>{{data.processName}}</td>
<td><span>工序时间</span>{{data.processTime}}</td>
<td><span>工序单价</span>{{data.price}}</td>
</tr>
<tr>
<td><span>工序等级</span>{{data.grade}}</td>
<td><span>面料代码</span>{{data.fabricNum}}</td>
<td><span>面料等级</span>{{data.fabricGrade}}</td>
<td><span>针距(厘米)</span>{{data.needlePitch}}</td>
</tr>
<tr>
<td><span>机器名称</span>{{data.machineId}}</td>
<td><span>手工宽放</span>{{data.manualWide}}</td>
<td><span>手工时间</span>{{data.manualTime}}</td>
<td><span>设备转速</span>{{data.machineSpeed}}</td>
</tr>
<tr>
<td><span>设备宽放</span>{{data.machineWide}}</td>
<td><span>设备时间</span>{{data.machineTime}}</td>
<td><span>设备浮于</span>{{data.machineFloat}}</td>
<td><span>绑包宽放</span>{{data.bundleWide}}</td>
</tr>
<tr>
<td><span>绑包时间</span>{{data.bundleTime}}</td>
<td><span>部件表名</span>{{data.componentId}}</td>
<td><span>是否瓶颈</span>{{data.isBottleneck}}</td>
<td><span>企业名称</span>{{data.enterpriseId}}</td>
</tr>
<tr>
<td><span>工具名称</span>{{data.toolId}}</td>
<td><span>款式名称</span>{{data.styleId}}</td>
<td><span>工段代码</span>{{data.worksectionCode}}</td>
<td><span>合同号</span>{{data.totalManualTmu}}</td>
</tr>
<tr>
<td><span>合计(手工TMU)</span>{{data.totalManualTmu}}</td>
<td><span>合计(机器TMU)</span>{{data.totalMachineTmu}}</td>
<td><span>合计(手工秒)</span>{{data.totalMaunal}}</td>
<td><span>合计(机器秒)</span>{{data.totalMachine}}</td>
</tr>
</table>
</div>
<div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between">
<video v-if="data.vedio" :src="data.vedio" style="border:1px solid #d9d9d9;width:32%;"/>
<p v-else style="padding-top: 20px"> 暂无视频</p>
<table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table">
<tr>
<td style="text-align: center;width: 120px"><span>工艺描述</span></td>
<td><span>{{data.processDescribe}}</span></td>
</tr>
<tr>
<td style="text-align: center;width: 120px"><span>做工说明</span></td>
<td>{{data.mkExplain}}</td>
</tr>
<tr>
<td style="text-align: center;width: 120px"><span>品质要求</span></td>
<td>{{data.qualityRequire}}</td>
</tr>
</table>
</div>
</div>
</template>
<script>
export default {
name: 'zyProcess',
props:['data'],
data () {
return {
img:'',
img1:require('@/assets/9-2.png'),//
mp4:'',
}
},
methods: {
}
}
</script>
<style scoped>
.table{border-color:#d9d9d9;border-radius: 3px}
.table td{padding: 10px 20px;max-width: 380px; }
.table td span{color: #333}
</style>

@ -75,7 +75,7 @@
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a> <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item> <a-menu-item>
<a @click="handleDetail(record)">详情</a> <a @click="handleDetail(record.id)">详情</a>
</a-menu-item> </a-menu-item>
<a-menu-item> <a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@ -90,6 +90,7 @@
</div> </div>
<zy-process-component-modal ref="modalForm" @ok="modalFormOk"></zy-process-component-modal> <zy-process-component-modal ref="modalForm" @ok="modalFormOk"></zy-process-component-modal>
<ZyProcessComponentFormDetail ref="ZyProcessComponentFormDetail"></ZyProcessComponentFormDetail>
</a-card> </a-card>
</template> </template>
@ -99,13 +100,14 @@
import { mixinDevice } from '@/utils/mixin' import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyProcessComponentModal from './modules/ZyProcessComponentModal' import ZyProcessComponentModal from './modules/ZyProcessComponentModal'
import ZyProcessComponentFormDetail from './modules/ZyProcessComponentFormDetail'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default { export default {
name: 'ZyProcessComponentList', name: 'ZyProcessComponentList',
mixins:[JeecgListMixin, mixinDevice], mixins:[JeecgListMixin, mixinDevice],
components: { components: {
ZyProcessComponentModal ZyProcessComponentModal,ZyProcessComponentFormDetail
}, },
data () { data () {
return { return {
@ -174,6 +176,9 @@
fieldList.push({type:'string',value:'componentId',text:'部件',dictCode:'zy_cloths_component,parts_name,nums'}) fieldList.push({type:'string',value:'componentId',text:'部件',dictCode:'zy_cloths_component,parts_name,nums'})
fieldList.push({type:'string',value:'processId',text:'工艺',dictCode:'zy_process,process_name,id'}) fieldList.push({type:'string',value:'processId',text:'工艺',dictCode:'zy_process,process_name,id'})
this.superFieldList = fieldList this.superFieldList = fieldList
},
handleDetail(id){
this.$refs.ZyProcessComponentFormDetail.showModal(id)
} }
} }
} }

@ -0,0 +1,83 @@
<template>
<a-modal
title="标准作业指导书"
:visible="visible"
:confirm-loading="confirmLoading"
:width='1400'
@ok="handleOk"
@cancel="handleCancel"
style="display:flex;"
>
<table border="1" style="font-size:14px;" class="table" >
<tr>
<td style="text-align: center">部件:</td>
<td>{{model.componentId}}</td>
</tr>
<tr>
<td style="text-align: center">工艺:</td>
<td>{{model.processId}}</td>
</tr>
<tr>
<td style="text-align: center">是否瓶颈工序:</td>
<td>{{model.bottleneck}}</td>
</tr>
</table>
</a-modal>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'ZyProcessComponentFormDetail',
components: {
},
props: {
},
data () {
return {
model:{
},
visible: false,
confirmLoading: false,
img:'',//
img1:require('@/assets/9-2.png'),//
mp4:'',//
}
},
methods: {
showModal(id) {
this.visible = true;
this.$http.get('/pro/zyProcessComponent/queryById?id='+id).then(
res=>{
this.model = res.result
// this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image;
// this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio;
console.log('this.model')
console.log(this.model)
}
)
},
handleOk() {
this.ModalText = 'The modal will be closed after two seconds';
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel() {
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>

@ -11,93 +11,41 @@
> >
<div style="width: 96%;margin:0 auto 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 30px"> <div style="width: 96%;margin:0 auto 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 30px">
<h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">黄淮学院服装智能制造管理平台 - <span>基本工序</span></h1> <h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">黄淮学院服装智能制造管理平台 - <span>基本工序</span></h1>
<div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between;margin-bottom: 20px;" class="coin"> <!-- 基本工序-->
<img :src="img == ''?img:img1" style="width:32%;"> <zyProcess :data="ProcessData"></zyProcess>
<table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table">
<tr>
<td><span>工序代码</span>{{data.processCode}}</td>
<td><span>工序名称</span>{{data.processName}}</td>
<td><span>工序时间</span>{{data.processTime}}</td>
<td><span>工序单价</span>{{data.price}}</td>
</tr>
<tr>
<td><span>工序等级</span>{{data.grade}}</td>
<td><span>面料代码</span>{{data.fabricNum}}</td>
<td><span>面料等级</span>{{data.fabricGrade}}</td>
<td><span>针距(厘米)</span>{{data.needlePitch}}</td>
</tr>
<tr>
<td><span>机器名称</span>{{data.machineId}}</td>
<td><span>手工宽放</span>{{data.manualWide}}</td>
<td><span>手工时间</span>{{data.manualTime}}</td>
<td><span>机器转速</span>{{data.machineSpeed}}</td>
</tr>
<tr>
<td><span>机器宽放</span>{{data.machineWide}}</td>
<td><span>机器时间</span>{{data.machineTime}}</td>
<td><span>机器浮于</span>{{data.machineFloat}}</td>
<td><span>绑包宽放</span>{{data.bundleWide}}</td>
</tr>
<tr>
<td><span>绑包时间</span>{{data.bundleTime}}</td>
<td><span>部件表名</span>{{data.componentId}}</td>
<td><span>是否瓶颈</span>{{data.isBottleneck}}</td>
<td><span>企业名称</span>{{data.enterpriseId}}</td>
</tr>
<tr>
<td><span>工具名称</span>{{data.toolId}}</td>
<td><span>款式名称</span>{{data.styleId}}</td>
<td><span>工段代码</span>{{data.worksectionCode}}</td>
<td><span>合同号</span>{{data.totalManualTmu}}</td>
</tr>
<tr>
<td><span>合计(手工TMU)</span>{{data.totalManualTmu}}</td>
<td><span>合计(机器TMU)</span>{{data.totalMachineTmu}}</td>
<td><span>合计(手工秒)</span>{{data.totalMaunal}}</td>
<td><span>合计(机器秒)</span>{{data.totalMachine}}</td>
</tr>
</table>
</div> </div>
<div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between"> <!-- <a-card :title="`动作`+(index+1)" v-for="(item,index) in data.zyClothAction" :key="item.id" :headStyle="headStyle">-->
<video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:32%;"/> <!-- <div style="width:100%;height:20px;display:flex;font-size:18px">-->
<p v-else style="padding-top: 20px"> 暂无视频</p> <!-- <table border="1" style="width: 100%;height:50px;margin-top:-1%;" >-->
<table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table"> <!-- <tr>-->
<tr> <!-- <td style="width:20%">编号{{item.nums}}</td>-->
<td style="text-align: center;width: 120px"><span>工艺描述</span></td> <!-- <td style="width:20%">频率{{item.freq}}</td>-->
<td><span>{{data.processDescribe}}</span></td> <!-- <td style="width:20%">机器TMU{{item.machineTmu}}</td>-->
</tr> <!-- <td style="width:20%">手工TMU{{item.machineTmu}}</td>-->
<tr> <!-- <td style="width:20%">描述{{item.descr}}</td>-->
<td style="text-align: center;width: 120px"><span>做工说明</span></td> <!-- </tr>-->
<td>{{data.mkExplain}}</td> <!-- </table>-->
</tr> <!-- </div>-->
<tr> <!-- </a-card>-->
<td style="text-align: center;width: 120px"><span>品质要求</span></td> <!-- 基础动作-->
<td>{{data.qualityRequire}}</td>
</tr>
</table>
</div>
</div>
<a-card :title="`动作`+(index+1)" v-for="(item,index) in data.zyClothAction" :key="item.id" :headStyle="headStyle">
<div style="width:100%;height:20px;display:flex;font-size:18px">
<table border="1" style="width: 100%;height:50px;margin-top:-1%;" >
<tr>
<td style="width:20%">编号{{item.nums}}</td>
<td style="width:20%">频率{{item.freq}}</td>
<td style="width:20%">机器TMU{{item.machineTmu}}</td>
<td style="width:20%">手工TMU{{item.machineTmu}}</td>
<td style="width:20%">描述{{item.descr}}</td>
</tr>
</table>
</div>
</a-card>
<div style="width: 96%;margin:0 auto 30px"> <div style="width: 96%;margin:0 auto 30px">
<h2 style="text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">基础动作</h2> <h2 style="text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">基础动作</h2>
<basicAction :tableModel="basicActionData"></basicAction>
</div>
<div style="width: 96%;margin:0 auto 30px">
<h2 style="text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">工序面料</h2>
<processFabric :tableModel="accessoriesData"></processFabric>
</div> </div>
</a-modal> </a-modal>
</div> </div>
</template> </template>
<script> <script>
import zyProcess from '@/components/procedure/zyProcess'
import basicAction from '@/components/procedure/basicAction'
import processFabric from '@/components/procedure/processFabric'
export default { export default {
components:{zyProcess,basicAction,processFabric},
data() { data() {
return{ return{
ModalText: 'Content of the modal', ModalText: 'Content of the modal',
@ -108,9 +56,12 @@
img1:require('@/assets/9-2.png'),// img1:require('@/assets/9-2.png'),//
mp4:'', mp4:'',
data:{}, data:{},
ProcessData:{},
basicActionData:[],
accessoriesData:[],
headStyle:{ headStyle:{
height:'10px' height:'10px'
} },
} }
}, },
created(){ created(){
@ -121,9 +72,14 @@
this.$http.get('/base/zyProcess/queryById?id='+id).then( this.$http.get('/base/zyProcess/queryById?id='+id).then(
res=>{ res=>{
this.data = res.result this.data = res.result
this.ProcessData = res.result.zyProcess
this.basicActionData = res.result.zyProcessAction
this.accessoriesData = res.result.zyProcessAccessories
console.log('this.data')
console.log(this.data)
console.log(this.accessoriesData)
this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image; this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image;
this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio; this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio;
console.log(this.data)
} }
) )
}, },

@ -13,6 +13,8 @@ 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.base.entity.ZyClothsComponent; import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
import org.jeecg.modules.demo.base.entity.ZyClothsModular;
import org.jeecg.modules.demo.base.entity.ZyClothsType;
import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo; import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo;
import org.jeecg.modules.demo.base.service.IZyClothsComponentService; import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
@ -21,6 +23,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.demo.base.service.IZyClothsModularService;
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;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
@ -50,6 +53,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class ZyClothsComponentController extends JeecgController<ZyClothsComponent, IZyClothsComponentService> { public class ZyClothsComponentController extends JeecgController<ZyClothsComponent, IZyClothsComponentService> {
@Autowired @Autowired
private IZyClothsComponentService zyClothsComponentService; private IZyClothsComponentService zyClothsComponentService;
@Autowired
private IZyClothsModularService zyClothsModularService;
/** /**
* 分页列表查询 * 分页列表查询
@ -73,6 +78,22 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
return Result.OK(pageList); return Result.OK(pageList);
} }
@AutoLog(value = "zy_cloths_component-查询所有")
@ApiOperation(value="zy_cloths_component-查询所有", notes="zy_cloths_component-查询所有")
@GetMapping(value = "/findAll")
public Result<?> findAll() {
List<ZyClothsComponent> list = zyClothsComponentService.list();
for(ZyClothsComponent zycl : list){
String id = zycl.getModularId();
String enterpriseId = zycl.getEnterpriseId();
if(id!=null && enterpriseId !=null){
ZyClothsModular byId = zyClothsModularService.getById(id);
zycl.setModularId(byId.getModularName());
}
}
return Result.OK(list);
}
/** /**
* 添加 * 添加
* *

@ -13,6 +13,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.base.entity.ZyClothsModular; import org.jeecg.modules.demo.base.entity.ZyClothsModular;
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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -20,6 +21,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.demo.base.service.IZyClothsTypeService;
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;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
@ -49,6 +51,9 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class ZyClothsModularController extends JeecgController<ZyClothsModular, IZyClothsModularService> { public class ZyClothsModularController extends JeecgController<ZyClothsModular, IZyClothsModularService> {
@Autowired @Autowired
private IZyClothsModularService zyClothsModularService; private IZyClothsModularService zyClothsModularService;
@Autowired
private IZyClothsTypeService zyClothsTypeService;
/** /**
* 分页列表查询 * 分页列表查询
@ -72,6 +77,22 @@ 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 = "/findAll")
public Result<?> findAll() {
List<ZyClothsModular> list = zyClothsModularService.list();
for(ZyClothsModular zycl : list){
String id = zycl.getClothsTypeId();
if(id!=null){
ZyClothsType byId = zyClothsTypeService.getById(id);
zycl.setClothsTypeId(byId.getTypeName());
}
}
return Result.OK(list);
}
/** /**
* 添加 * 添加
* *

@ -1,5 +1,6 @@
package org.jeecg.modules.demo.pro.controller; package org.jeecg.modules.demo.pro.controller;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -12,6 +13,11 @@ 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.base.entity.ZyClothsComponent;
import org.jeecg.modules.demo.base.entity.ZyProcess;
import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
import org.jeecg.modules.demo.base.service.IZyProcessService;
import org.jeecg.modules.demo.pro.entity.NewZyProcessComponent;
import org.jeecg.modules.demo.pro.entity.ZyProcessComponent; import org.jeecg.modules.demo.pro.entity.ZyProcessComponent;
import org.jeecg.modules.demo.pro.service.IZyProcessComponentService; import org.jeecg.modules.demo.pro.service.IZyProcessComponentService;
@ -49,6 +55,10 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class ZyProcessComponentController extends JeecgController<ZyProcessComponent, IZyProcessComponentService> { public class ZyProcessComponentController extends JeecgController<ZyProcessComponent, IZyProcessComponentService> {
@Autowired @Autowired
private IZyProcessComponentService zyProcessComponentService; private IZyProcessComponentService zyProcessComponentService;
@Autowired
private IZyProcessService zyProcessService;
@Autowired
private IZyClothsComponentService zyClothsComponentService;
/** /**
* 分页列表查询 * 分页列表查询
@ -72,6 +82,51 @@ public class ZyProcessComponentController extends JeecgController<ZyProcessCompo
return Result.OK(pageList); return Result.OK(pageList);
} }
/**
*
*/
@AutoLog(value = "zy_process_component-查询所有")
@ApiOperation(value="zy_process_component-查询所有", notes="zy_process_component-查询所有")
@GetMapping(value = "/findAll")
public Result<?> findAll() {
List<ZyProcessComponent> list = zyProcessComponentService.list();
List<NewZyProcessComponent> list1 = new ArrayList<>();
for (ZyProcessComponent zy : list){
NewZyProcessComponent newZy = new NewZyProcessComponent();
String processId = zy.getProcessId();
String componentId = zy.getComponentId();
ZyProcess byId = zyProcessService.getById(processId);
ZyClothsComponent byId1 = zyClothsComponentService.getById(componentId);
newZy.setProcessCode(byId.getProcessCode());
newZy.setProcessName(byId.getProcessName());
newZy.setProcessDescribe(byId.getProcessDescribe());
newZy.setMkExplain(byId.getMkExplain());
newZy.setQualityRequire(byId.getQualityRequire());
newZy.setProcessTime(byId.getProcessTime());
newZy.setPrice(byId.getPrice());
newZy.setGrade(byId.getGrade());
newZy.setNeedlePitch(byId.getNeedlePitch());
newZy.setManualTime(byId.getManualTime());
newZy.setMachineSpeed(byId.getMachineSpeed());
newZy.setMachineWide(byId.getMachineWide());
newZy.setMachineTime(byId.getMachineTime());
newZy.setMachineFloat(byId.getMachineFloat());
newZy.setBundleWide(byId.getBundleWide());
newZy.setBundleTime(byId.getBundleTime());
newZy.setEnterpriseId(byId.getEnterpriseId());
newZy.setStyleId(byId.getStyleId());
newZy.setWorksectionCode(byId.getWorksectionCode());
newZy.setTotalManualTmu(byId.getTotalManualTmu());
newZy.setTotalMachineTmu(byId.getTotalMachineTmu());
newZy.setTotalMaunal(byId.getTotalMaunal());
newZy.setTotalMachine(byId.getTotalMachine());
newZy.setNums(byId1.getNums());
newZy.setPartsName(byId1.getPartsName());
newZy.setDescription(byId1.getDescription());
list1.add(newZy);
}
return Result.OK(list1);
}
/** /**
* 添加 * 添加
* *

@ -0,0 +1,136 @@
package org.jeecg.modules.demo.pro.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.demo.base.entity.vo.ZyClothActionVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.List;
@Data
public class NewZyProcessComponent {
/**工序代码*/
@Excel(name = "工序代码", width = 15)
@ApiModelProperty(value = "工序代码")
private java.lang.String processCode;
/**工序名称*/
@Excel(name = "工序名称", width = 15)
@ApiModelProperty(value = "工序名称")
private java.lang.String processName;
/**工艺描述*/
@Excel(name = "工艺描述", width = 15)
@ApiModelProperty(value = "工艺描述")
private java.lang.String processDescribe;
/**做工说明*/
@Excel(name = "做工说明", width = 15)
@ApiModelProperty(value = "做工说明")
private java.lang.String mkExplain;
/**品质要求*/
@Excel(name = "品质要求", width = 15)
@ApiModelProperty(value = "品质要求")
private java.lang.String qualityRequire;
/**工序时间*/
@Excel(name = "工序时间", width = 15)
@ApiModelProperty(value = "工序时间")
private java.lang.String processTime;
/**工序单价*/
@Excel(name = "工序单价", width = 15)
@ApiModelProperty(value = "工序单价")
private java.lang.Double price;
/**工序等级*/
@Excel(name = "工序等级", width = 15)
@ApiModelProperty(value = "工序等级")
private java.lang.String grade;
/**针距(针/厘米)*/
@Excel(name = "针距(针/厘米)", width = 15)
@ApiModelProperty(value = "针距(针/厘米)")
private java.lang.Integer needlePitch;
/**手工宽放*/
@Excel(name = "手工宽放", width = 15)
@ApiModelProperty(value = "手工宽放")
private java.lang.String manualWide;
/**手工时间*/
@Excel(name = "手工时间", width = 15)
@ApiModelProperty(value = "手工时间")
private java.lang.Double manualTime;
/**机器转速*/
@Excel(name = "机器转速", width = 15)
@ApiModelProperty(value = "机器转速")
private java.lang.Integer machineSpeed;
/**机器宽放*/
@Excel(name = "机器宽放", width = 15)
@ApiModelProperty(value = "机器宽放")
private java.lang.String machineWide;
/**机器时间*/
@Excel(name = "机器时间", width = 15)
@ApiModelProperty(value = "机器时间")
private java.lang.Double machineTime;
/**机器浮于*/
@Excel(name = "机器浮于", width = 15)
@ApiModelProperty(value = "机器浮于")
private java.lang.String machineFloat;
/**绑包宽放*/
@Excel(name = "绑包宽放", width = 15)
@ApiModelProperty(value = "绑包宽放")
private java.lang.String bundleWide;
/**绑包时间*/
@Excel(name = "绑包时间", width = 15)
@ApiModelProperty(value = "绑包时间")
private java.lang.String bundleTime;
/**企业名称*/
@Excel(name = "企业名称", width = 15)
@ApiModelProperty(value = "企业名称")
private java.lang.String enterpriseId;
/**工具名称*/
/**款式名称*/
@Excel(name = "款式名称", width = 15)
@ApiModelProperty(value = "款式名称")
private java.lang.String styleId;
/**工段代码*/
@Excel(name = "工段代码", width = 15)
@ApiModelProperty(value = "工段代码")
private java.lang.String worksectionCode;
/**合计(手工TMU)*/
@Excel(name = "合计(手工TMU)", width = 15)
@ApiModelProperty(value = "合计(手工TMU)")
private java.lang.Integer totalManualTmu;
/**合计(机器TMU)*/
@Excel(name = "合计(机器TMU)", width = 15)
@ApiModelProperty(value = "合计(机器TMU)")
private java.lang.Integer totalMachineTmu;
/**合计(手工秒)*/
@Excel(name = "合计(手工秒)", width = 15)
@ApiModelProperty(value = "合计(手工秒)")
private java.lang.Integer totalMaunal;
/**合计(机器秒)*/
@Excel(name = "合计(机器秒)", width = 15)
@ApiModelProperty(value = "合计(机器秒)")
private java.lang.Integer totalMachine;
/**编号*/
@Excel(name = "编号", width = 15)
@ApiModelProperty(value = "编号")
private java.lang.String nums;
/**部件名称*/
@Excel(name = "部件名称", width = 15)
@ApiModelProperty(value = "部件名称")
private java.lang.String partsName;
/**描述*/
@Excel(name = "描述", width = 15)
@ApiModelProperty(value = "描述")
private java.lang.String description;
}

@ -1,5 +1,6 @@
package org.jeecg.modules.zyclothsstyle.controller; package org.jeecg.modules.zyclothsstyle.controller;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -18,6 +19,16 @@ 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.base.entity.ZyClothsComponent;
import org.jeecg.modules.demo.base.entity.ZyClothsModular;
import org.jeecg.modules.demo.base.entity.ZyClothsType;
import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
import org.jeecg.modules.demo.base.service.IZyClothsModularService;
import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
import org.jeecg.modules.demo.pro.entity.NewZyProcessComponent;
import org.jeecg.modules.demo.pro.entity.ZyProcessComponent;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.service.ISysDepartService;
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.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
@ -49,6 +60,15 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class ZyClothsStyleController extends JeecgController<ZyClothsStyle, IZyClothsStyleService> { public class ZyClothsStyleController extends JeecgController<ZyClothsStyle, IZyClothsStyleService> {
@Autowired @Autowired
private IZyClothsStyleService zyClothsStyleService; private IZyClothsStyleService zyClothsStyleService;
@Autowired
private IZyClothsComponentService zyClothsComponentService;
@Autowired
private ISysDepartService sysDepartService;
@Autowired
private IZyClothsModularService zyClothsModularService;
@Autowired
private IZyClothsTypeService zyClothsTypeService;
/** /**
* 分页列表查询 * 分页列表查询
@ -72,6 +92,60 @@ public class ZyClothsStyleController extends JeecgController<ZyClothsStyle, IZyC
return Result.OK(pageList); return Result.OK(pageList);
} }
/**
*
* @return
*/
@AutoLog(value = "服装款式表-查询所有")
@ApiOperation(value="服装款式表-查询所有", notes="服装款式表-查询所有")
@GetMapping(value = "/findAll")
public Result<?> findAll() {
List<ZyClothsStyle> list = zyClothsStyleService.list();
for(ZyClothsStyle zycl : list){
String id = zycl.getEnterpriseId();
if(id != null){
SysDepart byId = sysDepartService.getById(id);
zycl.setEnterpriseId(byId.getDepartName());
}
}
return Result.OK(list);
}
/**
* 制衣部件
* @return
*/
@AutoLog(value = "服装款式表-制衣部件查询所有")
@ApiOperation(value="服装款式表-制衣部件查询所有", notes="服装款式表-制衣部件查询所有")
@GetMapping(value = "/cloCfindAll")
public Result<?> cloCfindAll() {
List<ZyClothsComponent> list = zyClothsComponentService.list();
for(ZyClothsComponent zycl : list){
String id = zycl.getModularId();
String enterpriseId = zycl.getEnterpriseId();
/*if(id!=null || (enterpriseId !=null&&enterpriseId.isEmpty())){
ZyClothsType byId = zyClothsTypeService.getById(id);
SysDepart byId1 = sysDepartService.getById(enterpriseId);
zycl.setClothsTypeId(byId.getTypeName());
zycl.setEnterpriseId(byId1.getDepartName());
}*/
if(id!=null){
ZyClothsModular byId = zyClothsModularService.getById(id);
zycl.setModularId(byId.getModularName());
}
}
/*if(id!=null || (enterpriseId !=null&&enterpriseId.isEmpty())){
ZyClothsType byId = zyClothsTypeService.getById(id);
SysDepart byId1 = sysDepartService.getById(enterpriseId);
zycl.setClothsTypeId(byId.getTypeName());
zycl.setEnterpriseId(byId1.getDepartName());
}*/
return Result.OK(list);
}
/** /**
* 添加 * 添加
* *

Loading…
Cancel
Save