新增
-
导出
+
导出
@@ -124,7 +124,7 @@
xs: { span: 24 },
sm: { span: 16 },
},
- description: '面料表管理页面',
+ description: '辅料表管理页面',
// 表头
columns: [
{
@@ -148,12 +148,12 @@
dataIndex: 'processId_dictText'
},
{
- title:'面料编号',
+ title:'辅料编号',
align:"center",
dataIndex: 'accessoriesId'
},
{
- title:'面料',
+ title:'辅料',
align:"center",
dataIndex: 'accessoriesId_dictText'
},
@@ -172,7 +172,7 @@
deleteBatch: "/pro/zyProcessAccessories/deleteBatch",
exportXlsUrl: "/pro/zyProcessAccessories/exportXls",
importExcelUrl: "pro/zyProcessAccessories/importExcel",
-
+
},
dictOptions:{},
superFieldList:[],
@@ -190,7 +190,7 @@
edit (record) {
this.id = record;
this.queryParam.processId=this.id;
- console.log("燕慧森1号")
+ // console.log("燕慧森1号")
this.loadData();
this.visible = true;
@@ -200,7 +200,7 @@
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'popup',value:'processId',text:'工序表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
- fieldList.push({type:'popup',value:'accessoriesId',text:'面料表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
+ fieldList.push({type:'popup',value:'accessoriesId',text:'辅料表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
this.superFieldList = fieldList
}
}
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
index 6467e719..5d250d7e 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
@@ -10,8 +10,8 @@
-
-
+
+
@@ -153,12 +153,12 @@
dataIndex: 'processId_dictText'
},
{
- title:'辅料编号',
+ title:'面料编号',
align:"center",
dataIndex: 'fabricId'
},
{
- title:'辅料',
+ title:'面料',
align:"center",
dataIndex: 'fabricId_dictText'
},
@@ -195,7 +195,7 @@
edit (record) {
this.id = record;
this.queryParam.processId=this.id;
- console.log("燕慧森1号")
+ // console.log("燕慧森1号")
this.loadData();
this.visible = true;
},
@@ -204,7 +204,7 @@
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'processId',text:'工序',dictCode:'zy_process,process_name,id'})
- fieldList.push({type:'string',value:'fabricId',text:'辅料',dictCode:'zy_fabric,name,id'})
+ fieldList.push({type:'string',value:'fabricId',text:'面料',dictCode:'zy_fabric,name,id'})
this.superFieldList = fieldList
}
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMcController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMcController.java
new file mode 100644
index 00000000..9740ee69
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMcController.java
@@ -0,0 +1,155 @@
+package org.jeecg.modules.demo.base.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.demo.base.entity.ZyClothsMc;
+import org.jeecg.modules.demo.base.service.IZyClothsMcService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+ /**
+ * @Description: 制衣模块和模块部件中间表
+ * @Author: jeecg-boot
+ * @Date: 2022-11-14
+ * @Version: V1.0
+ */
+@Api(tags="制衣模块和模块部件中间表")
+@RestController
+@RequestMapping("/zyClothsMc/zyClothsMc")
+@Slf4j
+public class ZyClothsMcController extends JeecgController {
+ @Autowired
+ private IZyClothsMcService zyClothsMcService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param zyClothsMc
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "制衣模块和模块部件中间表-分页列表查询")
+ @ApiOperation(value="制衣模块和模块部件中间表-分页列表查询", notes="制衣模块和模块部件中间表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result queryPageList(ZyClothsMc zyClothsMc,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyClothsMc, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = zyClothsMcService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param zyClothsMc
+ * @return
+ */
+ @AutoLog(value = "制衣模块和模块部件中间表-添加")
+ @ApiOperation(value="制衣模块和模块部件中间表-添加", notes="制衣模块和模块部件中间表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody ZyClothsMc zyClothsMc) {
+ zyClothsMcService.save(zyClothsMc);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param zyClothsMc
+ * @return
+ */
+ @AutoLog(value = "制衣模块和模块部件中间表-编辑")
+ @ApiOperation(value="制衣模块和模块部件中间表-编辑", notes="制衣模块和模块部件中间表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@RequestBody ZyClothsMc zyClothsMc) {
+ zyClothsMcService.updateById(zyClothsMc);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "制衣模块和模块部件中间表-通过id删除")
+ @ApiOperation(value="制衣模块和模块部件中间表-通过id删除", notes="制衣模块和模块部件中间表-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name="id",required=true) String id) {
+ zyClothsMcService.removeById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "制衣模块和模块部件中间表-批量删除")
+ @ApiOperation(value="制衣模块和模块部件中间表-批量删除", notes="制衣模块和模块部件中间表-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.zyClothsMcService.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) {
+ ZyClothsMc zyClothsMc = zyClothsMcService.getById(id);
+ if(zyClothsMc==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(zyClothsMc);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param zyClothsMc
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ZyClothsMc zyClothsMc) {
+ return super.exportXls(request, zyClothsMc, ZyClothsMc.class, "制衣模块和模块部件中间表");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, ZyClothsMc.class);
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMccController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMccController.java
new file mode 100644
index 00000000..537206f1
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMccController.java
@@ -0,0 +1,155 @@
+package org.jeecg.modules.demo.base.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.demo.base.entity.ZyClothsMcc;
+import org.jeecg.modules.demo.base.service.IZyClothsMccService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+ /**
+ * @Description: 制衣模块部件和模块的中间表
+ * @Author: jeecg-boot
+ * @Date: 2022-11-14
+ * @Version: V1.0
+ */
+@Api(tags="制衣模块部件和模块的中间表")
+@RestController
+@RequestMapping("/zyClothsMcc/zyClothsMcc")
+@Slf4j
+public class ZyClothsMccController extends JeecgController {
+ @Autowired
+ private IZyClothsMccService zyClothsMccService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param zyClothsMcc
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "制衣模块部件和模块的中间表-分页列表查询")
+ @ApiOperation(value="制衣模块部件和模块的中间表-分页列表查询", notes="制衣模块部件和模块的中间表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result queryPageList(ZyClothsMcc zyClothsMcc,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyClothsMcc, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = zyClothsMccService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param zyClothsMcc
+ * @return
+ */
+ @AutoLog(value = "制衣模块部件和模块的中间表-添加")
+ @ApiOperation(value="制衣模块部件和模块的中间表-添加", notes="制衣模块部件和模块的中间表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody ZyClothsMcc zyClothsMcc) {
+ zyClothsMccService.save(zyClothsMcc);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param zyClothsMcc
+ * @return
+ */
+ @AutoLog(value = "制衣模块部件和模块的中间表-编辑")
+ @ApiOperation(value="制衣模块部件和模块的中间表-编辑", notes="制衣模块部件和模块的中间表-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@RequestBody ZyClothsMcc zyClothsMcc) {
+ zyClothsMccService.updateById(zyClothsMcc);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "制衣模块部件和模块的中间表-通过id删除")
+ @ApiOperation(value="制衣模块部件和模块的中间表-通过id删除", notes="制衣模块部件和模块的中间表-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name="id",required=true) String id) {
+ zyClothsMccService.removeById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "制衣模块部件和模块的中间表-批量删除")
+ @ApiOperation(value="制衣模块部件和模块的中间表-批量删除", notes="制衣模块部件和模块的中间表-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.zyClothsMccService.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) {
+ ZyClothsMcc zyClothsMcc = zyClothsMccService.getById(id);
+ if(zyClothsMcc==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(zyClothsMcc);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param zyClothsMcc
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ZyClothsMcc zyClothsMcc) {
+ return super.exportXls(request, zyClothsMcc, ZyClothsMcc.class, "制衣模块部件和模块的中间表");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, ZyClothsMcc.class);
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMc.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMc.java
new file mode 100644
index 00000000..9bbf6cf5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMc.java
@@ -0,0 +1,67 @@
+package org.jeecg.modules.demo.base.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-11-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("zy_cloths_mc")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="zy_cloths_mc对象", description="制衣模块和模块部件中间表")
+public class ZyClothsMc implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private Date updateTime;
+ /**所属部门*/
+ @ApiModelProperty(value = "所属部门")
+ private String sysOrgCode;
+ /**模块id*/
+ @Excel(name = "模块id", width = 15)
+ @ApiModelProperty(value = "模块id")
+ @Dict(dictTable = "zy_cloths_modular",dicText = "modular_name" ,dicCode = "id")
+ private String modularId;
+ /**模块部件id*/
+ @Excel(name = "模块部件id", width = 15)
+ @ApiModelProperty(value = "模块部件id")
+ @Dict(dicCode = "zyModularType")
+ private String mccid;
+}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMcc.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMcc.java
new file mode 100644
index 00000000..4435c2bd
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMcc.java
@@ -0,0 +1,67 @@
+package org.jeecg.modules.demo.base.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-11-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("zy_cloths_mcc")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="zy_cloths_mcc对象", description="制衣模块部件和模块的中间表")
+public class ZyClothsMcc implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private Date updateTime;
+ /**所属部门*/
+ @ApiModelProperty(value = "所属部门")
+ private String sysOrgCode;
+ /**模块部件id*/
+ @Excel(name = "模块部件id", width = 15)
+ @ApiModelProperty(value = "模块部件id")
+ @Dict(dicCode = "zyModularType")
+ private String mcid;
+ /**部件id*/
+ @Excel(name = "部件id", width = 15)
+ @ApiModelProperty(value = "部件id")
+ @Dict(dictTable = "zy_cloths_component",dicText = "parts_name",dicCode = "id")
+ private String componendId;
+}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMcMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMcMapper.java
new file mode 100644
index 00000000..05e9236e
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMcMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.demo.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.demo.base.entity.ZyClothsMc;
+
+/**
+ * @Description: 制衣模块和模块部件中间表
+ * @Author: jeecg-boot
+ * @Date: 2022-11-14
+ * @Version: V1.0
+ */
+public interface ZyClothsMcMapper extends BaseMapper {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMccMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMccMapper.java
new file mode 100644
index 00000000..54332f29
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMccMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.demo.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.demo.base.entity.ZyClothsMcc;
+
+/**
+ * @Description: 制衣模块部件和模块的中间表
+ * @Author: jeecg-boot
+ * @Date: 2022-11-14
+ * @Version: V1.0
+ */
+public interface ZyClothsMccMapper extends BaseMapper {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMcMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMcMapper.xml
new file mode 100644
index 00000000..a05402b1
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMcMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMccMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMccMapper.xml
new file mode 100644
index 00000000..3afbe857
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMccMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMcService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMcService.java
new file mode 100644
index 00000000..e9a6291d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMcService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.demo.base.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.demo.base.entity.ZyClothsMc;
+
+/**
+ * @Description: 制衣模块和模块部件中间表
+ * @Author: jeecg-boot
+ * @Date: 2022-11-14
+ * @Version: V1.0
+ */
+public interface IZyClothsMcService extends IService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMccService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMccService.java
new file mode 100644
index 00000000..c1ea3ab0
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMccService.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.demo.base.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.demo.base.entity.ZyClothsMcc;
+
+;
+
+/**
+ * @Description: 制衣模块部件和模块的中间表
+ * @Author: jeecg-boot
+ * @Date: 2022-11-14
+ * @Version: V1.0
+ */
+public interface IZyClothsMccService extends IService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMcServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMcServiceImpl.java
new file mode 100644
index 00000000..b53b88aa
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMcServiceImpl.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.demo.base.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.demo.base.entity.ZyClothsMc;
+import org.jeecg.modules.demo.base.mapper.ZyClothsMcMapper;
+import org.jeecg.modules.demo.base.service.IZyClothsMcService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 制衣模块和模块部件中间表
+ * @Author: jeecg-boot
+ * @Date: 2022-11-14
+ * @Version: V1.0
+ */
+@Service
+public class ZyClothsMcServiceImpl extends ServiceImpl implements IZyClothsMcService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMccServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMccServiceImpl.java
new file mode 100644
index 00000000..278611ce
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMccServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.demo.base.service.impl;
+
+import org.jeecg.modules.demo.base.entity.ZyClothsMcc;
+import org.jeecg.modules.demo.base.mapper.ZyClothsMccMapper;
+import org.jeecg.modules.demo.base.service.IZyClothsMccService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 制衣模块部件和模块的中间表
+ * @Author: jeecg-boot
+ * @Date: 2022-11-14
+ * @Version: V1.0
+ */
+@Service
+public class ZyClothsMccServiceImpl extends ServiceImpl implements IZyClothsMccService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java
index 2f893026..4fccd6a8 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java
@@ -98,7 +98,7 @@ public class ZyProcessAccessoriesController extends JeecgController pageList = zyProcessAccessoriesService.page1(page, s,t);
return Result.OK(pageList);
}
-
+
/**
* 添加
*
@@ -109,10 +109,16 @@ public class ZyProcessAccessoriesController extends JeecgController add(@RequestBody ZyProcessAccessories zyProcessAccessories) {
+ QueryWrapper s=new QueryWrapper();
+ s.eq("process_id",zyProcessAccessories.getProcessId());
+ s.eq("accessories_id",zyProcessAccessories.getAccessoriesId());
+ int a=zyProcessAccessoriesService.count(s);
+ if(a>=1)
+ return Result.error("已存在本信息");
zyProcessAccessoriesService.save(zyProcessAccessories);
return Result.OK("添加成功！");
}
-
+
/**
* 编辑
*
@@ -123,10 +129,16 @@ public class ZyProcessAccessoriesController extends JeecgController edit(@RequestBody ZyProcessAccessories zyProcessAccessories) {
+ QueryWrapper s=new QueryWrapper();
+ s.eq("process_id",zyProcessAccessories.getProcessId());
+ s.eq("accessories_id",zyProcessAccessories.getAccessoriesId());
+ int a=zyProcessAccessoriesService.count(s);
+ if(a>=1)
+ return Result.error("已存在本信息");
zyProcessAccessoriesService.updateById(zyProcessAccessories);
return Result.OK("编辑成功!");
}
-
+
/**
* 通过id删除
*
@@ -140,7 +152,7 @@ public class ZyProcessAccessoriesController extends JeecgController {
@Autowired
private IZyProcessActionService zyProcessActionService;
-
+
/**
* 分页列表查询
*
@@ -97,7 +97,7 @@ public class ZyProcessActionController extends JeecgController add(@RequestBody ZyProcessAction zyProcessAction) {
+ QueryWrapper s=new QueryWrapper();
+ s.eq("process_id",zyProcessAction.getProcessId());
+ s.eq("action_id",zyProcessAction.getActionId());
+ int a=zyProcessActionService.count(s);
+ if(a>=1)
+ return Result.error("已存在本信息");
zyProcessActionService.save(zyProcessAction);
return Result.OK("添加成功！");
}
-
+
/**
* 编辑
*
@@ -122,10 +128,16 @@ public class ZyProcessActionController extends JeecgController edit(@RequestBody ZyProcessAction zyProcessAction) {
+ QueryWrapper s=new QueryWrapper();
+ s.eq("process_id",zyProcessAction.getProcessId());
+ s.eq("action_id",zyProcessAction.getActionId());
+ int a=zyProcessActionService.count(s);
+ if(a>=1)
+ return Result.error("已存在本信息");
zyProcessActionService.updateById(zyProcessAction);
return Result.OK("编辑成功!");
}
-
+
/**
* 通过id删除
*
@@ -139,7 +151,7 @@ public class ZyProcessActionController extends JeecgController add(@RequestBody ZyProcessFabric zyProcessFabric) {
+ QueryWrapper s=new QueryWrapper();
+ s.eq("process_id",zyProcessFabric.getProcessId());
+ s.eq("fabric_id",zyProcessFabric.getFabricId());
+ int a=zyProcessFabricService.count(s);
+ if(a>=1)
+ return Result.error("已存在本信息");
zyProcessFabricService.save(zyProcessFabric);
return Result.OK("添加成功！");
}
@@ -120,6 +126,12 @@ public class ZyProcessFabricController extends JeecgController edit(@RequestBody ZyProcessFabric zyProcessFabric) {
+ QueryWrapper s=new QueryWrapper();
+ s.eq("process_id",zyProcessFabric.getProcessId());
+ s.eq("fabric_id",zyProcessFabric.getFabricId());
+ int a=zyProcessFabricService.count(s);
+ if(a>=1)
+ return Result.error("已存在本信息");
zyProcessFabricService.updateById(zyProcessFabric);
return Result.OK("编辑成功!");
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java
index 0cb60428..c7d7dafc 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java
@@ -105,6 +105,12 @@ public class ZyProcessMachineController extends JeecgController add(@RequestBody ZyProcessMachine zyProcessMachine) {
+ QueryWrapper s=new QueryWrapper();
+ s.eq("process_id",zyProcessMachine.getProcessId());
+ s.eq("machine_id",zyProcessMachine.getMachineId());
+ int a=zyProcessMachineService.count(s);
+ if(a>=1)
+ return Result.error("已存在本信息");
zyProcessMachineService.save(zyProcessMachine);
return Result.OK("添加成功！");
}
@@ -119,6 +125,12 @@ public class ZyProcessMachineController extends JeecgController edit(@RequestBody ZyProcessMachine zyProcessMachine) {
+ QueryWrapper s=new QueryWrapper();
+ s.eq("process_id",zyProcessMachine.getProcessId());
+ s.eq("machine_id",zyProcessMachine.getMachineId());
+ int a=zyProcessMachineService.count(s);
+ if(a>=1)
+ return Result.error("已存在本信息");
zyProcessMachineService.updateById(zyProcessMachine);
return Result.OK("编辑成功!");
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java
index 4e2b5017..d76f7a37 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.operationtool.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -88,6 +89,12 @@ public class ZyOperationtoolController extends JeecgController add(@RequestBody ZyOperationtool zyOperationtool) {
+ QueryWrapper s=new QueryWrapper();
+ s.eq("operationid",zyOperationtool.getOperationid());
+ s.eq("toolid",zyOperationtool.getToolid());
+ int a=zyOperationtoolService.count(s);
+ if(a>=1)
+ return Result.error("已存在本信息");
zyOperationtoolService.save(zyOperationtool);
return Result.OK("添加成功！");
}
@@ -102,6 +109,12 @@ public class ZyOperationtoolController extends JeecgController edit(@RequestBody ZyOperationtool zyOperationtool) {
+ QueryWrapper s=new QueryWrapper();
+ s.eq("operationid",zyOperationtool.getOperationid());
+ s.eq("toolid",zyOperationtool.getToolid());
+ int a=zyOperationtoolService.count(s);
+ if(a>=1)
+ return Result.error("已存在本信息");
zyOperationtoolService.updateById(zyOperationtool);
return Result.OK("编辑成功!");
}