config

ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java

@@ -73,9 +73,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                         "/webjars/**",
                         "/websocket/**",
                         "/influx/**",
-                        "/basic/**",
+//                        "/basic/**",
-                        "/qualityPlanning/**",
+//                        "/qualityPlanning/**",
-                        "/processInspection/**",
+//                        "/processInspection/**",
                         "/captcha").anonymous()
 //                .antMatchers("/testCors").hasAuthority("system:dept:list222")
                 // 除上面外的所有请求全部需要鉴权认证

ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java

@@ -53,7 +53,7 @@ public class FactoryController {
         @ApiImplicitParam(name = "type", value = "工厂类型", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:factory:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:factory:page')")
     public Result<PageData<FactoryDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<FactoryDTO> page = factoryService.page(params);
         return new Result<PageData<FactoryDTO>>().ok(page);
@@ -61,7 +61,7 @@ public class FactoryController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:factory:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:factory:info')")
     public Result<FactoryDTO> get(@PathVariable("id") Long id){
         FactoryDTO data = factoryService.get(id);
 
@@ -70,8 +70,8 @@ public class FactoryController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:factory:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:factory:save')")
     public Result save(@RequestBody FactoryDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -83,8 +83,8 @@ public class FactoryController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:factory:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:factory:update')")
     public Result update(@RequestBody FactoryDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -94,8 +94,8 @@ public class FactoryController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:factory:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:factory:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -107,8 +107,8 @@ public class FactoryController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:factory:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:factory:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<FactoryDTO> list = factoryService.list(params);
 
@@ -117,7 +117,7 @@ public class FactoryController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         factoryService.changeStatus(id.getId());
 

ym-baisc/src/main/java/com/cnbm/basic/controller/FeaturesStageProcedureRelationController.java

@@ -0,0 +1,128 @@
+package com.cnbm.basic.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.utils.ExcelUtils;
+import com.cnbm.common.utils.Result;
+import com.cnbm.common.validator.AssertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.basic.dto.FeaturesStageProcedureRelationDTO;
+import com.cnbm.basic.excel.FeaturesStageProcedureRelationExcel;
+import com.cnbm.basic.service.IFeaturesStageProcedureRelationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 过程检验-工艺-检验参数 关系表   前端控制器
+ *
+ * @author why
+ * @since  2022-09-01
+ */
+@RestController
+@RequestMapping("/basic/featuresStageProcedureRelation")
+@Api(tags="过程检验-工艺-检验参数 关系表 ")
+public class FeaturesStageProcedureRelationController {
+    @Autowired
+    private IFeaturesStageProcedureRelationService featuresStageProcedureRelationService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
+        @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('basic:featuresStageProcedureRelation:page')")
+    public Result<PageData<FeaturesStageProcedureRelationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<FeaturesStageProcedureRelationDTO> page = featuresStageProcedureRelationService.page(params);
+
+        return new Result<PageData<FeaturesStageProcedureRelationDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('basic:featuresStageProcedureRelation:info')")
+    public Result<FeaturesStageProcedureRelationDTO> get(@PathVariable("id") Long id){
+        FeaturesStageProcedureRelationDTO data = featuresStageProcedureRelationService.get(id);
+
+        return new Result<FeaturesStageProcedureRelationDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('basic:featuresStageProcedureRelation:save')")
+    public Result<Long> save(@RequestBody FeaturesStageProcedureRelationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        featuresStageProcedureRelationService.save(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('basic:featuresStageProcedureRelation:update')")
+    public Result<Long> update(@RequestBody FeaturesStageProcedureRelationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        featuresStageProcedureRelationService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('basic:featuresStageProcedureRelation:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        featuresStageProcedureRelationService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('basic:featuresStageProcedureRelation:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<FeaturesStageProcedureRelationDTO> list = featuresStageProcedureRelationService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, FeaturesStageProcedureRelationExcel.class);
+    }
+
+    @PostMapping("batchInsert")
+    @ApiOperation("批量保存")
+    public Result<Long> batchInsert(@RequestBody FeaturesStageProcedureRelationDTO[] lists){
+        //效验数据
+        //ValidatorUtils.validateEntity(lists, AddGroup.class, DefaultGroup.class);
+
+        featuresStageProcedureRelationService.batchInsert(lists);
+
+        return new Result();
+    }
+
+}

ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java

@@ -50,7 +50,7 @@ public class MachineController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:machine:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:machine:page')")
     public Result<PageData<MachineDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<MachineDTO> page = machineService.page(params);
 
@@ -67,7 +67,7 @@ public class MachineController {
             @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
             @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:machine:page')")
+    //@PreAuthorize("@ex.hasAuthority('basic:machine:page')")
     public Result<PageData<MachineDTO>> page2(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<MachineDTO> page = machineService.page1(params);
 
@@ -77,7 +77,7 @@ public class MachineController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:machine:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:machine:info')")
     public Result<MachineDTO> get(@PathVariable("id") Long id){
         MachineDTO data = machineService.get(id);
 
@@ -86,8 +86,8 @@ public class MachineController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:machine:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:machine:save')")
     public Result save(@RequestBody MachineDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -99,8 +99,8 @@ public class MachineController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:machine:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:machine:update')")
     public Result update(@RequestBody MachineDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -112,8 +112,8 @@ public class MachineController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:machine:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:machine:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -125,8 +125,8 @@ public class MachineController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:machine:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:machine:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<MachineDTO> list = machineService.list(params);
 
@@ -135,7 +135,7 @@ public class MachineController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         machineService.changeStatus(id.getId());
 

ym-baisc/src/main/java/com/cnbm/basic/controller/MeasureToolController.java

@@ -52,7 +52,7 @@ public class MeasureToolController {
         @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:measureTool:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:measureTool:page')")
     public Result<PageData<MeasureToolDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<MeasureToolDTO> page = measureToolService.page(params);
 
@@ -61,7 +61,7 @@ public class MeasureToolController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:measureTool:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:measureTool:info')")
     public Result<MeasureToolDTO> get(@PathVariable("id") Long id){
         MeasureToolDTO data = measureToolService.get(id);
 
@@ -70,8 +70,8 @@ public class MeasureToolController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:measureTool:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:measureTool:save')")
     public Result save(@RequestBody MeasureToolDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -83,8 +83,8 @@ public class MeasureToolController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:measureTool:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:measureTool:update')")
     public Result update(@RequestBody MeasureToolDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -96,8 +96,8 @@ public class MeasureToolController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:measureTool:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:measureTool:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -109,8 +109,8 @@ public class MeasureToolController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:measureTool:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:measureTool:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<MeasureToolDTO> list = measureToolService.list(params);
 
@@ -119,10 +119,17 @@ public class MeasureToolController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         measureToolService.changeStatus(id.getId());
 
         return new Result();
     }
+
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取量具列表")
+    @LogOperation("获取控制图形列表")
+    public List<MeasureToolDTO> list() {
+        return measureToolService.list();
+    }
 }

ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java

@@ -50,7 +50,7 @@ public class PlatformController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:platform:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:platform:page')")
     public Result<PageData<PlatformDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<PlatformDTO> page = platformService.page(params);
 
@@ -59,7 +59,7 @@ public class PlatformController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:platform:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:platform:info')")
     public Result<PlatformDTO> get(@PathVariable("id") Long id){
         PlatformDTO data = platformService.get(id);
 
@@ -68,8 +68,8 @@ public class PlatformController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:platform:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:platform:save')")
     public Result save(@RequestBody PlatformDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -81,8 +81,8 @@ public class PlatformController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:platform:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:platform:update')")
     public Result update(@RequestBody PlatformDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -94,8 +94,8 @@ public class PlatformController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:platform:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:platform:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -107,8 +107,8 @@ public class PlatformController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:platform:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:platform:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<PlatformDTO> list = platformService.list(params);
 
@@ -117,7 +117,7 @@ public class PlatformController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         platformService.changeStatus(id.getId());
 

ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java

@@ -14,6 +14,7 @@ import com.cnbm.common.validator.group.UpdateGroup;
 import com.cnbm.basic.dto.ProductDTO;
 import com.cnbm.basic.excel.ProductExcel;
 import com.cnbm.basic.service.IProductService;
+import com.cnbm.common.vo.IdVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -54,7 +55,7 @@ public class ProductController {
         @ApiImplicitParam(name = "product_type_id", value = "产品类型id", paramType = "query", dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "inspection_stage", value = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验", paramType = "query", dataTypeClass = String.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:product:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:product:page')")
     public Result<PageData<ProductDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductDTO> page = productService.page(params);
 
@@ -63,7 +64,7 @@ public class ProductController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:product:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:product:info')")
     public Result<ProductDTO> get(@PathVariable("id") Long id){
         ProductDTO data = productService.get(id);
 
@@ -72,21 +73,21 @@ public class ProductController {
 
     @PostMapping("save")
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:product:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:product:save')")
-    public Result save(@RequestBody ProductDTO dto){
+    public IdVo save(@RequestBody ProductDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
-        productService.save(dto);
+        return productService.add(dto);
 
-        return new Result();
+        //return new Result();
     }
 
     @PutMapping("update")
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:product:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:product:update')")
     public Result update(@RequestBody ProductDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -98,8 +99,8 @@ public class ProductController {
 
     @DeleteMapping("delete")
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:product:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:product:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -111,8 +112,8 @@ public class ProductController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:product:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:product:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ProductDTO> list = productService.list(params);
 
@@ -121,7 +122,7 @@ public class ProductController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         productService.changeStatus(id.getId());
 

ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFactoryRelationController.java

@@ -49,7 +49,7 @@ public class ProductFactoryRelationController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFactoryRelation:page')")
     public Result<PageData<ProductFactoryRelationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductFactoryRelationDTO> page = productFactoryRelationService.page(params);
 
@@ -58,7 +58,7 @@ public class ProductFactoryRelationController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFactoryRelation:info')")
     public Result<ProductFactoryRelationDTO> get(@PathVariable("id") Long id){
         ProductFactoryRelationDTO data = productFactoryRelationService.get(id);
 
@@ -67,8 +67,8 @@ public class ProductFactoryRelationController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFactoryRelation:save')")
     public Result save(@RequestBody ProductFactoryRelationDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -80,8 +80,8 @@ public class ProductFactoryRelationController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFactoryRelation:update')")
     public Result update(@RequestBody ProductFactoryRelationDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -93,8 +93,8 @@ public class ProductFactoryRelationController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFactoryRelation:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -106,8 +106,8 @@ public class ProductFactoryRelationController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFactoryRelation:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ProductFactoryRelationDTO> list = productFactoryRelationService.list(params);
 

ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesController.java

@@ -52,7 +52,7 @@ public class ProductFeaturesController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:productFeatures:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeatures:page')")
     public Result<PageData<ProductFeaturesDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductFeaturesDTO> page = productFeaturesService.page(params);
 
@@ -61,7 +61,7 @@ public class ProductFeaturesController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeatures:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeatures:info')")
     public Result<ProductFeaturesDTO> get(@PathVariable("id") Long id){
         ProductFeaturesDTO data = productFeaturesService.get(id);
 
@@ -70,8 +70,8 @@ public class ProductFeaturesController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeatures:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeatures:save')")
     public Result save(@RequestBody ProductFeaturesDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -83,8 +83,8 @@ public class ProductFeaturesController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeatures:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeatures:update')")
     public Result update(@RequestBody ProductFeaturesDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -96,8 +96,8 @@ public class ProductFeaturesController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeatures:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeatures:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -109,8 +109,8 @@ public class ProductFeaturesController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeatures:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeatures:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ProductFeaturesDTO> list = productFeaturesService.list(params);
 
@@ -124,4 +124,15 @@ public class ProductFeaturesController {
         return new Result<List<ProductFeaturesDTO>>().ok(list);
     }
 
+    @PostMapping("getFeaturesByStageProcedure")
+    @ApiOperation("查询产品特性 依据工序id 检验阶段")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "inspectionStage", value = "检测阶段", paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "workingProcedureId", value = "工序", paramType = "query", dataTypeClass = Long.class)
+    })
+    public Result<List<ProductFeaturesDTO>> getFeaturesByStageProcedure(@ApiIgnore @RequestParam Map<String, Object> params){
+        List<ProductFeaturesDTO> list = productFeaturesService.getFeaturesByStageProcedure(params);
+        return new Result<List<ProductFeaturesDTO>>().ok(list);
+    }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesHisController.java

@@ -49,7 +49,7 @@ public class ProductFeaturesHisController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeaturesHis:page')")
     public Result<PageData<ProductFeaturesHisDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductFeaturesHisDTO> page = productFeaturesHisService.page(params);
 
@@ -58,7 +58,7 @@ public class ProductFeaturesHisController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeaturesHis:info')")
     public Result<ProductFeaturesHisDTO> get(@PathVariable("id") Long id){
         ProductFeaturesHisDTO data = productFeaturesHisService.get(id);
 
@@ -67,8 +67,8 @@ public class ProductFeaturesHisController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeaturesHis:save')")
     public Result save(@RequestBody ProductFeaturesHisDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -80,8 +80,8 @@ public class ProductFeaturesHisController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeaturesHis:update')")
     public Result update(@RequestBody ProductFeaturesHisDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -93,8 +93,8 @@ public class ProductFeaturesHisController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeaturesHis:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -106,8 +106,8 @@ public class ProductFeaturesHisController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:productFeaturesHis:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ProductFeaturesHisDTO> list = productFeaturesHisService.list(params);
 

ym-baisc/src/main/java/com/cnbm/basic/controller/ProductTypeController.java

@@ -54,7 +54,7 @@ public class ProductTypeController {
         @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-//    @PreAuthorize("@ex.hasAuthority('code:productType:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:productType:page')")
     public Result<PageData<ProductTypeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductTypeDTO> page = productTypeService.page(params);
 
@@ -63,7 +63,7 @@ public class ProductTypeController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-//    @PreAuthorize("@ex.hasAuthority('code:productType:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:productType:info')")
     public Result<ProductTypeDTO> get(@PathVariable("id") Long id){
         ProductTypeDTO data = productTypeService.get(id);
 
@@ -72,8 +72,8 @@ public class ProductTypeController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-//    @PreAuthorize("@ex.hasAuthority('code:productType:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:productType:save')")
     public Result save(@RequestBody ProductTypeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -85,8 +85,8 @@ public class ProductTypeController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-//    @PreAuthorize("@ex.hasAuthority('code:productType:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:productType:update')")
     public Result update(@RequestBody ProductTypeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -98,8 +98,8 @@ public class ProductTypeController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-//    @PreAuthorize("@ex.hasAuthority('code:productType:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:productType:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -111,8 +111,8 @@ public class ProductTypeController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-//    @PreAuthorize("@ex.hasAuthority('code:productType:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:productType:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ProductTypeDTO> list = productTypeService.list(params);
 
@@ -121,7 +121,7 @@ public class ProductTypeController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         productTypeService.changeStatus(id.getId());
 
@@ -130,7 +130,7 @@ public class ProductTypeController {
 
     @PostMapping(value = "list")
     @ApiOperation(value = "获取产品类型列表")
-    private List<ProductTypeDTO> list(@ApiIgnore @RequestParam Map<String, Object> params) {
+    public List<ProductTypeDTO> list() {
-        return productTypeService.list(params);
+        return productTypeService.list();
     }
 }

ym-baisc/src/main/java/com/cnbm/basic/controller/ProductWorkingprocedureRelationController.java

@@ -1,5 +1,6 @@
 package com.cnbm.basic.controller;
 
+import com.cnbm.admin.annotation.LogOperation;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.utils.ExcelUtils;
@@ -48,7 +49,7 @@ public class ProductWorkingprocedureRelationController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:page')")
     public Result<PageData<ProductWorkingprocedureRelationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ProductWorkingprocedureRelationDTO> page = productWorkingprocedureRelationService.page(params);
 
@@ -57,7 +58,7 @@ public class ProductWorkingprocedureRelationController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:info')")
     public Result<ProductWorkingprocedureRelationDTO> get(@PathVariable("id") Long id){
         ProductWorkingprocedureRelationDTO data = productWorkingprocedureRelationService.get(id);
 
@@ -66,8 +67,8 @@ public class ProductWorkingprocedureRelationController {
 
     @PostMapping("save")
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:save')")
     public Result save(@RequestBody ProductWorkingprocedureRelationDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -79,8 +80,8 @@ public class ProductWorkingprocedureRelationController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:update')")
     public Result update(@RequestBody ProductWorkingprocedureRelationDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -92,8 +93,8 @@ public class ProductWorkingprocedureRelationController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -105,8 +106,8 @@ public class ProductWorkingprocedureRelationController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ProductWorkingprocedureRelationDTO> list = productWorkingprocedureRelationService.list(params);
 
@@ -115,7 +116,7 @@ public class ProductWorkingprocedureRelationController {
 
     @GetMapping("getWorkingprocedureByProductId/{productId}")
     @ApiOperation("查询所有工序 依据产品id")
-    //@LogOperation("查询所有工序 依据产品id")
+    @LogOperation("查询所有工序 依据产品id")
     public Result<List<ProductWorkingprocedureRelationDTO>> getWorkingprocedureByProductId(@PathVariable("productId") Long productId){
         List<ProductWorkingprocedureRelationDTO> list = productWorkingprocedureRelationService.getWorkingprocedureByProductId(productId);
         return new Result<List<ProductWorkingprocedureRelationDTO>>().ok(list);
@@ -123,8 +124,8 @@ public class ProductWorkingprocedureRelationController {
 
     @PostMapping("batchInsertWorkingprocedure")
     @ApiOperation("添加工序流程")
-    //@LogOperation("添加工序流程")
+    @LogOperation("添加工序流程")
-    //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:batchInsertWorkingprocedure')")
+    //@PreAuthorize("@ex.hasAuthority('basic:productWorkingprocedureRelation:batchInsertWorkingprocedure')")
     public Result batchInsertWorkingprocedure(@RequestBody ProductWorkingprocedureRelationDTO[] lists){
 
         productWorkingprocedureRelationService.batchInsertWorkingprocedure(lists);

ym-baisc/src/main/java/com/cnbm/basic/controller/ShiftController.java

@@ -49,7 +49,7 @@ public class ShiftController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:shift:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:shift:page')")
     public Result<PageData<ShiftDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ShiftDTO> page = shiftService.page(params);
 
@@ -58,7 +58,7 @@ public class ShiftController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:shift:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:shift:info')")
     public Result<ShiftDTO> get(@PathVariable("id") Long id){
         ShiftDTO data = shiftService.get(id);
 
@@ -67,8 +67,8 @@ public class ShiftController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:shift:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:shift:save')")
     public Result save(@RequestBody ShiftDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -80,8 +80,8 @@ public class ShiftController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:shift:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:shift:update')")
     public Result update(@RequestBody ShiftDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -93,8 +93,8 @@ public class ShiftController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:shift:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:shift:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -106,8 +106,8 @@ public class ShiftController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:shift:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:shift:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ShiftDTO> list = shiftService.list(params);
 

ym-baisc/src/main/java/com/cnbm/basic/controller/TeamController.java

@@ -49,7 +49,7 @@ public class TeamController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:team:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:team:page')")
     public Result<PageData<TeamDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<TeamDTO> page = teamService.page(params);
 
@@ -58,7 +58,7 @@ public class TeamController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:team:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:team:info')")
     public Result<TeamDTO> get(@PathVariable("id") Long id){
         TeamDTO data = teamService.get(id);
 
@@ -67,8 +67,8 @@ public class TeamController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:team:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:team:save')")
     public Result save(@RequestBody TeamDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -80,8 +80,8 @@ public class TeamController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:team:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:team:update')")
     public Result update(@RequestBody TeamDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -93,8 +93,8 @@ public class TeamController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:team:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:team:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -106,8 +106,8 @@ public class TeamController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:team:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:team:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<TeamDTO> list = teamService.list(params);
 

ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java

@@ -52,7 +52,7 @@ public class UnitController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:unit:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:unit:page')")
     public Result<PageData<UnitDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<UnitDTO> page = unitService.page(params);
 
@@ -61,7 +61,7 @@ public class UnitController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:unit:info')")
+    //@PreAuthorize("@ex.hasAuthority('basic:unit:info')")
     public Result<UnitDTO> get(@PathVariable("id") Long id){
         UnitDTO data = unitService.get(id);
 
@@ -70,8 +70,8 @@ public class UnitController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:unit:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:unit:save')")
     public Result save(@RequestBody UnitDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -83,8 +83,8 @@ public class UnitController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:unit:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:unit:update')")
     public Result update(@RequestBody UnitDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -96,8 +96,8 @@ public class UnitController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:unit:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:unit:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -109,8 +109,8 @@ public class UnitController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:unit:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:unit:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<UnitDTO> list = unitService.list(params);
 
@@ -119,7 +119,7 @@ public class UnitController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         unitService.changeStatus(id.getId());
 
@@ -128,7 +128,8 @@ public class UnitController {
 
     @PostMapping(value = "list")
     @ApiOperation(value = "获取单位列表")
-    private List<UnitDTO> list(@ApiIgnore @RequestParam Map<String, Object> params) {
+    @LogOperation("获取单位列表")
-        return unitService.list(params);
+    public List<UnitDTO> list() {
+        return unitService.list();
     }
 }

ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java

@@ -53,7 +53,7 @@ public class WorkingProcedureController {
         @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedure:page')")
     public Result<PageData<WorkingProcedureDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<WorkingProcedureDTO> page = workingProcedureService.page(params);
 
@@ -62,7 +62,7 @@ public class WorkingProcedureController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedure:info')")
     public Result<WorkingProcedureDTO> get(@PathVariable("id") Long id){
         WorkingProcedureDTO data = workingProcedureService.get(id);
 
@@ -71,8 +71,8 @@ public class WorkingProcedureController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedure:save')")
     public Result save(@RequestBody WorkingProcedureDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -84,8 +84,8 @@ public class WorkingProcedureController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedure:update')")
     public Result update(@RequestBody WorkingProcedureDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -97,8 +97,8 @@ public class WorkingProcedureController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedure:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -110,8 +110,8 @@ public class WorkingProcedureController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedure:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<WorkingProcedureDTO> list = workingProcedureService.list(params);
 
@@ -120,7 +120,7 @@ public class WorkingProcedureController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         workingProcedureService.changeStatus(id.getId());
 
@@ -129,7 +129,7 @@ public class WorkingProcedureController {
 
     @GetMapping("getWorkingprocedureByProductId/{productId}")
     @ApiOperation("查询所有工序 依据产品id")
-    //@LogOperation("查询所有工序 依据产品id")
+    @LogOperation("查询所有工序 依据产品id")
     public Result<List<WorkingProcedureDTO>> getWorkingprocedureByProductId(@PathVariable("productId") Long productId){
         List<WorkingProcedureDTO> list = workingProcedureService.getWorkingProcedureByProductId(productId);
         return new Result<List<WorkingProcedureDTO>>().ok(list);
@@ -137,8 +137,8 @@ public class WorkingProcedureController {
 
     @PostMapping(value = "list")
     @ApiOperation(value = "获取工序列表")
-    private List<WorkingProcedureDTO> list(@ApiIgnore @RequestParam Map<String, Object> params) {
+    public List<WorkingProcedureDTO> list() {
-        return workingProcedureService.list(params);
+        return workingProcedureService.list();
     }
 
 }

ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java

@@ -51,7 +51,7 @@ public class WorkingProcedureTypeController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
     })
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:page')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedureType:page')")
     public Result<PageData<WorkingProcedureTypeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<WorkingProcedureTypeDTO> page = workingProcedureTypeService.page(params);
 
@@ -60,7 +60,7 @@ public class WorkingProcedureTypeController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:info')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedureType:info')")
     public Result<WorkingProcedureTypeDTO> get(@PathVariable("id") Long id){
         WorkingProcedureTypeDTO data = workingProcedureTypeService.get(id);
 
@@ -69,8 +69,8 @@ public class WorkingProcedureTypeController {
 
     @PostMapping
     @ApiOperation("保存")
-    //@LogOperation("保存")
+    @LogOperation("保存")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:save')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedureType:save')")
     public Result save(@RequestBody WorkingProcedureTypeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -82,8 +82,8 @@ public class WorkingProcedureTypeController {
 
     @PutMapping
     @ApiOperation("修改")
-    //@LogOperation("修改")
+    @LogOperation("修改")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:update')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedureType:update')")
     public Result update(@RequestBody WorkingProcedureTypeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -95,8 +95,8 @@ public class WorkingProcedureTypeController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    //@LogOperation("删除")
+    @LogOperation("删除")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:delete')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedureType:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -108,8 +108,8 @@ public class WorkingProcedureTypeController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-    //@LogOperation("导出")
+    @LogOperation("导出")
-    //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:export')")
+    @PreAuthorize("@ex.hasAuthority('basic:workingProcedureType:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<WorkingProcedureTypeDTO> list = workingProcedureTypeService.list(params);
 
@@ -118,7 +118,7 @@ public class WorkingProcedureTypeController {
 
     @PostMapping("status")
     @ApiOperation("改变状态")
-    //@LogOperation("改变状态")
+    @LogOperation("改变状态")
     public Result changeStatus(@RequestBody IdParam id){
         workingProcedureTypeService.changeStatus(id.getId());
 

ym-baisc/src/main/java/com/cnbm/basic/dto/FeaturesStageProcedureRelationDTO.java

@@ -0,0 +1,63 @@
+package com.cnbm.basic.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * 过程检验-工艺-检验参数 关系表 
+ *
+ * @author why
+ * @since  2022-09-01
+ */
+@Data
+@ApiModel(value = "过程检验-工艺-检验参数 关系表 DTO对象")
+public class FeaturesStageProcedureRelationDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "检验参数id,关联product_features表")
+	private Long productFeaturesId;
+
+	@ApiModelProperty(value = "工序id,关联 working_procedure 表")
+	private Long workingProcedureId;
+
+	@ApiModelProperty(value = "（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+	private Integer inspectionStage;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+}

ym-baisc/src/main/java/com/cnbm/basic/dto/ProductFeaturesDTO.java

@@ -62,15 +62,6 @@ public class ProductFeaturesDTO implements Serializable {
 	@ApiModelProperty(value = "检验参数  规格上线")
 	private Float usl;
 
-	@ApiModelProperty(value = "工序id，关联 working_procedure 表id")
-	private Long workingProcedureId;
-
-	@ApiModelProperty(value = "工序编码，关联 working_procedure 表id")
-	private String workingProcedureCode;
-
-	@ApiModelProperty(value = "工序名称，关联 working_procedure 表id")
-	private String workingProcedureName;
-
 	@ApiModelProperty(value = "分析图形，关联control_graph表id")
 	private Long controlGraphId;
 

ym-baisc/src/main/java/com/cnbm/basic/dto/ProductFeaturesHisDTO.java

@@ -18,8 +18,6 @@ import java.time.LocalDateTime;
 public class ProductFeaturesHisDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-
-
 	@ApiModelProperty(value = "ID")
 	private Long id;
 
@@ -59,9 +57,6 @@ public class ProductFeaturesHisDTO implements Serializable {
 	@ApiModelProperty(value = "检验参数  规格上线")
 	private Float usl;
 
-	@ApiModelProperty(value = "工序id，关联 working_procedure 表id")
-	private Long workingProcedureId;
-
 	@ApiModelProperty(value = "是否需要spc分析，1 yes;0 no")
 	private Integer isSpc;
 

ym-baisc/src/main/java/com/cnbm/basic/dto/ProductTypeDTO.java

@@ -29,7 +29,7 @@ public class ProductTypeDTO implements Serializable {
 	private String code;
 
 	@ApiModelProperty(value = "描述")
-	private String desc;
+	private String descs;
 
 	@ApiModelProperty(value = "1 可用，0 不可用")
 	private Integer status;

ym-baisc/src/main/java/com/cnbm/basic/dto/ProductWorkingprocedureRelationDTO.java

@@ -33,6 +33,9 @@ public class ProductWorkingprocedureRelationDTO implements Serializable {
 	@ApiModelProperty(value = "工序名称,关联 working_procedure 表")
 	private String workingProcedureName;
 
+	@ApiModelProperty(value = "工序编码,关联 working_procedure 表")
+	private String workingProcedureCode;
+
 	@ApiModelProperty(value = "顺序，工序是有先后顺序的。")
 	private Integer sequence;
 

ym-baisc/src/main/java/com/cnbm/basic/entity/FeaturesStageProcedureRelation.java

@@ -0,0 +1,68 @@
+package com.cnbm.basic.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 过程检验-工艺-检验参数 关系表 
+ * </p>
+ *
+ * @author why
+ * @since 2022-09-01
+ */
+@Data
+@TableName("features_stage_procedure_relation")
+@ApiModel(value = "FeaturesStageProcedureRelation对象", description = "过程检验-工艺-检验参数 关系表 ")
+public class FeaturesStageProcedureRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("检验参数id,关联product_features表")
+    private Long productFeaturesId;
+
+    @ApiModelProperty("工序id,关联 working_procedure 表")
+    private Long workingProcedureId;
+
+    @ApiModelProperty("（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+    private Integer inspectionStage;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    @TableLogic
+    private Integer valid;
+
+    @ApiModelProperty("创建人")
+    private Long creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private Integer version;
+
+
+}

ym-baisc/src/main/java/com/cnbm/basic/entity/ProductFeatures.java

@@ -58,9 +58,6 @@ public class ProductFeatures implements Serializable {
     @ApiModelProperty("检验参数  规格上线")
     private Float usl;
 
-    @ApiModelProperty("工序id，关联 working_procedure 表id")
-    private Long workingProcedureId;
-
     @ApiModelProperty("分析图形，关联control_graph表id")
     private Long controlGraphId;
 

ym-baisc/src/main/java/com/cnbm/basic/entity/ProductFeaturesHis.java

@@ -61,9 +61,6 @@ public class ProductFeaturesHis implements Serializable {
     @ApiModelProperty("检验参数  规格上线")
     private Float usl;
 
-    @ApiModelProperty("工序id，关联 working_procedure 表id")
-    private Long workingProcedureId;
-
     @ApiModelProperty("是否需要spc分析，1 yes;0 no")
     private Integer isSpc;
 

ym-baisc/src/main/java/com/cnbm/basic/excel/FeaturesStageProcedureRelationExcel.java

@@ -0,0 +1,43 @@
+package com.cnbm.basic.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 过程检验-工艺-检验参数 关系表 
+ *
+ * @author why
+ * @since  2022-09-01
+ */
+@Data
+public class FeaturesStageProcedureRelationExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "检验参数id,关联product_features表")
+    private Long productFeaturesId;
+    @Excel(name = "工序id,关联 working_procedure 表")
+    private Long workingProcedureId;
+    @Excel(name = "（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+    private Integer inspectionStage;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private Integer valid;
+    @Excel(name = "创建人")
+    private Long creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private Long updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private Integer version;
+
+}

ym-baisc/src/main/java/com/cnbm/basic/excel/ProductFeaturesExcel.java

@@ -37,8 +37,6 @@ public class ProductFeaturesExcel {
     private Float sl;
     @Excel(name = "检验参数  规格上线")
     private Float usl;
-    @Excel(name = "工序id，关联 working_procedure 表id")
-    private Long workingProcedureId;
     @Excel(name = "分析图形，关联control_graph表id")
     private Long controlGraphId;
     @Excel(name = "是否需要spc分析，1 yes;0 no")

ym-baisc/src/main/java/com/cnbm/basic/excel/ProductFeaturesHisExcel.java

@@ -39,8 +39,6 @@ public class ProductFeaturesHisExcel {
     private Float sl;
     @Excel(name = "检验参数  规格上线")
     private Float usl;
-    @Excel(name = "工序id，关联 working_procedure 表id")
-    private Long workingProcedureId;
     @Excel(name = "是否需要spc分析，1 yes;0 no")
     private Integer isSpc;
     @Excel(name = "分析图形，关联control_graph表id")

ym-baisc/src/main/java/com/cnbm/basic/excel/ProductTypeExcel.java

@@ -20,7 +20,7 @@ public class ProductTypeExcel {
     @Excel(name = "产品类型 编码")
     private String code;
     @Excel(name = "描述")
-    private String desc;
+    private String descs;
     @Excel(name = "1 可用，0 不可用")
     private Integer status;
     @Excel(name = "备注")

ym-baisc/src/main/java/com/cnbm/basic/mapper/FeaturesStageProcedureRelationMapper.java

@@ -0,0 +1,20 @@
+package com.cnbm.basic.mapper;
+
+import com.cnbm.basic.dto.ProductFeaturesDTO;
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.basic.entity.FeaturesStageProcedureRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 过程检验-工艺-检验参数 关系表 
+ *
+ * @author why
+ * @since 2022-09-01
+ */
+@Mapper
+public interface FeaturesStageProcedureRelationMapper extends BaseDao<FeaturesStageProcedureRelation> {
+
+}

ym-baisc/src/main/java/com/cnbm/basic/mapper/MeasureToolMapper.java

@@ -1,9 +1,12 @@
 package com.cnbm.basic.mapper;
 
+import com.cnbm.basic.dto.MeasureToolDTO;
 import com.cnbm.common.dao.BaseDao;
 import com.cnbm.basic.entity.MeasureTool;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 量具表
  *
@@ -12,5 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface MeasureToolMapper extends BaseDao<MeasureTool> {
-	
+	List<MeasureToolDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductFeaturesMapper.java

@@ -6,6 +6,7 @@ import com.cnbm.basic.entity.ProductFeatures;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 产品特性 表
@@ -16,4 +17,6 @@ import java.util.List;
 @Mapper
 public interface ProductFeaturesMapper extends BaseDao<ProductFeatures> {
 	List<ProductFeaturesDTO> getProductFeaturesByProductId(Long id);
+
+	List<ProductFeaturesDTO> getFeaturesByStageProcedure(Map<String, Object> params);
 }

ym-baisc/src/main/java/com/cnbm/basic/mysql/Factorymysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561977619142254594, 1067246875800000035, '工厂 表', 'basic/factory', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977619142254595, 1561977619142254594, '查看', NULL, 'basic:factory:page,basic:factory:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977619142254596, 1561977619142254594, '新增', NULL, 'basic:factory:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977619142254597, 1561977619142254594, '修改', NULL, 'basic:factory:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977619142254598, 1561977619142254594, '删除', NULL, 'basic:factory:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977619142254599, 1561977619142254594, '导出', NULL, 'basic:factory:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/FeaturesStageProcedureRelationmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1565241134464434177, 1067246875800000035, '过程检验-工艺-检验参数 关系表 ', 'basic/featuresStageProcedureRelation', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1565241134464434178, 1565241134464434177, '查看', NULL, 'basic:featuresStageProcedureRelation:page,basic:featuresStageProcedureRelation:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1565241134464434179, 1565241134464434177, '新增', NULL, 'basic:featuresStageProcedureRelation:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1565241134464434180, 1565241134464434177, '修改', NULL, 'basic:featuresStageProcedureRelation:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1565241134464434181, 1565241134464434177, '删除', NULL, 'basic:featuresStageProcedureRelation:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1565241134464434182, 1565241134464434177, '导出', NULL, 'basic:featuresStageProcedureRelation:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/Machinemysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561978239198765057, 1067246875800000035, '机台表', 'basic/machine', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978239198765058, 1561978239198765057, '查看', NULL, 'basic:machine:page,basic:machine:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978239198765059, 1561978239198765057, '新增', NULL, 'basic:machine:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978239198765060, 1561978239198765057, '修改', NULL, 'basic:machine:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978239198765061, 1561978239198765057, '删除', NULL, 'basic:machine:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978239198765062, 1561978239198765057, '导出', NULL, 'basic:machine:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/MeasureToolmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561978986309140482, 1067246875800000035, '量具表', 'basic/measureTool', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978986309140483, 1561978986309140482, '查看', NULL, 'basic:measureTool:page,basic:measureTool:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978986309140484, 1561978986309140482, '新增', NULL, 'basic:measureTool:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978986309140485, 1561978986309140482, '修改', NULL, 'basic:measureTool:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978986309140486, 1561978986309140482, '删除', NULL, 'basic:measureTool:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978986309140487, 1561978986309140482, '导出', NULL, 'basic:measureTool:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/Platformmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561978141555367938, 1067246875800000035, '站点表', 'basic/platform', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978141555367939, 1561978141555367938, '查看', NULL, 'basic:platform:page,basic:platform:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978141555367940, 1561978141555367938, '新增', NULL, 'basic:platform:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978141555367941, 1561978141555367938, '修改', NULL, 'basic:platform:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978141555367942, 1561978141555367938, '删除', NULL, 'basic:platform:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978141555367943, 1561978141555367938, '导出', NULL, 'basic:platform:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/ProductFactoryRelationmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561977729704062978, 1067246875800000035, '产品-工厂 关系表', 'basic/productFactoryRelation', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977729704062979, 1561977729704062978, '查看', NULL, 'basic:productFactoryRelation:page,basic:productFactoryRelation:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977729704062980, 1561977729704062978, '新增', NULL, 'basic:productFactoryRelation:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977729704062981, 1561977729704062978, '修改', NULL, 'basic:productFactoryRelation:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977729704062982, 1561977729704062978, '删除', NULL, 'basic:productFactoryRelation:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977729704062983, 1561977729704062978, '导出', NULL, 'basic:productFactoryRelation:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/ProductFeaturesHismysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561978894416162817, 1067246875800000035, '产品特性 历史表', 'basic/productFeaturesHis', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978894416162818, 1561978894416162817, '查看', NULL, 'basic:productFeaturesHis:page,basic:productFeaturesHis:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978894416162819, 1561978894416162817, '新增', NULL, 'basic:productFeaturesHis:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978894416162820, 1561978894416162817, '修改', NULL, 'basic:productFeaturesHis:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978894416162821, 1561978894416162817, '删除', NULL, 'basic:productFeaturesHis:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978894416162822, 1561978894416162817, '导出', NULL, 'basic:productFeaturesHis:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/ProductFeaturesmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561978720398680066, 1067246875800000035, '产品特性 表', 'basic/productFeatures', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978720398680067, 1561978720398680066, '查看', NULL, 'basic:productFeatures:page,basic:productFeatures:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978720398680068, 1561978720398680066, '新增', NULL, 'basic:productFeatures:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978720398680069, 1561978720398680066, '修改', NULL, 'basic:productFeatures:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978720398680070, 1561978720398680066, '删除', NULL, 'basic:productFeatures:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978720398680071, 1561978720398680066, '导出', NULL, 'basic:productFeatures:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/ProductTypemysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561975128501645313, 1067246875800000035, '产品类型 表', 'basic/productType', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561975128501645314, 1561975128501645313, '查看', NULL, 'basic:productType:page,basic:productType:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561975128501645315, 1561975128501645313, '新增', NULL, 'basic:productType:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561975128501645316, 1561975128501645313, '修改', NULL, 'basic:productType:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561975128501645317, 1561975128501645313, '删除', NULL, 'basic:productType:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561975128501645318, 1561975128501645313, '导出', NULL, 'basic:productType:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/ProductWorkingprocedureRelationmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561978609518055426, 1067246875800000035, '产品-工序 关系表', 'basic/productWorkingprocedureRelation', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978609518055427, 1561978609518055426, '查看', NULL, 'basic:productWorkingprocedureRelation:page,basic:productWorkingprocedureRelation:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978609518055428, 1561978609518055426, '新增', NULL, 'basic:productWorkingprocedureRelation:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978609518055429, 1561978609518055426, '修改', NULL, 'basic:productWorkingprocedureRelation:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978609518055430, 1561978609518055426, '删除', NULL, 'basic:productWorkingprocedureRelation:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978609518055431, 1561978609518055426, '导出', NULL, 'basic:productWorkingprocedureRelation:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/Productmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561977860146929666, 1067246875800000035, '产品 表', 'basic/product', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977860146929667, 1561977860146929666, '查看', NULL, 'basic:product:page,basic:product:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977860146929668, 1561977860146929666, '新增', NULL, 'basic:product:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977860146929669, 1561977860146929666, '修改', NULL, 'basic:product:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977860146929670, 1561977860146929666, '删除', NULL, 'basic:product:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977860146929671, 1561977860146929666, '导出', NULL, 'basic:product:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/Shiftmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561977446785724417, 1067246875800000035, '班次 表', 'basic/shift', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977446785724418, 1561977446785724417, '查看', NULL, 'basic:shift:page,basic:shift:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977446785724419, 1561977446785724417, '新增', NULL, 'basic:shift:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977446785724420, 1561977446785724417, '修改', NULL, 'basic:shift:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977446785724421, 1561977446785724417, '删除', NULL, 'basic:shift:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977446785724422, 1561977446785724417, '导出', NULL, 'basic:shift:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/Teammysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561977547536990209, 1067246875800000035, '班组 表', 'basic/team', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977547536990210, 1561977547536990209, '查看', NULL, 'basic:team:page,basic:team:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977547536990211, 1561977547536990209, '新增', NULL, 'basic:team:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977547536990212, 1561977547536990209, '修改', NULL, 'basic:team:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977547536990213, 1561977547536990209, '删除', NULL, 'basic:team:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561977547536990214, 1561977547536990209, '导出', NULL, 'basic:team:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/Unitmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561976675012771841, 1067246875800000035, '单位 表', 'basic/unit', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561976675012771842, 1561976675012771841, '查看', NULL, 'basic:unit:page,basic:unit:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561976675012771843, 1561976675012771841, '新增', NULL, 'basic:unit:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561976675012771844, 1561976675012771841, '修改', NULL, 'basic:unit:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561976675012771845, 1561976675012771841, '删除', NULL, 'basic:unit:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561976675012771846, 1561976675012771841, '导出', NULL, 'basic:unit:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/WorkingProcedureTypemysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561978394501234689, 1067246875800000035, '工序类型表 表', 'basic/workingProcedureType', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978394501234690, 1561978394501234689, '查看', NULL, 'basic:workingProcedureType:page,basic:workingProcedureType:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978394501234691, 1561978394501234689, '新增', NULL, 'basic:workingProcedureType:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978394501234692, 1561978394501234689, '修改', NULL, 'basic:workingProcedureType:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978394501234693, 1561978394501234689, '删除', NULL, 'basic:workingProcedureType:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978394501234694, 1561978394501234689, '导出', NULL, 'basic:workingProcedureType:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/mysql/WorkingProceduremysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1561978465661812738, 1067246875800000035, '工序 表', 'basic/workingProcedure', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978465661812739, 1561978465661812738, '查看', NULL, 'basic:workingProcedure:page,basic:workingProcedure:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978465661812740, 1561978465661812738, '新增', NULL, 'basic:workingProcedure:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978465661812741, 1561978465661812738, '修改', NULL, 'basic:workingProcedure:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978465661812742, 1561978465661812738, '删除', NULL, 'basic:workingProcedure:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1561978465661812743, 1561978465661812738, '导出', NULL, 'basic:workingProcedure:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-baisc/src/main/java/com/cnbm/basic/service/IFeaturesStageProcedureRelationService.java

@@ -0,0 +1,29 @@
+package com.cnbm.basic.service;
+
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.CrudService;
+import com.cnbm.basic.dto.FeaturesStageProcedureRelationDTO;
+import com.cnbm.basic.entity.FeaturesStageProcedureRelation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 过程检验-工艺-检验参数 关系表 
+ *
+ * @author why
+ * @since  2022-09-01
+ */
+public interface IFeaturesStageProcedureRelationService extends CrudService<FeaturesStageProcedureRelation, FeaturesStageProcedureRelationDTO> {
+    PageData<FeaturesStageProcedureRelationDTO> page (Map<String, Object> params);
+
+    FeaturesStageProcedureRelationDTO get(Long id);
+
+    void save(FeaturesStageProcedureRelationDTO dto);
+
+    void update(FeaturesStageProcedureRelationDTO dto);
+
+    void delete(Long[] ids);
+
+    void batchInsert(FeaturesStageProcedureRelationDTO[] lists);
+}

ym-baisc/src/main/java/com/cnbm/basic/service/IMeasureToolService.java

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.MeasureToolDTO;
 import com.cnbm.basic.entity.MeasureTool;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,4 +26,6 @@ public interface IMeasureToolService extends CrudService<MeasureTool, MeasureToo
     void delete(Long[] ids);
 
     boolean changeStatus(Long id);
+
+    List<MeasureToolDTO> list();
 }

ym-baisc/src/main/java/com/cnbm/basic/service/IProductFeaturesService.java

@@ -1,5 +1,6 @@
 package com.cnbm.basic.service;
 
+import com.cnbm.basic.dto.FeaturesStageProcedureRelationDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.ProductFeaturesDTO;
@@ -26,4 +27,6 @@ public interface IProductFeaturesService extends CrudService<ProductFeatures, Pr
     void delete(Long[] ids);
 
     List<ProductFeaturesDTO> getProductFeaturesByProductId(Long id);
+
+    List<ProductFeaturesDTO> getFeaturesByStageProcedure(Map<String, Object> params);
 }

ym-baisc/src/main/java/com/cnbm/basic/service/IProductService.java

@@ -4,6 +4,7 @@ import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.ProductDTO;
 import com.cnbm.basic.entity.Product;
+import com.cnbm.common.vo.IdVo;
 
 import java.util.Map;
 
@@ -18,7 +19,7 @@ public interface IProductService extends CrudService<Product, ProductDTO> {
 
     ProductDTO get(Long id);
 
-    void save(ProductDTO dto);
+    IdVo add(ProductDTO dto);
 
     void update(ProductDTO dto);
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/FeaturesStageProcedureRelationServiceImpl.java

@@ -0,0 +1,93 @@
+package com.cnbm.basic.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.basic.dto.ProductFeaturesDTO;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.impl.CrudServiceImpl;
+import com.cnbm.basic.dto.FeaturesStageProcedureRelationDTO;
+import com.cnbm.basic.mapper.FeaturesStageProcedureRelationMapper;
+import com.cnbm.basic.entity.FeaturesStageProcedureRelation;
+import com.cnbm.basic.service.IFeaturesStageProcedureRelationService;
+import com.cnbm.common.utils.ConvertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 过程检验-工艺-检验参数 关系表 
+ *
+ * @author why
+ * @since 2022-09-01
+ */
+@Service
+public class FeaturesStageProcedureRelationServiceImpl extends CrudServiceImpl<FeaturesStageProcedureRelationMapper, FeaturesStageProcedureRelation, FeaturesStageProcedureRelationDTO> implements IFeaturesStageProcedureRelationService {
+
+    @Autowired
+    private FeaturesStageProcedureRelationMapper mapper;
+
+    @Override
+    public QueryWrapper<FeaturesStageProcedureRelation> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<FeaturesStageProcedureRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PageData<FeaturesStageProcedureRelationDTO> page (Map<String, Object> params){
+        IPage<FeaturesStageProcedureRelation> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        return getPageData(page, FeaturesStageProcedureRelationDTO.class);
+    }
+
+    @Override
+    public FeaturesStageProcedureRelationDTO get(Long id) {
+        FeaturesStageProcedureRelation entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, FeaturesStageProcedureRelationDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FeaturesStageProcedureRelationDTO dto) {
+        FeaturesStageProcedureRelation entity = ConvertUtils.sourceToTarget(dto, FeaturesStageProcedureRelation.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(FeaturesStageProcedureRelationDTO dto) {
+        FeaturesStageProcedureRelation entity = ConvertUtils.sourceToTarget(dto, FeaturesStageProcedureRelation.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long[] ids) {
+        //删除
+        deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void batchInsert(FeaturesStageProcedureRelationDTO[] lists) {
+        for(FeaturesStageProcedureRelationDTO dto:lists){
+            ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+            save(dto);
+        }
+    }
+
+}

ym-baisc/src/main/java/com/cnbm/basic/service/impl/MeasureToolServiceImpl.java

@@ -11,11 +11,13 @@ import com.cnbm.basic.entity.MeasureTool;
 import com.cnbm.basic.service.IMeasureToolService;
 import com.cnbm.common.utils.ConvertUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -86,4 +88,14 @@ public class MeasureToolServiceImpl extends CrudServiceImpl<MeasureToolMapper, M
         deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Autowired
+    private MeasureToolMapper mapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<MeasureToolDTO> list() {
+        List<MeasureToolDTO> list = mapper.list();
+        return list;
+    }
+
 }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.cnbm.admin.params.IdParam;
+import com.cnbm.basic.dto.FeaturesStageProcedureRelationDTO;
 import com.cnbm.basic.dto.ProductFeaturesHisDTO;
 import com.cnbm.basic.dto.WorkingProcedureDTO;
 import com.cnbm.basic.entity.ProductFeaturesHis;
@@ -122,4 +123,9 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
         deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<ProductFeaturesDTO> getFeaturesByStageProcedure(Map<String, Object> params){
+        List<ProductFeaturesDTO> list = mapper.getFeaturesByStageProcedure(params);
+        return list;
+    }
 }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductServiceImpl.java

@@ -12,6 +12,7 @@ import com.cnbm.basic.mapper.ProductMapper;
 import com.cnbm.basic.entity.Product;
 import com.cnbm.basic.service.IProductService;
 import com.cnbm.common.utils.ConvertUtils;
+import com.cnbm.common.vo.IdVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -83,9 +84,11 @@ public class ProductServiceImpl extends CrudServiceImpl<ProductMapper, Product,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(ProductDTO dto) {
+    public IdVo add(ProductDTO dto) {
         Product entity = ConvertUtils.sourceToTarget(dto, Product.class);
         insert(entity);
+        //返回新增产品id
+        return IdVo.builder().id(entity.getId()).build();
     }
 
     @Override

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductWorkingprocedureRelationServiceImpl.java

@@ -91,8 +91,15 @@ public class ProductWorkingprocedureRelationServiceImpl extends CrudServiceImpl<
         List<ProductWorkingprocedureRelationDTO> dtoList = ConvertUtils.sourceToTarget(relationList, ProductWorkingprocedureRelationDTO.class);
         //设置工序名称
         for (ProductWorkingprocedureRelationDTO dto:dtoList){
-            String workingProcedureName = workingProcedureServiceImpl.selectById(dto.getWorkingProcedureId()).getName();
+            WorkingProcedure workingProcedure = workingProcedureServiceImpl.selectById(dto.getWorkingProcedureId());
+            String workingProcedureName = null;
+            String workingProcedureCode = null;
+            if(workingProcedure!=null){
+                workingProcedureName = workingProcedure.getName();
+                workingProcedureCode = workingProcedure.getCode();
+            }
             dto.setWorkingProcedureName(workingProcedureName);
+            dto.setWorkingProcedureCode(workingProcedureCode);
         }
         return dtoList;
     }

ym-baisc/src/main/resources/mapper/FeaturesStageProcedureRelationMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.basic.mapper.FeaturesStageProcedureRelationMapper">
+    <resultMap type="com.cnbm.basic.entity.FeaturesStageProcedureRelation" id="FeaturesStageProcedureRelationMap">
+            <id column="id" property="id" />
+            <id column="product_features_id" property="productFeaturesId" />
+            <id column="working_procedure_id" property="workingProcedureId" />
+            <id column="inspection_stage" property="inspectionStage" />
+            <id column="remark" property="remark" />
+            <id column="valid" property="valid" />
+            <id column="creator_id" property="creatorId" />
+            <id column="creator_name" property="creatorName" />
+            <id column="create_time" property="createTime" />
+            <id column="updater_id" property="updaterId" />
+            <id column="updater_name" property="updaterName" />
+            <id column="update_time" property="updateTime" />
+            <id column="version" property="version" />
+    </resultMap>
+
+</mapper>

ym-baisc/src/main/resources/mapper/MeasureToolMapper.xml

@@ -2,10 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cnbm.basic.mapper.MeasureToolMapper">
 
-    <select id="page" resultType="com.cnbm.basic.dto.ProductDTO">
+    <select id="list" resultType="com.cnbm.basic.dto.MeasureToolDTO">
-        select  product.*,product_type.name as productType
+        select * from measure_tool
-        from  product
+        order by id asc
-        left join product_type  ON product.product_type_id = product_type.id
     </select>
 
 </mapper>

ym-baisc/src/main/resources/mapper/ProductFeaturesMapper.xml

@@ -3,9 +3,8 @@
 <mapper namespace="com.cnbm.basic.mapper.ProductFeaturesMapper">
 
     <select id="getProductFeaturesByProductId" resultType="com.cnbm.basic.dto.ProductFeaturesDTO">
-        select p.*,w.code as workingProcedureCode,w.name as workingProcedureName,m.name as measureToolName,u.name as unitName,c.name as controlGraphName
+        select p.*,m.name as measureToolName,u.name as unitName,c.name as controlGraphName
         from product_features p
-        LEFT JOIN working_procedure w ON p.working_procedure_id=w.id
         LEFT JOIN measure_tool m ON p.measure_tool_id=m.id
         LEFT JOIN unit u ON p.unit_id=u.id
         LEFT JOIN control_graph c ON p.control_graph_id=c.id
@@ -15,4 +14,19 @@
         order by p.id asc
     </select>
 
+    <select id="getFeaturesByStageProcedure" resultType="com.cnbm.basic.dto.ProductFeaturesDTO">
+        select *
+        from product_features pf
+        LEFT JOIN features_stage_procedure_relation fspr ON pf.id=fspr.product_features_id
+        <where>
+            fspr.valid = 1
+            <if test="inspectionStage != null">
+                and fspr.inspection_stage = #{inspectionStage}
+            </if>
+            <if test="workingProcedureId != null">
+                and fspr.working_procedure_id = #{workingProcedureId}
+            </if>
+        </where>
+        order by pf.id asc
+    </select>
 </mapper>

ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/InspectionSheetController.java

@@ -58,7 +58,7 @@ public class InspectionSheetController {
         @ApiImplicitParam(name = "batchNumber", value = "批次号", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "id", value = "检验单号", paramType = "query", dataTypeClass = Integer.class)
     })
-//    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:page')")
+    @PreAuthorize("@ex.hasAuthority('processInspection:inspectionSheet:page')")
     public Result<PageData<InspectionSheetDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<InspectionSheetDTO> page = inspectionSheetService.page(params);
 
@@ -67,7 +67,7 @@ public class InspectionSheetController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-//    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:info')")
+    @PreAuthorize("@ex.hasAuthority('processInspection:inspectionSheet:info')")
     public Result<InspectionSheetDTO> get(@PathVariable("id") Long id){
         InspectionSheetDTO data = inspectionSheetService.get(id);
 
@@ -76,8 +76,8 @@ public class InspectionSheetController {
 
     @PostMapping
     @ApiOperation("保存")
-//    @LogOperation("保存")
+    @LogOperation("保存")
-//    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:save')")
+    @PreAuthorize("@ex.hasAuthority('processInspection:inspectionSheet:save')")
     public Result<Long> save(@RequestBody InspectionSheetDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -89,8 +89,8 @@ public class InspectionSheetController {
 
     @PutMapping
     @ApiOperation("修改")
-//    @LogOperation("修改")
+    @LogOperation("修改")
-//    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:update')")
+    @PreAuthorize("@ex.hasAuthority('processInspection:inspectionSheet:update')")
     public Result<Long> update(@RequestBody InspectionSheetDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -102,8 +102,8 @@ public class InspectionSheetController {
 
     @DeleteMapping
     @ApiOperation("删除")
-//    @LogOperation("删除")
+    @LogOperation("删除")
-//    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:delete')")
+    @PreAuthorize("@ex.hasAuthority('processInspection:inspectionSheet:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -115,8 +115,8 @@ public class InspectionSheetController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-//    @LogOperation("导出")
+    @LogOperation("导出")
-//    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:export')")
+    @PreAuthorize("@ex.hasAuthority('processInspection:inspectionSheet:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<InspectionSheetDTO> list = inspectionSheetService.list(params);
 

ym-process-inspection/src/main/java/com/cnbm/processInspection/mysql/InspectionSheetmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1564803881757933569, 1067246875800000035, '检验单 表', 'processInspection/inspectionSheet', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1564803881757933570, 1564803881757933569, '查看', NULL, 'processInspection:inspectionSheet:page,processInspection:inspectionSheet:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1564803881757933571, 1564803881757933569, '新增', NULL, 'processInspection:inspectionSheet:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1564803881757933572, 1564803881757933569, '修改', NULL, 'processInspection:inspectionSheet:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1564803881757933573, 1564803881757933569, '删除', NULL, 'processInspection:inspectionSheet:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1564803881757933574, 1564803881757933569, '导出', NULL, 'processInspection:inspectionSheet:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java

@@ -3,6 +3,14 @@ package com.cnbm.processInspection.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.basic.entity.Machine;
+import com.cnbm.basic.entity.Product;
+import com.cnbm.basic.entity.Shift;
+import com.cnbm.basic.entity.WorkingProcedure;
+import com.cnbm.basic.service.impl.MachineServiceImpl;
+import com.cnbm.basic.service.impl.ProductServiceImpl;
+import com.cnbm.basic.service.impl.ShiftServiceImpl;
+import com.cnbm.basic.service.impl.WorkingProcedureServiceImpl;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.common.utils.ConvertUtils;
@@ -29,15 +37,32 @@ import java.util.Map;
 public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetMapper, InspectionSheet, InspectionSheetDTO> implements IInspectionSheetService {
 
     @Autowired
-    private InspectionSheetMapper mapper;
+    private ProductServiceImpl productService;
+
+    @Autowired
+    private WorkingProcedureServiceImpl workingProcedureService;
+
+    @Autowired
+    private MachineServiceImpl machineService;
+
+    @Autowired
+    private ShiftServiceImpl shiftService;
     
     @Override
     public QueryWrapper<InspectionSheet> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
+        Long id = (Long)params.get("id");
+        String inspectionSite = (String)params.get("inspectionSite");
+        String orderNumber = (String)params.get("orderNumber");
+        String batchNumber = (String)params.get("batchNumber");
 
         QueryWrapper<InspectionSheet> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+        wrapper.like(ObjectUtils.isNotNull(id), "id", id);
-
+        wrapper.like(StringUtils.isNotBlank(inspectionSite), "inspection_stage", inspectionSite);
+        wrapper.like(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
+        wrapper.like(StringUtils.isNotBlank(batchNumber), "batch_number", batchNumber);
+        wrapper.eq(ObjectUtils.isNotNull(params.get("productId")), "product_id", params.get("productId"));
+        wrapper.eq(ObjectUtils.isNotNull(params.get("workingProcedureId")), "working_procedure_id", params.get("workingProcedureId"));
+        wrapper.eq(ObjectUtils.isNotNull(params.get("machineId")), "machine_id", params.get("machineId"));
         return wrapper;
     }
     
@@ -47,7 +72,40 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
                 getPage(params, "id", true),
                 getWrapper(params)
         );
-        return getPageData(page, InspectionSheetDTO.class);
+        PageData<InspectionSheetDTO> inspectionSheetDTOPageData = getPageData(page, InspectionSheetDTO.class);
+
+        if(!inspectionSheetDTOPageData.getList().isEmpty()){
+            for(InspectionSheetDTO dto:inspectionSheetDTOPageData.getList()){
+                Product product = productService.selectById(dto.getProductId());
+                WorkingProcedure workingProcedure = workingProcedureService.selectById(dto.getWorkingProcedureId());
+                Machine machine = machineService.selectById(dto.getMachineId());
+                Shift shift = shiftService.selectById(dto.getShiftId());
+
+                String productName = null;
+                String workingProcedureName = null;
+                String machineName = null;
+                String shiftName = null;
+
+                if (product!=null){
+                    productName = product.getName();
+                }
+                if (workingProcedure!=null){
+                    workingProcedureName = workingProcedure.getName();
+                }
+                if (machine!=null){
+                    machineName = machine.getName();
+                }
+                if (shift!=null){
+                    shiftName = shift.getName();
+                }
+
+                dto.setProductName(productName);
+                dto.setWorkingProcedureName(workingProcedureName);
+                dto.setMachineName(machineName);
+                dto.setShiftName(shiftName);
+            }
+        }
+        return inspectionSheetDTOPageData;
     }
 
     @Override
@@ -77,6 +135,9 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
         deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Autowired
+    private InspectionSheetMapper mapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<InspectionSheetDTO> list(Map<String, Object> params) {

ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/controller/ControlGraphController.java

@@ -49,7 +49,7 @@ public class ControlGraphController {
         @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
         @ApiImplicitParam(name = "type", value = "产品特征类型", paramType = "query", dataTypeClass = Integer.class)
     })
-//    @PreAuthorize("@ex.hasAuthority('code:controlGraph:page')")
+    @PreAuthorize("@ex.hasAuthority('code:controlGraph:page')")
     public Result<PageData<ControlGraphDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<ControlGraphDTO> page = controlGraphService.page(params);
 
@@ -58,7 +58,7 @@ public class ControlGraphController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-//    @PreAuthorize("@ex.hasAuthority('code:controlGraph:info')")
+    @PreAuthorize("@ex.hasAuthority('code:controlGraph:info')")
     public Result<ControlGraphDTO> get(@PathVariable("id") Long id){
         ControlGraphDTO data = controlGraphService.get(id);
 
@@ -67,8 +67,8 @@ public class ControlGraphController {
 
     @PostMapping
     @ApiOperation("保存")
-//    @LogOperation("保存")
+    @LogOperation("保存")
-//    @PreAuthorize("@ex.hasAuthority('code:controlGraph:save')")
+    @PreAuthorize("@ex.hasAuthority('code:controlGraph:save')")
     public Result<Long> save(@RequestBody ControlGraphDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -80,8 +80,8 @@ public class ControlGraphController {
 
     @PutMapping
     @ApiOperation("修改")
-//    @LogOperation("修改")
+    @LogOperation("修改")
-//    @PreAuthorize("@ex.hasAuthority('code:controlGraph:update')")
+    @PreAuthorize("@ex.hasAuthority('code:controlGraph:update')")
     public Result<Long> update(@RequestBody ControlGraphDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -93,8 +93,8 @@ public class ControlGraphController {
 
     @DeleteMapping
     @ApiOperation("删除")
-//    @LogOperation("删除")
+    @LogOperation("删除")
-//    @PreAuthorize("@ex.hasAuthority('code:controlGraph:delete')")
+    @PreAuthorize("@ex.hasAuthority('code:controlGraph:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -106,12 +106,18 @@ public class ControlGraphController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-//    @LogOperation("导出")
+    @LogOperation("导出")
-//    @PreAuthorize("@ex.hasAuthority('code:controlGraph:export')")
+    @PreAuthorize("@ex.hasAuthority('code:controlGraph:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ControlGraphDTO> list = controlGraphService.list(params);
 
         ExcelUtils.exportExcelToTarget(response, null, list, ControlGraphExcel.class);
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取控制图形列表")
+    @LogOperation("获取控制图形列表")
+    public List<ControlGraphDTO> list() {
+        return controlGraphService.list();
+    }
 }

ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/controller/InterpretationSchemeController.java

@@ -50,7 +50,7 @@ public class InterpretationSchemeController {
         @ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class)
     })
-//    @PreAuthorize("@ex.hasAuthority('code:interpretationScheme:page')")
+    @PreAuthorize("@ex.hasAuthority('qualityPlanning:interpretationScheme:page')")
     public Result<PageData<InterpretationSchemeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<InterpretationSchemeDTO> page = interpretationSchemeService.page(params);
 
@@ -59,7 +59,7 @@ public class InterpretationSchemeController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-//    @PreAuthorize("@ex.hasAuthority('code:interpretationScheme:info')")
+    @PreAuthorize("@ex.hasAuthority('qualityPlanning:interpretationScheme:info')")
     public Result<InterpretationSchemeDTO> get(@PathVariable("id") Long id){
         InterpretationSchemeDTO data = interpretationSchemeService.get(id);
 
@@ -68,8 +68,8 @@ public class InterpretationSchemeController {
 
     @PostMapping
     @ApiOperation("保存")
-//    @LogOperation("保存")
+    @LogOperation("保存")
-//    @PreAuthorize("@ex.hasAuthority('code:interpretationScheme:save')")
+    @PreAuthorize("@ex.hasAuthority('qualityPlanning:interpretationScheme:save')")
     public Result<Long> save(@RequestBody InterpretationSchemeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -81,8 +81,8 @@ public class InterpretationSchemeController {
 
     @PutMapping
     @ApiOperation("修改")
-//    @LogOperation("修改")
+    @LogOperation("修改")
-//    @PreAuthorize("@ex.hasAuthority('code:interpretationScheme:update')")
+    @PreAuthorize("@ex.hasAuthority('qualityPlanning:interpretationScheme:update')")
     public Result<Long> update(@RequestBody InterpretationSchemeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -94,8 +94,8 @@ public class InterpretationSchemeController {
 
     @DeleteMapping
     @ApiOperation("删除")
-//    @LogOperation("删除")
+    @LogOperation("删除")
-//    @PreAuthorize("@ex.hasAuthority('code:interpretationScheme:delete')")
+    @PreAuthorize("@ex.hasAuthority('qualityPlanning:interpretationScheme:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -107,12 +107,18 @@ public class InterpretationSchemeController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-//    @LogOperation("导出")
+    @LogOperation("导出")
-//    @PreAuthorize("@ex.hasAuthority('code:interpretationScheme:export')")
+    @PreAuthorize("@ex.hasAuthority('qualityPlanning:interpretationScheme:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<InterpretationSchemeDTO> list = interpretationSchemeService.list(params);
 
         ExcelUtils.exportExcelToTarget(response, null, list, InterpretationSchemeExcel.class);
     }
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "获取判读方案列表")
+    public List<InterpretationSchemeDTO> list() {
+        return interpretationSchemeService.list();
+    }
+
 }

ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/controller/MyInterpretationSchemeController.java

@@ -50,7 +50,7 @@ public class MyInterpretationSchemeController {
         @ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class),
         @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class)
     })
-//    @PreAuthorize("@ex.hasAuthority('code:myInterpretationScheme:page')")
+    @PreAuthorize("@ex.hasAuthority('qualityPlanning:myInterpretationScheme:page')")
     public Result<PageData<MyInterpretationSchemeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<MyInterpretationSchemeDTO> page = myInterpretationSchemeService.page(params);
 
@@ -59,7 +59,7 @@ public class MyInterpretationSchemeController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-//    @PreAuthorize("@ex.hasAuthority('code:myInterpretationScheme:info')")
+    @PreAuthorize("@ex.hasAuthority('qualityPlanning:myInterpretationScheme:info')")
     public Result<MyInterpretationSchemeDTO> get(@PathVariable("id") Long id){
         MyInterpretationSchemeDTO data = myInterpretationSchemeService.get(id);
 
@@ -68,8 +68,8 @@ public class MyInterpretationSchemeController {
 
     @PostMapping
     @ApiOperation("保存")
-//    @LogOperation("保存")
+    @LogOperation("保存")
-//    @PreAuthorize("@ex.hasAuthority('code:myInterpretationScheme:save')")
+    @PreAuthorize("@ex.hasAuthority('qualityPlanning:myInterpretationScheme:save')")
     public Result<Long> save(@RequestBody MyInterpretationSchemeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -81,8 +81,8 @@ public class MyInterpretationSchemeController {
 
     @PutMapping
     @ApiOperation("修改")
-//    @LogOperation("修改")
+    @LogOperation("修改")
-//    @PreAuthorize("@ex.hasAuthority('code:myInterpretationScheme:update')")
+    @PreAuthorize("@ex.hasAuthority('qualityPlanning:myInterpretationScheme:update')")
     public Result<Long> update(@RequestBody MyInterpretationSchemeDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -94,8 +94,8 @@ public class MyInterpretationSchemeController {
 
     @DeleteMapping
     @ApiOperation("删除")
-//    @LogOperation("删除")
+    @LogOperation("删除")
-//    @PreAuthorize("@ex.hasAuthority('code:myInterpretationScheme:delete')")
+    @PreAuthorize("@ex.hasAuthority('qualityPlanning:myInterpretationScheme:delete')")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -107,8 +107,8 @@ public class MyInterpretationSchemeController {
 
     @GetMapping("export")
     @ApiOperation("导出")
-//    @LogOperation("导出")
+    @LogOperation("导出")
-//    @PreAuthorize("@ex.hasAuthority('code:myInterpretationScheme:export')")
+    @PreAuthorize("@ex.hasAuthority('qualityPlanning:myInterpretationScheme:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<MyInterpretationSchemeDTO> list = myInterpretationSchemeService.list(params);
 

ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/dto/MyInterpretationSchemeDTO.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * @since  2022-08-15
  */
 @Data
-@ApiModel(value = "判读方案 表DTO对象")
+@ApiModel(value = "自定义判读方案 表DTO对象")
 public class MyInterpretationSchemeDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 

ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/entity/MyInterpretationScheme.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("my_interpretation_scheme")
-@ApiModel(value = "MyInterpretationScheme对象", description = "判读方案 表")
+@ApiModel(value = "MyInterpretationScheme对象", description = "自定义判读方案 表")
 public class MyInterpretationScheme implements Serializable {
 
     private static final long serialVersionUID = 1L;

ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/mapper/ControlGraphMapper.java

@@ -1,9 +1,12 @@
 package com.cnbm.qualityPlanning.mapper;
 
 import com.cnbm.common.dao.BaseDao;
+import com.cnbm.qualityPlanning.dto.ControlGraphDTO;
 import com.cnbm.qualityPlanning.entity.ControlGraph;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 控制图形 表
  *
@@ -12,5 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ControlGraphMapper extends BaseDao<ControlGraph> {
-	
+	List<ControlGraphDTO> list();
 }

ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/mysql/ControlGraphmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1562340593497346049, 1067246875800000035, '控制图形 表', 'qualityPlanning/controlGraph', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340593497346050, 1562340593497346049, '查看', NULL, 'qualityPlanning:controlGraph:page,qualityPlanning:controlGraph:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340593497346051, 1562340593497346049, '新增', NULL, 'qualityPlanning:controlGraph:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340593497346052, 1562340593497346049, '修改', NULL, 'qualityPlanning:controlGraph:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340593497346053, 1562340593497346049, '删除', NULL, 'qualityPlanning:controlGraph:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340593497346054, 1562340593497346049, '导出', NULL, 'qualityPlanning:controlGraph:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/mysql/InterpretationSchememysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1562340725907296257, 1067246875800000035, '判读方案 表', 'qualityPlanning/interpretationScheme', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340725907296258, 1562340725907296257, '查看', NULL, 'qualityPlanning:interpretationScheme:page,qualityPlanning:interpretationScheme:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340725907296259, 1562340725907296257, '新增', NULL, 'qualityPlanning:interpretationScheme:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340725907296260, 1562340725907296257, '修改', NULL, 'qualityPlanning:interpretationScheme:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340725907296261, 1562340725907296257, '删除', NULL, 'qualityPlanning:interpretationScheme:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340725907296262, 1562340725907296257, '导出', NULL, 'qualityPlanning:interpretationScheme:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/mysql/MyInterpretationSchememysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1562340887257968641, 1067246875800000035, '判读方案 表', 'qualityPlanning/myInterpretationScheme', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340887257968642, 1562340887257968641, '查看', NULL, 'qualityPlanning:myInterpretationScheme:page,qualityPlanning:myInterpretationScheme:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340887257968643, 1562340887257968641, '新增', NULL, 'qualityPlanning:myInterpretationScheme:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340887257968644, 1562340887257968641, '修改', NULL, 'qualityPlanning:myInterpretationScheme:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340887257968645, 1562340887257968641, '删除', NULL, 'qualityPlanning:myInterpretationScheme:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340887257968646, 1562340887257968641, '导出', NULL, 'qualityPlanning:myInterpretationScheme:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/service/IControlGraphService.java

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
 import com.cnbm.qualityPlanning.dto.ControlGraphDTO;
 import com.cnbm.qualityPlanning.entity.ControlGraph;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -23,4 +24,7 @@ public interface IControlGraphService extends CrudService<ControlGraph, ControlG
     void update(ControlGraphDTO dto);
 
     void delete(Long[] ids);
+
+    List<ControlGraphDTO> list();
+
 }

ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/service/impl/ControlGraphServiceImpl.java

@@ -11,10 +11,12 @@ import com.cnbm.qualityPlanning.entity.ControlGraph;
 import com.cnbm.qualityPlanning.mapper.ControlGraphMapper;
 import com.cnbm.qualityPlanning.service.IControlGraphService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -70,4 +72,15 @@ public class ControlGraphServiceImpl extends CrudServiceImpl<ControlGraphMapper,
         //删除
         deleteBatchIds(Arrays.asList(ids));
     }
+
+
+    @Autowired
+    private ControlGraphMapper mapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<ControlGraphDTO> list() {
+        List<ControlGraphDTO> list = mapper.list();
+        return list;
+    }
 }

ym-quality-planning/src/main/resources/mapper/ControlGraphMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cnbm.generator.code.mapper.ControlGraphMapper">
+<mapper namespace="com.cnbm.qualityPlanning.mapper.ControlGraphMapper">
     <resultMap type="com.cnbm.qualityPlanning.entity.ControlGraph" id="ControlGraphMap">
             <id column="id" property="id" />
             <id column="name" property="name" />
@@ -18,4 +18,9 @@
             <id column="version" property="version" />
     </resultMap>
 
+    <select id="list" resultType="com.cnbm.qualityPlanning.dto.ControlGraphDTO">
+        select * from control_graph
+        order by id asc
+    </select>
+
 </mapper>

ym-quality-planning/src/main/resources/mapper/InterpretationSchemeMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cnbm.generator.code.mapper.InterpretationSchemeMapper">
+<mapper namespace="com.cnbm.qualityPlanning.mapper.InterpretationSchemeMapper">
     <resultMap type="com.cnbm.qualityPlanning.entity.InterpretationScheme" id="InterpretationSchemeMap">
             <id column="id" property="id" />
             <id column="code" property="code" />

ym-quality-planning/src/main/resources/mapper/MyInterpretationSchemeMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cnbm.generator.code.mapper.MyInterpretationSchemeMapper">
+<mapper namespace="com.cnbm.qualityPlanning.mapper.MyInterpretationSchemeMapper">
     <resultMap type="com.cnbm.qualityPlanning.entity.MyInterpretationScheme" id="MyInterpretationSchemeMap">
             <id column="id" property="id" />
             <id column="code" property="code" />