From 661cce79cbe3667312a258826175a1bbb1cdbbbc Mon Sep 17 00:00:00 2001
From: mors <3067699729@qq.com>
Date: Wed, 21 Dec 2022 14:50:44 +0800
Subject: [PATCH] =?UTF-8?q?2022-12-21=20=E4=BF=AE=E6=94=B9=E4=BA=A7?=
=?UTF-8?q?=E5=93=81=E7=AE=A1=E7=90=86=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/ZyClothsStyleListDetail.vue | 781 +++++++++---------
.../mapper/ZyStyleModularMapper.java | 9 +
.../impl/ZyStyleModularServiceImpl.java | 8 +-
.../impl/ZyClothsComponentServiceImpl.java | 4 +
.../ZyClothsModularCompentServiceImpl.java | 8 +
.../impl/ZyProcessComponentServiceImpl.java | 7 +
.../impl/ZyStyleAccessoriesServiceImpl.java | 4 +
.../entity/vo/AllClothStyle.java | 2 +-
.../impl/ZyClothsStyleServiceImpl.java | 10 +-
.../mapper/ZyStyleFabricMapper.java | 8 +
10 files changed, 452 insertions(+), 389 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
index e8ce5ca1..63edb66b 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
@@ -8,410 +8,425 @@
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
- 款式详情
-
-
+ 款式详情
+
+
- 管理模块
-
-
+ 管理模块
+
+
- 管理面料
-
+ 管理面料
+
-
+
- 管理辅料
-
+ 管理辅料
+
-
+
- 管理型号
-
+ 管理型号
+
-
+
- 管理工序
-
+ 管理工序
+
-
+
+ handleCancel(e) {
+ this.visible = false;
+ },
+ },
+}
+
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/ZyStyleModularMapper.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/ZyStyleModularMapper.java
index 9e543fb6..1467a7ff 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/ZyStyleModularMapper.java
+++ b/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 {
List 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);
+
}
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/service/impl/ZyStyleModularServiceImpl.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/service/impl/ZyStyleModularServiceImpl.java
index ad3d6e47..de9abb09 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/service/impl/ZyStyleModularServiceImpl.java
+++ b/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 detail(String id) {
List 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;
}
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java
index 2f8794bf..e16c9f5e 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java
+++ b/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 zyClothsStyles;
/**子模块 款式模块*/
private List zyStyleModuleList;
/**子模块 款式面料*/
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java
index 2a652006..3612286a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java
+++ b/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 zyClothsStyles = detail(id);
+ zyAllClothStyle.setZyClothsStyles(zyClothsStyles);
//服装 款式 模块详情
List zyStyleModuleList = zyStyleModuleService.detail(id);
zyAllClothStyle.setZyStyleModuleList(zyStyleModuleList);
@@ -72,7 +72,7 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl detail(String id){
ZyClothsStyle zyClothsStyle = zyClothsStyleMapper.selectById(id);
//翻译规格 shape 和企业
String shape = zyClothsStyle.getShape();
@@ -90,7 +90,9 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl zyClothsStyles = new ArrayList<>();
+ zyClothsStyles.add(zyClothsStyle);
+ return zyClothsStyles;
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java
index f6beee5d..fdc219d1 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java
+++ b/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 {
@Select("SELECT * FROM zy_style_fabric WHERE style_id = #{id}")
List 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);
}