diff --git a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
index 9eefdb9f..90a5db78 100644
--- a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
+++ b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
@@ -1,53 +1,60 @@
-
-
-
-
暂无视频
-
-
-
-
-
-
- 频率: |
- {{tableModel.freq}} |
-
-
- 描述: |
- {{tableModel.descr}} |
-
-
- 机器TMU: |
- {{tableModel.machineTmu}} |
-
-
- 手工TMU: |
- {{tableModel.machineTmu}} |
-
-
- 编号: |
- {{tableModel.nums}} |
-
-
+
+
+
动作{{index+1}}
+
+
+
+
暂无视频
+
+
+
+
+
+
+ 频率: |
+ {{item.freq}} |
+
+
+ 描述: |
+ {{item.descr}} |
+
+
+ 机器TMU: |
+ {{item.machineTmu}} |
+
+
+ 手工TMU: |
+ {{item.machineTmu}} |
+
+
+ 编号: |
+ {{item.nums}} |
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesFormDetail.vue b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesFormDetail.vue
index 9cd876f0..b21921a2 100644
--- a/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesFormDetail.vue
+++ b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesFormDetail.vue
@@ -7,7 +7,22 @@
@ok="handleOk"
@cancel="handleCancel">
黄淮学院服装智能制造管理平台 - 工序面料
-
+
+
+
+
+
暂无视频
+
+
+ 工序: |
+ {{model.processId}} |
+
+
+ 面料: |
+ {{model.accessoriesId}} |
+
+
+
@@ -25,6 +40,9 @@ import processAccessories from '@/components/procedure/processAccessories'
return {
code:'',
id:'',
+ img:'',//图片地址
+ img1:require('@/assets/9-2.png'),// 默认图片
+ mp4:'',//视频地址
model:{
},
visible:false,
diff --git a/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue
index 49b68453..ab8afcf4 100644
--- a/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue
+++ b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue
@@ -7,7 +7,22 @@
@ok="handleOk"
@cancel="handleCancel">
黄淮学院服装智能制造管理平台 - 工序辅料
-
+
+
+
+
+
暂无视频
+
+
+ 工序: |
+ {{model.processId}} |
+
+
+ 面料: |
+ {{model.fabricId}} |
+
+
+
@@ -25,6 +40,9 @@ import processFabric from '@/components/procedure/processFabric'
return {
code:'',
id:'',
+ img:'',//图片地址
+ img1:require('@/assets/9-2.png'),// 默认图片
+ mp4:'',//视频地址
model:{
},
visible:false,
@@ -44,7 +62,7 @@ import processFabric from '@/components/procedure/processFabric'
methods: {
showModal(id) {
this.visible = true;
- this.$http.get('pro/zyProcessFabric/queryById?id='+id).then(
+ this.$http.get('/pro/zyProcessFabric/queryById?id='+id).then(
res=>{
this.model = res.result
}
diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue b/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
index 58248626..27e5addf 100644
--- a/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
@@ -75,7 +75,7 @@
更多
- 详情
+ 详情
handleDelete(record.id)">
@@ -90,6 +90,7 @@
+
@@ -99,12 +100,13 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyAccessoriesModal from './modules/ZyAccessoriesModal'
+ import ZyAccessoriesFormDetail from './modules/ZyAccessoriesFormDetail'
export default {
name: 'ZyAccessoriesList',
mixins:[JeecgListMixin, mixinDevice],
components: {
- ZyAccessoriesModal
+ ZyAccessoriesModal,ZyAccessoriesFormDetail
},
data () {
return {
@@ -176,7 +178,7 @@
deleteBatch: "/accessories/zyAccessories/deleteBatch",
exportXlsUrl: "/accessories/zyAccessories/exportXls",
importExcelUrl: "accessories/zyAccessories/importExcel",
-
+
},
dictOptions:{},
superFieldList:[],
@@ -204,6 +206,9 @@
fieldList.push({type:'int',value:'store',text:'库存量'})
fieldList.push({type:'string',value:'supplierInfo',text:'供货商信息'})
this.superFieldList = fieldList
+ },
+ handleDetail(id){
+ this.$refs.ZyAccessoriesFormDetail.showModal(id)
}
}
}
diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue
new file mode 100644
index 00000000..9aaebfc7
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue
@@ -0,0 +1,98 @@
+
+
+
+ 黄淮学院服装智能制造管理平台 - 辅料管理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
index 0f0a0de4..d0633887 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
@@ -7,7 +7,7 @@
@ok="handleOk"
@cancel="handleCancel">
黄淮学院服装智能制造管理平台 - 基础动作
-
+
@@ -25,6 +25,7 @@ import basicAction from '@/components/procedure/basicAction'
return {
model:{
},
+ id:'',
img:'',//图片地址
img1:require('@/assets/9-2.png'),// 默认图片
mp4:'',//视频地址
@@ -40,6 +41,8 @@ import basicAction from '@/components/procedure/basicAction'
this.$http.get('base/zyClothAction/queryById?id='+id).then(
res=>{
this.model = res.result
+ console.log('this.model')
+ console.log(this.model)
}
)
},
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 b986e14b..ff1e96c9 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
@@ -28,24 +28,28 @@
-
-
基础动作
-
+
+
基础动作
+
-
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleForm.vue b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleForm.vue
new file mode 100644
index 00000000..db0f7917
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleForm.vue
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.Style#Drawer.vue b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.Style#Drawer.vue
new file mode 100644
index 00000000..2b8c0405
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue
new file mode 100644
index 00000000..2495da71
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java
new file mode 100644
index 00000000..4e116232
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java
@@ -0,0 +1,269 @@
+package org.jeecg.modules.zystylemodule.controller;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.ZyClothsModular;
+import org.jeecg.modules.demo.base.entity.ZyClothsType;
+import org.jeecg.modules.demo.base.service.IZyClothsModularService;
+import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
+import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
+import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
+import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
+import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
+import org.jeecg.modules.zystylemodule.service.INewZyStyleModuleService;
+import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 款式模块表
+ * @Author: jeecg-boot
+ * @Date: 2022-09-08
+ * @Version: V1.0
+ */
+@Api(tags="款式模块表")
+@RestController
+@RequestMapping("/zystylemodule/zyStyleModule")
+@Slf4j
+public class ZyStyleModuleController extends JeecgController
{
+ @Autowired
+ private IZyStyleModuleService zyStyleModuleService;
+ @Autowired
+ private IZyClothsModularService zyClothsModularService;
+ @Autowired
+ private IZyClothsStyleService zyClothsStyleService;
+ @Autowired
+ private IZyClothsTypeService zyClothsTypeService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param zyStyleModule2
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "款式模块表-分页列表查询")
+ @ApiOperation(value="款式模块表-分页列表查询", notes="款式模块表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryPageList(ZyStyleModule zyStyleModule2,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+
+ List listNewStyleModules = new ArrayList<>();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ if(zyStyleModule2.getStyleId()!=null || zyStyleModule2.getModularId()!=null || zyStyleModule2.getTypeId()!=null){
+ if(zyStyleModule2.getStyleId()!=null){
+ queryWrapper.eq("style_id",zyStyleModule2.getStyleId());
+ }
+ if(zyStyleModule2.getModularId()!=null){
+ queryWrapper.eq("modular_id",zyStyleModule2.getModularId());
+ }
+ if(zyStyleModule2.getTypeId()!=null){
+ queryWrapper.eq("type_id",zyStyleModule2.getTypeId());
+ }
+ }
+ List list = zyStyleModuleService.list(queryWrapper);
+ for (ZyStyleModule zyStyleModule : list){
+ NewStyleModule newSeMo = new NewStyleModule();
+ //编辑回显
+ newSeMo.setId(zyStyleModule.getId());
+ newSeMo.setTypeId(zyStyleModule.getTypeId());
+ newSeMo.setStyleId(zyStyleModule.getStyleId());
+ newSeMo.setModularId(zyStyleModule.getModularId());
+ //款式编号和名称
+ String styleId = zyStyleModule.getStyleId();
+ ZyClothsStyle styleById = zyClothsStyleService.getById(styleId);
+ newSeMo.setStyleNums(styleById.getNums());
+ newSeMo.setStyleNames(styleById.getStyleNames());
+ //模块编号和名称
+ String modularId = zyStyleModule.getModularId();
+ ZyClothsModular modularById = zyClothsModularService.getById(modularId);
+ newSeMo.setModularNums(modularById.getNums());
+ newSeMo.setModularName(modularById.getModularName());
+ //服装类型
+ String typeId = zyStyleModule.getTypeId();
+ ZyClothsType typeById = zyClothsTypeService.getById(typeId);
+ newSeMo.setTypeName(typeById.getTypeName());
+ listNewStyleModules.add(newSeMo);
+ }
+ Page page = new Page();
+ int size = listNewStyleModules.size();
+ if (pageSize > size && size!=0) {
+ pageSize = size;
+ }
+ // 求出最大页数,防止currentPage越界
+ int maxPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1;
+ if (pageNo > maxPage) {
+ pageNo = maxPage;
+ }
+ // 当前页第一条数据的下标
+ int curIdx = pageNo > 1 ? (pageNo - 1) * pageSize : 0;
+ List pageList = new ArrayList();
+ // 将当前页的数据放进pageList
+ for (int i = 0; i < pageSize && curIdx + i < size; i++) {
+ pageList.add(listNewStyleModules.get(curIdx + i));
+ }
+ page.setCurrent(pageNo).setSize(pageSize).setTotal(listNewStyleModules.size()).setRecords(pageList);
+ return Result.OK(page);
+ }
+ /**
+ * 分页列表查询
+ *
+ * @param zyStyleModule
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "款式模块表-分页列表查询")
+ @ApiOperation(value="款式模块表-分页列表查询", notes="款式模块表-分页列表查询")
+ @GetMapping(value = "/list1")
+ public Result> queryPageList1(ZyStyleModule zyStyleModule,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyStyleModule, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+
+ IPage pageList = zyStyleModuleService.page(page, queryWrapper);
+ System.out.println(zyStyleModule);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param zyStyleModule
+ * @return
+ */
+ @AutoLog(value = "款式模块表-添加")
+ @ApiOperation(value="款式模块表-添加", notes="款式模块表-添加")
+ //@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:add")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody ZyStyleModule zyStyleModule) {
+ zyStyleModuleService.save(zyStyleModule);
+ return Result.OK("添加成功!");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param zyStyleModule
+ * @return
+ */
+ @AutoLog(value = "款式模块表-编辑")
+ @ApiOperation(value="款式模块表-编辑", notes="款式模块表-编辑")
+ //@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result edit(@RequestBody ZyStyleModule zyStyleModule) {
+ zyStyleModuleService.updateById(zyStyleModule);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "款式模块表-通过id删除")
+ @ApiOperation(value="款式模块表-通过id删除", notes="款式模块表-通过id删除")
+ //@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:delete")
+ @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name="id",required=true) String id) {
+ zyStyleModuleService.removeById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "款式模块表-批量删除")
+ @ApiOperation(value="款式模块表-批量删除", notes="款式模块表-批量删除")
+ //@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.zyStyleModuleService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "款式模块表-通过id查询")
+ @ApiOperation(value="款式模块表-通过id查询", notes="款式模块表-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result> queryById(@RequestParam(name="id",required=true) String id) {
+ ZyStyleModule zyStyleModule = zyStyleModuleService.getById(id);
+ if(zyStyleModule==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(zyStyleModule);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param zyStyleModule
+ */
+ //@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ZyStyleModule zyStyleModule) {
+ return super.exportXls(request, zyStyleModule, ZyStyleModule.class, "款式模块表");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("zy_style_module:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, ZyStyleModule.class);
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/NewStyleModule.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/NewStyleModule.java
new file mode 100644
index 00000000..00a5da4e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/NewStyleModule.java
@@ -0,0 +1,54 @@
+package org.jeecg.modules.zystylemodule.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+@Data
+public class NewStyleModule {
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**类型id*/
+ @Excel(name = "类型id", width = 15, dictTable = "zy_cloths_type", dicText = "id", dicCode = "type_name")
+ @Dict(dictTable = "zy_cloths_type", dicText = "id", dicCode = "type_name")
+ @ApiModelProperty(value = "类型id")
+ private String typeId;
+ /**款式id*/
+ @Excel(name = "款式id", width = 15, dictTable = "zy_cloths_style", dicText = "id", dicCode = "style_names")
+ @Dict(dictTable = "zy_cloths_style", dicText = "id", dicCode = "style_names")
+ @ApiModelProperty(value = "款式id")
+ private String styleId;
+ /**模块id*/
+ @Excel(name = "模块id", width = 15, dictTable = "zy_cloths_modular ", dicText = "id", dicCode = "modular_name")
+ @Dict(dictTable = "zy_cloths_modular ", dicText = "id", dicCode = "modular_name")
+ @ApiModelProperty(value = "模块id")
+ private String modularId;
+
+ /**类型名称*/
+ @Excel(name = "服装类型名称", width = 15)
+ @ApiModelProperty(value = "服装类型名称")
+ private java.lang.String typeName;
+
+ /**编号*/
+ @Excel(name = "款式编号", width = 15)
+ @ApiModelProperty(value = "款式编号")
+ private String styleNums;
+ /**名称*/
+ @Excel(name = "款式名称", width = 15)
+ @ApiModelProperty(value = "款式名称")
+ private String styleNames;
+
+ /**编号*/
+ @Excel(name = "模块编号", width = 15)
+ @ApiModelProperty(value = "模块编号")
+ private java.lang.String modularNums;
+ /**模块名称*/
+ @Excel(name = "模块名称", width = 15)
+ @ApiModelProperty(value = "模块名称")
+ private java.lang.String modularName;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/ZyStyleModule.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/ZyStyleModule.java
new file mode 100644
index 00000000..bfcddb78
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/ZyStyleModule.java
@@ -0,0 +1,58 @@
+package org.jeecg.modules.zystylemodule.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 款式模块表
+ * @Author: jeecg-boot
+ * @Date: 2022-09-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("zy_style_module")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="zy_style_module对象", description="款式模块表")
+public class ZyStyleModule implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**类型id*/
+ @Excel(name = "类型id", width = 15, dictTable = "zy_cloths_type", dicText = "id", dicCode = "type_name")
+ @Dict(dictTable = "zy_cloths_type", dicText = "id", dicCode = "type_name")
+ @ApiModelProperty(value = "类型id")
+ private String typeId;
+ /**款式id*/
+ @Excel(name = "款式id", width = 15, dictTable = "zy_cloths_style", dicText = "id", dicCode = "style_names")
+ @Dict(dictTable = "zy_cloths_style", dicText = "id", dicCode = "style_names")
+ @ApiModelProperty(value = "款式id")
+ private String styleId;
+ /**模块id*/
+ @Excel(name = "模块id", width = 15, dictTable = "zy_cloths_modular ", dicText = "id", dicCode = "modular_name")
+ @Dict(dictTable = "zy_cloths_modular ", dicText = "id", dicCode = "modular_name")
+ @ApiModelProperty(value = "模块id")
+ private String modularId;
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/ZyStyleModuleMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/ZyStyleModuleMapper.java
new file mode 100644
index 00000000..a08233c1
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/ZyStyleModuleMapper.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.zystylemodule.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
+
+/**
+ * @Description: 款式模块表
+ * @Author: jeecg-boot
+ * @Date: 2022-09-08
+ * @Version: V1.0
+ */
+public interface ZyStyleModuleMapper extends BaseMapper {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/xml/ZyStyleModuleMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/xml/ZyStyleModuleMapper.xml
new file mode 100644
index 00000000..e69055c2
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/xml/ZyStyleModuleMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/INewZyStyleModuleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/INewZyStyleModuleService.java
new file mode 100644
index 00000000..5995e4ed
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/INewZyStyleModuleService.java
@@ -0,0 +1,8 @@
+package org.jeecg.modules.zystylemodule.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
+import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
+
+public interface INewZyStyleModuleService extends IService {
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/IZyStyleModuleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/IZyStyleModuleService.java
new file mode 100644
index 00000000..94425386
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/IZyStyleModuleService.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.zystylemodule.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
+import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
+
+import java.util.List;
+
+/**
+ * @Description: 款式模块表
+ * @Author: jeecg-boot
+ * @Date: 2022-09-08
+ * @Version: V1.0
+ */
+public interface IZyStyleModuleService extends IService {
+
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/NewZyStyleModuleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/NewZyStyleModuleServiceImpl.java
new file mode 100644
index 00000000..35302685
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/NewZyStyleModuleServiceImpl.java
@@ -0,0 +1,62 @@
+package org.jeecg.modules.zystylemodule.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
+import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
+import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper;
+import org.jeecg.modules.zystylemodule.service.INewZyStyleModuleService;
+import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Function;
+@Service
+public class NewZyStyleModuleServiceImpl implements INewZyStyleModuleService {
+ @Override
+ public boolean saveBatch(Collection entityList, int batchSize) {
+ return false;
+ }
+
+ @Override
+ public boolean saveOrUpdateBatch(Collection entityList, int batchSize) {
+ return false;
+ }
+
+ @Override
+ public boolean updateBatchById(Collection entityList, int batchSize) {
+ return false;
+ }
+
+ @Override
+ public boolean saveOrUpdate(NewStyleModule entity) {
+ return false;
+ }
+
+ @Override
+ public NewStyleModule getOne(Wrapper queryWrapper, boolean throwEx) {
+ return null;
+ }
+
+ @Override
+ public Map getMap(Wrapper queryWrapper) {
+ return null;
+ }
+
+ @Override
+ public V getObj(Wrapper queryWrapper, Function super Object, V> mapper) {
+ return null;
+ }
+
+ @Override
+ public BaseMapper getBaseMapper() {
+ return null;
+ }
+
+ @Override
+ public Class getEntityClass() {
+ return null;
+ }
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java
new file mode 100644
index 00000000..a0173d1e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java
@@ -0,0 +1,20 @@
+package org.jeecg.modules.zystylemodule.service.impl;
+
+
+import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
+import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper;
+import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 款式模块表
+ * @Author: jeecg-boot
+ * @Date: 2022-09-08
+ * @Version: V1.0
+ */
+@Service
+public class ZyStyleModuleServiceImpl extends ServiceImpl implements IZyStyleModuleService {
+
+}