diff --git a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
index 641b5ce5..9eefdb9f 100644
--- a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
+++ b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
@@ -34,6 +34,12 @@
 <script>
   export default {
     name: 'basicAction',
+    // props:{
+    //   tableModel:{
+    //     type:Array,
+    //     default: () =>({})
+    //   }
+    //   },
     props:['tableModel'],
     data () {
       return {
@@ -47,8 +53,9 @@
         validatorRules: {
         },
       }},
-    methods: {
-    }
+    created() {
+    },
+    methods: {}
       }
 </script>
 <style scoped>
diff --git a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
index f06fad2f..5e251fdb 100644
--- a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
+++ b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
@@ -31,6 +31,15 @@
         validatorRules: {
         },
       }},
+    created() {
+      console.log('this.tableModel')
+      console.log(this.tableModel)
+    },
+    mounted() {
+      console.log('this.tableModel')
+      console.log(this.tableModel)
+
+    }
   }
 </script>
 <style scoped>
diff --git a/ant-design-vue-jeecg/src/components/procedure/zyProcess.vue b/ant-design-vue-jeecg/src/components/procedure/zyProcess.vue
new file mode 100644
index 00000000..46708f3f
--- /dev/null
+++ b/ant-design-vue-jeecg/src/components/procedure/zyProcess.vue
@@ -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>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue b/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue
index 464567b8..2bc5a4e2 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue
@@ -75,7 +75,7 @@
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
               <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
+                <a @click="handleDetail(record.id)">详情</a>
               </a-menu-item>
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -90,6 +90,7 @@
     </div>
 
     <zy-process-component-modal ref="modalForm" @ok="modalFormOk"></zy-process-component-modal>
+    <ZyProcessComponentFormDetail ref="ZyProcessComponentFormDetail"></ZyProcessComponentFormDetail>
   </a-card>
 </template>
 
@@ -99,13 +100,14 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ZyProcessComponentModal from './modules/ZyProcessComponentModal'
+  import ZyProcessComponentFormDetail from './modules/ZyProcessComponentFormDetail'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'ZyProcessComponentList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      ZyProcessComponentModal
+      ZyProcessComponentModal,ZyProcessComponentFormDetail
     },
     data () {
       return {
@@ -174,6 +176,9 @@
         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'})
         this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyProcessComponentFormDetail.showModal(id)
       }
     }
   }
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentFormDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentFormDetail.vue
new file mode 100644
index 00000000..78200417
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentFormDetail.vue
@@ -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>
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
index 56262f57..b986e14b 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
@@ -11,93 +11,41 @@
     >
       <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>
-        <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%;">
-          <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="mp4 != ''" :src="mp4" 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>
+<!--        基本工序-->
+        <zyProcess :data="ProcessData"></zyProcess>
       </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>
+      <!--      <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">
         <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>
+
     </a-modal>
   </div>
 </template>
 <script>
+  import zyProcess from '@/components/procedure/zyProcess'
+  import basicAction from '@/components/procedure/basicAction'
+  import processFabric from '@/components/procedure/processFabric'
   export default {
+    components:{zyProcess,basicAction,processFabric},
     data() {
       return{
         ModalText: 'Content of the modal',
@@ -108,9 +56,12 @@
         img1:require('@/assets/9-2.png'),//默认图片
         mp4:'',
         data:{},
+        ProcessData:{},
+        basicActionData:[],
+        accessoriesData:[],
         headStyle:{
           height:'10px'
-        }
+        },
       }
     },
     created(){
@@ -121,9 +72,14 @@
         this.$http.get('/base/zyProcess/queryById?id='+id).then(
           res=>{
             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.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio;
-            console.log(this.data)
           }
         )
       },
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
index cb622d55..fc5b1800 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
@@ -13,6 +13,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
+import org.jeecg.modules.demo.base.entity.ZyClothsModular;
+import org.jeecg.modules.demo.base.entity.ZyClothsType;
 import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo;
 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 lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.demo.base.service.IZyClothsModularService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,6 +53,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ZyClothsComponentController extends JeecgController<ZyClothsComponent, IZyClothsComponentService> {
 	@Autowired
 	private IZyClothsComponentService zyClothsComponentService;
+	 @Autowired
+	 private IZyClothsModularService zyClothsModularService;
 
 	/**
 	 * 分页列表查询
@@ -73,6 +78,22 @@ public class ZyClothsComponentController extends JeecgController<ZyClothsCompone
 		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);
+	 }
 	/**
 	 *   添加
 	 *
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
index 0bfb4016..cb4018e2 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsModularController.java
@@ -13,6 +13,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 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 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 lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 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> {
 	@Autowired
 	private IZyClothsModularService zyClothsModularService;
+	 @Autowired
+	 private IZyClothsTypeService zyClothsTypeService;
+
 
 	/**
 	 * 分页列表查询
@@ -72,6 +77,22 @@ public class ZyClothsModularController extends JeecgController<ZyClothsModular,
 		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);
+	 }
+
 	/**
 	 *   添加
 	 *
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java
index 07352809..27356ca9 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.demo.pro.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -12,6 +13,11 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
+import org.jeecg.modules.demo.base.entity.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.service.IZyProcessComponentService;
 
@@ -49,6 +55,10 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ZyProcessComponentController extends JeecgController<ZyProcessComponent, IZyProcessComponentService> {
 	@Autowired
 	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);
 	}
 
+	 /**
+	  *
+	  */
+	 @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);
+	 }
 	/**
 	 *   添加
 	 *
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/NewZyProcessComponent.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/NewZyProcessComponent.java
new file mode 100644
index 00000000..a87c6b99
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/NewZyProcessComponent.java
@@ -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;
+
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/controller/ZyClothsStyleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/controller/ZyClothsStyleController.java
index 49463a3a..37c3449d 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/controller/ZyClothsStyleController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/controller/ZyClothsStyleController.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.zyclothsstyle.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -18,6 +19,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.demo.base.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.service.IZyClothsStyleService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -49,7 +60,16 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ZyClothsStyleController extends JeecgController<ZyClothsStyle, IZyClothsStyleService> {
 	@Autowired
 	private IZyClothsStyleService zyClothsStyleService;
-	
+	 @Autowired
+	 private IZyClothsComponentService zyClothsComponentService;
+
+	 @Autowired
+	 private ISysDepartService sysDepartService;
+	 @Autowired
+	 private IZyClothsModularService zyClothsModularService;
+	 @Autowired
+	 private IZyClothsTypeService zyClothsTypeService;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +91,61 @@ public class ZyClothsStyleController extends JeecgController<ZyClothsStyle, IZyC
 		IPage<ZyClothsStyle> pageList = zyClothsStyleService.page(page, queryWrapper);
 		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);
+
+	 }
 	/**
 	 *   添加
 	 *