MARK FOR PULL

2022-12-07 11:07:31 +08:00
parent ab35b10130
commit b515eacbab
38 changed files with 828 additions and 65 deletions
--- a/ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
+++ b/ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
@@ -19,7 +19,7 @@ public class CodeGenerator {

    @Test
    public void test(){
-        mybatisPlusGenerator(new String[]{"product_type"});
+        mybatisPlusGenerator(new String[]{"inspection_sheet"});
    }

    public static void mybatisPlusGenerator(String[] include){
--- a/ym-generator/src/main/java/com/cnbm/generator/code/controller/InspectionSheetController.java
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/controller/InspectionSheetController.java
@@ -0,0 +1,118 @@
+package com.cnbm.generator.code.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.generator.code.dto.InspectionSheetDTO;
+import com.cnbm.generator.code.excel.InspectionSheetExcel;
+import com.cnbm.generator.code.service.IInspectionSheetService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+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-12-07
+ */
+@RestController
+@RequestMapping("/code/inspectionSheet")
+@Api(tags="检验单 表")
+public class InspectionSheetController {
+    @Autowired
+    private IInspectionSheetService inspectionSheetService;
+
+    @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)
+    })
+    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:page')")
+    public Result<PageData<InspectionSheetDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<InspectionSheetDTO> page = inspectionSheetService.page(params);
+
+        return new Result<PageData<InspectionSheetDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:info')")
+    public Result<InspectionSheetDTO> get(@PathVariable("id") Long id){
+        InspectionSheetDTO data = inspectionSheetService.get(id);
+
+        return new Result<InspectionSheetDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:save')")
+    public Result<Long> save(@RequestBody InspectionSheetDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        try {
+            inspectionSheetService.save(dto);
+        }catch (Exception e){
+            return new Result<Long>().error(1,"没有发现检验参数");
+        }
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:update')")
+    public Result<Long> update(@RequestBody InspectionSheetDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        inspectionSheetService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        inspectionSheetService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:inspectionSheet:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<InspectionSheetDTO> list = inspectionSheetService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, InspectionSheetExcel.class);
+    }
+
+}
--- a/ym-generator/src/main/java/com/cnbm/generator/code/dto/InspectionSheetDTO.java
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/dto/InspectionSheetDTO.java
@@ -0,0 +1,104 @@
+package com.cnbm.generator.code.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 检验单 表
+ *
+ * @author why
+ * @since  2022-12-07
+ */
+@Data
+@ApiModel(value = "检验单 表DTO对象")
+public class InspectionSheetDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "订单号，手动输入")
+	private String orderNumber;
+
+	@ApiModelProperty(value = "批次号，手填")
+	private String batchNumber;
+
+	@ApiModelProperty(value = "检验站点，手填")
+	private String inspectionSite;
+
+	@ApiModelProperty(value = "产品id，关联product表")
+	private Long productId;
+
+	@ApiModelProperty(value = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+	private Integer inspectionStage;
+
+	@ApiModelProperty(value = "工序id，关联working_procedure表")
+	private Long workingProcedureId;
+
+	@ApiModelProperty(value = "机台id，关联machine表")
+	private Long machineId;
+
+	@ApiModelProperty(value = "班次id，关联shift表")
+	private Long shiftId;
+
+	@ApiModelProperty(value = "分组样本数（就是这个产品下所有检测参数 的 最大样本数），只给用户查看，值是后台自动计算的")
+	private Integer numberOfGroupedSamples;
+
+	@ApiModelProperty(value = "样本大小（就是检验单（母体）下的子样个数）,只给用户查看，值是后台自动计算的")
+	private Integer numberOfSamples;
+
+	@ApiModelProperty(value = "缺陷数量，只给用户查看，值是后台自动计算的（是以 这个检验单下  样本子样  为单位的 ）")
+	private Integer numberOfDefects;
+
+	@ApiModelProperty(value = "不良数量，只给用户查看，值是后台自动计算的（是以 这个检验单下  样本子样  为单位的 ）")
+	private Integer defectiveQuantity;
+
+	@ApiModelProperty(value = "生产人")
+	private String producer;
+
+	@ApiModelProperty(value = "检验人")
+	private String inspector;
+
+	@ApiModelProperty(value = "产品特性类型：1 计量型；2 计数型")
+	private Integer type;
+
+	@ApiModelProperty(value = "1 可用，0 不可用")
+	private Integer status;
+
+	@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;
+
+}
--- a/ym-generator/src/main/java/com/cnbm/generator/code/entity/InspectionSheet.java
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/entity/InspectionSheet.java
@@ -0,0 +1,106 @@
+package com.cnbm.generator.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 检验单 表
+ * </p>
+ *
+ * @author why
+ * @since 2022-12-07
+ */
+@Data
+@TableName("inspection_sheet")
+@ApiModel(value = "InspectionSheet对象", description = "检验单 表")
+public class InspectionSheet implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("订单号，手动输入")
+    private String orderNumber;
+
+    @ApiModelProperty("批次号，手填")
+    private String batchNumber;
+
+    @ApiModelProperty("检验站点，手填")
+    private String inspectionSite;
+
+    @ApiModelProperty("产品id，关联product表")
+    private Long productId;
+
+    @ApiModelProperty("检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+    private Integer inspectionStage;
+
+    @ApiModelProperty("工序id，关联working_procedure表")
+    private Long workingProcedureId;
+
+    @ApiModelProperty("机台id，关联machine表")
+    private Long machineId;
+
+    @ApiModelProperty("班次id，关联shift表")
+    private Long shiftId;
+
+    @ApiModelProperty("分组样本数（就是这个产品下所有检测参数 的 最大样本数），只给用户查看，值是后台自动计算的")
+    private Integer numberOfGroupedSamples;
+
+    @ApiModelProperty("样本大小（就是检验单（母体）下的子样个数）,只给用户查看，值是后台自动计算的")
+    private Integer numberOfSamples;
+
+    @ApiModelProperty("缺陷数量，只给用户查看，值是后台自动计算的（是以 这个检验单下  样本子样  为单位的 ）")
+    private Integer numberOfDefects;
+
+    @ApiModelProperty("不良数量，只给用户查看，值是后台自动计算的（是以 这个检验单下  样本子样  为单位的 ）")
+    private Integer defectiveQuantity;
+
+    @ApiModelProperty("生产人")
+    private String producer;
+
+    @ApiModelProperty("检验人")
+    private String inspector;
+
+    @ApiModelProperty("产品特性类型：1 计量型；2 计数型")
+    private Integer type;
+
+    @ApiModelProperty("1 可用，0 不可用")
+    private Integer status;
+
+    @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;
+
+
+}
--- a/ym-generator/src/main/java/com/cnbm/generator/code/excel/InspectionSheetExcel.java
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/excel/InspectionSheetExcel.java
@@ -0,0 +1,72 @@
+package com.cnbm.generator.code.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 检验单 表
+ *
+ * @author why
+ * @since  2022-12-07
+ */
+@Data
+public class InspectionSheetExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "订单号，手动输入")
+    private String orderNumber;
+    @Excel(name = "批次号，手填")
+    private String batchNumber;
+    @Excel(name = "检验站点，手填")
+    private String inspectionSite;
+    @Excel(name = "产品id，关联product表")
+    private Long productId;
+    @Excel(name = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+    private Integer inspectionStage;
+    @Excel(name = "工序id，关联working_procedure表")
+    private Long workingProcedureId;
+    @Excel(name = "机台id，关联machine表")
+    private Long machineId;
+    @Excel(name = "班次id，关联shift表")
+    private Long shiftId;
+    @Excel(name = "分组样本数（就是这个产品下所有检测参数 的 最大样本数），只给用户查看，值是后台自动计算的")
+    private Integer numberOfGroupedSamples;
+    @Excel(name = "样本大小（就是检验单（母体）下的子样个数）,只给用户查看，值是后台自动计算的")
+    private Integer numberOfSamples;
+    @Excel(name = "缺陷数量，只给用户查看，值是后台自动计算的（是以 这个检验单下  样本子样  为单位的 ）")
+    private Integer numberOfDefects;
+    @Excel(name = "不良数量，只给用户查看，值是后台自动计算的（是以 这个检验单下  样本子样  为单位的 ）")
+    private Integer defectiveQuantity;
+    @Excel(name = "生产人")
+    private String producer;
+    @Excel(name = "检验人")
+    private String inspector;
+    @Excel(name = "产品特性类型：1 计量型；2 计数型")
+    private Integer type;
+    @Excel(name = "1 可用，0 不可用")
+    private Integer status;
+    @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;
+
+}
--- a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/InspectionSheetMapper.java
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/InspectionSheetMapper.java
@@ -0,0 +1,16 @@
+package com.cnbm.generator.code.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.generator.code.entity.InspectionSheet;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 检验单 表
+ *
+ * @author why
+ * @since 2022-12-07
+ */
+@Mapper
+public interface InspectionSheetMapper extends BaseDao<InspectionSheet> {
+	
+}
--- a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/InspectionSheetMapper.xml
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/InspectionSheetMapper.xml
@@ -0,0 +1,33 @@
+<?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.InspectionSheetMapper">
+    <resultMap type="com.cnbm.generator.code.entity.InspectionSheet" id="InspectionSheetMap">
+            <id column="id" property="id" />
+            <id column="order_number" property="orderNumber" />
+            <id column="batch_number" property="batchNumber" />
+            <id column="inspection_site" property="inspectionSite" />
+            <id column="product_id" property="productId" />
+            <id column="inspection_stage" property="inspectionStage" />
+            <id column="working_procedure_id" property="workingProcedureId" />
+            <id column="machine_id" property="machineId" />
+            <id column="shift_id" property="shiftId" />
+            <id column="number_of_grouped_samples" property="numberOfGroupedSamples" />
+            <id column="number_of_samples" property="numberOfSamples" />
+            <id column="number_of_defects" property="numberOfDefects" />
+            <id column="defective_quantity" property="defectiveQuantity" />
+            <id column="producer" property="producer" />
+            <id column="inspector" property="inspector" />
+            <id column="type" property="type" />
+            <id column="status" property="status" />
+            <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>
--- a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/InspectionSheetmysql.sql
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/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 (1600308190230409218, 1067246875800000035, '检验单 表', 'code/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 (1600308190230409219, 1600308190230409218, '查看', NULL, 'code:inspectionSheet:page,code: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 (1600308190230409220, 1600308190230409218, '新增', NULL, 'code: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 (1600308190230409221, 1600308190230409218, '修改', NULL, 'code: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 (1600308190230409222, 1600308190230409218, '删除', NULL, 'code: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 (1600308190230409223, 1600308190230409218, '导出', NULL, 'code:inspectionSheet:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());
--- a/ym-generator/src/main/java/com/cnbm/generator/code/service/IInspectionSheetService.java
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/IInspectionSheetService.java
@@ -0,0 +1,15 @@
+package com.cnbm.generator.code.service;
+
+import com.cnbm.common.service.CrudService;
+import com.cnbm.generator.code.dto.InspectionSheetDTO;
+import com.cnbm.generator.code.entity.InspectionSheet;
+
+/**
+ * 检验单 表
+ *
+ * @author why
+ * @since  2022-12-07
+ */
+public interface IInspectionSheetService extends CrudService<InspectionSheet, InspectionSheetDTO> {
+
+}
--- a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/InspectionSheetServiceImpl.java
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/InspectionSheetServiceImpl.java
@@ -0,0 +1,34 @@
+package com.cnbm.generator.code.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.cnbm.common.service.impl.CrudServiceImpl;
+import com.cnbm.generator.code.dto.InspectionSheetDTO;
+import com.cnbm.generator.code.mapper.InspectionSheetMapper;
+import com.cnbm.generator.code.entity.InspectionSheet;
+import com.cnbm.generator.code.service.IInspectionSheetService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 检验单 表
+ *
+ * @author why
+ * @since 2022-12-07
+ */
+@Service
+public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetMapper, InspectionSheet, InspectionSheetDTO> implements IInspectionSheetService {
+
+    @Override
+    public QueryWrapper<InspectionSheet> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<InspectionSheet> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+
+}