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

ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java

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