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

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

@@ -48,20 +48,24 @@
       <!--      </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 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 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">
+        <a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns2" :data-source="data2"
+                 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="columns3" :data-source="data3" rowKey="id" bordered :pagination="false">
+        <a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns3" :data-source="data3"
+                 rowKey="id" bordered :pagination="false">
 
         </a-table>
 
@@ -71,7 +75,8 @@
         <!--      </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">
+        <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-spin>
@@ -116,7 +121,7 @@
     dataIndex: 'createTime',
     key: 'createTime',
     align: 'center'
-    },
+  }
 ];
 const columns = [
   {
@@ -340,8 +345,7 @@
   data() {
     return {
       visible: false,
-        model:{
-        },
+      model: {},
       confirmLoading: true,
       // 管理模块
       data: [],
@@ -389,9 +393,10 @@
         });
       }
       this.confirmLoading = false
-        if(this.data1.length == 0){
-          this.data1.push(res.result.zyClothsStyle)
+      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
@@ -411,7 +416,17 @@
 }
 </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

@@ -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);
 }