偏置点管理

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/dao/OrderQualityMapper.java

@@ -0,0 +1,24 @@
+package com.github.zuihou.business.operationManagementCenter.dao;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.github.zuihou.base.mapper.SuperMapper;
+import com.github.zuihou.business.operationManagementCenter.entity.OrderQuality;
+import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * Mapper 接口
+ * 订单表
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-28
+ */
+@Repository
+public interface OrderQualityMapper extends SuperMapper<OrderQuality> {
+    IPage<OrderQuality> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<OrderQuality> queryWrapper);
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/OrderQualityService.java

@@ -0,0 +1,26 @@
+package com.github.zuihou.business.operationManagementCenter.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.operationManagementCenter.entity.OrderQuality;
+import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 业务接口
+ * 质量表
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-29
+ */
+public interface OrderQualityService extends SuperService<OrderQuality> {
+
+    IPage<OrderQuality> pageList(IPage page, LbqWrapper<OrderQuality> wrapper);
+
+
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderQualityServiceImpl.java

@@ -0,0 +1,54 @@
+package com.github.zuihou.business.operationManagementCenter.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.service.SuperServiceImpl;
+import com.github.zuihou.business.edgeLibrary.dao.StorgeMapper;
+import com.github.zuihou.business.edgeLibrary.entity.Storge;
+import com.github.zuihou.business.mq.HandModeWorkNode;
+import com.github.zuihou.business.operationManagementCenter.dao.OrderQualityMapper;
+import com.github.zuihou.business.operationManagementCenter.dao.WorkpieceMapper;
+import com.github.zuihou.business.operationManagementCenter.entity.OrderQuality;
+import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
+import com.github.zuihou.business.operationManagementCenter.entity.TaskNode;
+import com.github.zuihou.business.operationManagementCenter.service.OrderQualityService;
+import com.github.zuihou.business.operationManagementCenter.service.TaskNodeService;
+import com.github.zuihou.business.operationManagementCenter.service.WorkpieceService;
+import com.github.zuihou.business.productionReadyCenter.dao.BBomMapper;
+import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourcePositionMapper;
+import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
+import com.github.zuihou.business.productionResourceCenter.service.ProductionresourcePositionService;
+import com.github.zuihou.common.util.StringUtil;
+import com.github.zuihou.context.BaseContextHandler;
+import com.github.zuihou.database.mybatis.conditions.Wraps;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.stream.Collectors.groupingBy;
+
+/**
+ * <p>
+ * 业务实现类
+ * 质量表
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-28
+ */
+@Slf4j
+@Service
+public class OrderQualityServiceImpl extends SuperServiceImpl<OrderQualityMapper, OrderQuality> implements OrderQualityService {
+
+    @Override
+    public IPage<OrderQuality> pageList(IPage page, LbqWrapper<OrderQuality> wrapper) {
+        return baseMapper.pageList(page, wrapper);
+    }
+}

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/OrderQualityMapper.xml

@@ -0,0 +1,54 @@
+<?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.github.zuihou.business.operationManagementCenter.dao.OrderQualityMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.github.zuihou.business.operationManagementCenter.entity.OrderQuality">
+        <result column="id" jdbcType="BIGINT" property="id"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="create_user" jdbcType="BIGINT" property="createUser"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="update_user" jdbcType="BIGINT" property="updateUser"/>
+        <result column="order_no" jdbcType="VARCHAR" property="orderNo"/>
+        <result column="order_id" jdbcType="BIGINT" property="orderId"/>
+        <result column="task_id" jdbcType="BIGINT" property="taskId"/>
+        <result column="workpiece_id" jdbcType="VARCHAR" property="workpieceId"/>
+        <result column="workpiece_name" jdbcType="VARCHAR" property="workpieceName"/>
+        <result column="procedure_id" jdbcType="BIGINT" property="procedureId"/>
+        <result column="procedure_name" jdbcType="VARCHAR" property="procedureName"/>
+        <result column="measuring_type" jdbcType="INTEGER" property="measuringType"/>
+        <result column="measuring_program" jdbcType="VARCHAR" property="measuringProgram"/>
+        <result column="ok_flag" jdbcType="VARCHAR" property="okFlag"/>
+        <result column="sketchy_xaxis_offset" jdbcType="DECIMAL" property="sketchyXaxisOffset"/>
+        <result column="sketchy_yaxis_offset" jdbcType="DECIMAL" property="sketchyYaxisOffset"/>
+        <result column="sketchy_zaxis_offset" jdbcType="DECIMAL" property="sketchyZaxisOffset"/>
+        <result column="sketchy_aaxis_offset" jdbcType="DECIMAL" property="sketchyAaxisOffset"/>
+        <result column="sketchy_baxis_offset" jdbcType="DECIMAL" property="sketchyBaxisOffset"/>
+        <result column="sketchy_caxis_offset" jdbcType="DECIMAL" property="sketchyCaxisOffset"/>
+        <result column="exact_xaxis_offset" jdbcType="DECIMAL" property="exactXaxisOffset"/>
+        <result column="exact_yaxis_offset" jdbcType="DECIMAL" property="exactYaxisOffset"/>
+        <result column="exact_zaxis_offset" jdbcType="DECIMAL" property="exactZaxisOffset"/>
+        <result column="exact_aaxis_offset" jdbcType="DECIMAL" property="exactAaxisOffset"/>
+        <result column="exact_baxis_offset" jdbcType="DECIMAL" property="exactBaxisOffset"/>
+        <result column="exact_caxis_offset" jdbcType="DECIMAL" property="exactCaxisOffset"/>
+        <result column="measuring_report" jdbcType="VARCHAR" property="measuringReport"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,create_time,create_user,update_time,update_user,
+        order_no, order_id,task_id,workpiece_id,workpiece_name,procedure_id,procedure_name,measuring_type,measuring_program,ok_flag,
+        sketchy_xaxis_offset,sketchy_yaxis_offset,sketchy_zaxis_offset,sketchy_aaxis_offset,sketchy_baxis_offset,sketchy_caxis_offset,
+        exact_xaxis_offset,exact_yaxis_offset,exact_zaxis_offset,exact_aaxis_offset,exact_baxis_offset,exact_caxis_offset,measuring_report
+    </sql>
+
+    <!-- 分页 -->
+    <select id="pageList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from (select w.*
+        from imcs_order_quality_info w
+        ) s ${ew.customSqlSegment}
+    </select>
+
+</mapper>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/MeasuringController.java

@@ -0,0 +1,121 @@
+package com.github.zuihou.business.controller.operationManagementCenter;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.R;
+import com.github.zuihou.base.controller.SuperController;
+import com.github.zuihou.base.request.PageParams;
+import com.github.zuihou.business.operationManagementCenter.dto.*;
+import com.github.zuihou.business.operationManagementCenter.entity.OrderQuality;
+import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
+import com.github.zuihou.business.operationManagementCenter.service.OrderQualityService;
+import com.github.zuihou.business.operationManagementCenter.service.WorkpieceService;
+import com.github.zuihou.common.util.StringUtil;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
+import com.github.zuihou.file.entity.File;
+import com.github.zuihou.log.annotation.SysLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jcifs.smb.NtlmPasswordAuthentication;
+import jcifs.smb.SmbFile;
+import jcifs.smb.SmbFileInputStream;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 前端控制器
+ * 质量测量
+ * </p>
+ *
+ * @author imcs
+ * @date 2021-12-27
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/measuring")
+@Api(value = "task", tags = "测量")
+@SysLog(enabled = true)
+public class MeasuringController extends SuperController<OrderQualityService, Long, OrderQuality, OrderQualityPageDTO, OrderQualitySaveDTO, OrderQualityUpdateDTO> {
+
+    @Value("${zuihou.smb.userName}")
+    private String userName;
+    @Value("${zuihou.smb.password}")
+    private String password;
+    @Value("${zuihou.smb.password}")
+    private String fileIp;
+    @Value("${zuihou.smb.filePath}")
+    private String filePath;
+
+    @Override
+    public void query(PageParams<OrderQualityPageDTO> params, IPage<OrderQuality> page, Long defSize) {
+        OrderQualityPageDTO data = params.getModel();
+        QueryWrap<OrderQuality> wrap = handlerWrapper(null, params);
+        LbqWrapper<OrderQuality> wrapper = wrap.lambda();
+        OrderQuality orderQuality = BeanUtil.toBean(data, OrderQuality.class);
+
+        wrapper.like(OrderQuality::getWorkpieceName,orderQuality.getWorkpieceName())
+                .like(OrderQuality::getOrderNo,orderQuality.getOrderNo())
+                .like(OrderQuality::getWorkpieceId,orderQuality.getWorkpieceId())
+                .like(OrderQuality::getCreateTime,data.getCreateTime());
+
+        baseService.pageList(page, wrapper);
+    }
+
+    /**
+     * 下载远程质检报告
+     *
+     * @param response  文件下载
+     * @param map 测量报告参数
+     * @throws IOException
+     */
+    @ApiOperation(value = "下载远程质检报告", notes = "下载远程质检报告")
+    @RequestMapping(value="/downloadFile", method = RequestMethod.POST)
+    @SysLog("下载远程质检报告")
+    public R<File> downloadFile(HttpServletResponse response, @RequestBody  Map<String, Object> map) throws IOException, FileNotFoundException {
+        String id  = map.get("id").toString();
+        String fileName = id + ".csv";
+        response.setHeader("content-type", "text/csv");
+        response.setContentType("application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+        byte[] buff = new byte[1024];
+        BufferedInputStream bis = null;
+        OutputStream outputStream = null;
+
+        try {
+            outputStream = response.getOutputStream();
+            NtlmPasswordAuthentication auth =new NtlmPasswordAuthentication(fileIp, userName, password);
+            bis = new BufferedInputStream(new SmbFileInputStream(new SmbFile(filePath + fileName,auth )));
+            int read = bis.read(buff);
+            while (read != -1) {
+                outputStream.write(buff, 0, buff.length);
+                outputStream.flush();
+                read = bis.read(buff);
+            }
+        } catch ( IOException e ) {
+            e.printStackTrace();
+            return fail("文件不存在");
+        } finally {
+            if (bis != null) {
+                bis.close();
+            }
+            if (outputStream != null) {
+                outputStream.close();
+            }
+        }
+        return null;
+    }
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/dto/OrderQualityPageDTO.java

@@ -0,0 +1,186 @@
+package com.github.zuihou.business.operationManagementCenter.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
+/**
+ * <p>
+ * 实体类
+ * 测量报告表
+ * </p>
+ *
+ * @author imcs
+ * @since 2021-12-27
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "OrderQualityPageDTO", description = "测量表")
+public class OrderQualityPageDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty(value = "订单编号")
+    @Excel(name = "订单编号")
+    private String orderNo;
+
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty(value = "订单ID")
+    @TableField("order_id")
+    @Excel(name = "订单ID")
+    private Long orderId;
+
+    @ApiModelProperty(value = "任务ID")
+    @Excel(name = "任务ID")
+    private Long taskId;
+
+    /**
+     * 工件ID
+     */
+    @ApiModelProperty(value = "工件ID)")
+    private String workpieceId;
+
+    /**
+     * 工件名称
+     */
+    @ApiModelProperty(value = "工件名称)")
+    private String workpieceName;
+
+    /**
+     * 工序ID
+     */
+    @ApiModelProperty(value = "工序id)")
+    private Long procedureId;
+
+    /**
+     * 工序名称
+     */
+    @ApiModelProperty(value = "工序名称)")
+    private String procedureName;
+
+    /**
+     * 测量类型
+     */
+    @ApiModelProperty(value = "测量类型 1:质量检测 2工件坐标系检测 3人工测量)")
+    private int measuringType;
+
+    /**
+     * 测量类型
+     */
+    @ApiModelProperty(value = "测量程序")
+    private String measuringProgram;
+
+    /**
+     * 测量结果
+     */
+    @ApiModelProperty(value = "测量结果 OK：合格  NG：不合格")
+    private String okFlag;
+
+    /**
+     * x轴粗偏值
+     */
+    @ApiModelProperty(value = "x轴粗偏值")
+    private BigDecimal sketchyXaxisOffset;
+
+    /**
+     * y轴粗偏值
+     */
+    @ApiModelProperty(value = "y轴粗偏值")
+    private BigDecimal sketchyYaxisOffset;
+
+    /**
+     * z轴粗偏值
+     */
+    @ApiModelProperty(value = "z轴粗偏值")
+    private BigDecimal sketchyZaxisOffset;
+
+    /**
+     * a轴粗偏值
+     */
+    @ApiModelProperty(value = "a轴粗偏值")
+    private BigDecimal sketchyAaxisOffset;
+
+    /**
+     * b轴粗偏值
+     */
+    @ApiModelProperty(value = "b轴粗偏值")
+    private BigDecimal sketchyBaxisOffset;
+
+    /**
+     * c轴粗偏值
+     */
+    @ApiModelProperty(value = "c轴粗偏值")
+    private BigDecimal sketchyCaxisOffset;
+
+
+    /**
+     * x轴精偏值
+     */
+    @ApiModelProperty(value = "x轴精偏值")
+    private BigDecimal exactXaxisOffset;
+
+    /**
+     * y轴精偏值
+     */
+    @ApiModelProperty(value = "y轴精偏值")
+    private BigDecimal exactYaxisOffset;
+
+    /**
+     * z轴精偏值
+     */
+    @ApiModelProperty(value = "z轴精偏值")
+    private BigDecimal exactZaxisOffset;
+
+    /**
+     * a轴精偏值
+     */
+    @ApiModelProperty(value = "a轴精偏值")
+    private BigDecimal exactAaxisOffset;
+
+    /**
+     * b轴精偏值
+     */
+    @ApiModelProperty(value = "b轴精偏值")
+    private BigDecimal exactBaxisOffset;
+
+    /**
+     * c轴精偏值
+     */
+    @ApiModelProperty(value = "c轴精偏值")
+    private BigDecimal exactCaxisOffset;
+
+    /**
+     * 测量报告
+     */
+    @ApiModelProperty(value = "测量报告")
+    private String measuringReport;
+
+    /**
+     * 报告生成日期
+     */
+    @ApiModelProperty(value = "报告生成日期")
+    private String createTime;
+
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/dto/OrderQualitySaveDTO.java

@@ -0,0 +1,175 @@
+package com.github.zuihou.business.operationManagementCenter.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 实体类
+ * 测量表
+ * </p>
+ *
+ * @author imcs
+ * @since 2021-12-27
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "OrderQualitySaveDTO", description = "测量表")
+public class OrderQualitySaveDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty(value = "订单ID")
+    private Long orderId;
+
+    @ApiModelProperty(value = "任务ID")
+    private Long taskId;
+
+    /**
+     * 工件ID
+     */
+    @ApiModelProperty(value = "工件ID)")
+    private String workpieceId;
+
+    /**
+     * 工件名称
+     */
+    @ApiModelProperty(value = "工件名称)")
+    private String workpieceName;
+
+    /**
+     * 工序ID
+     */
+    @ApiModelProperty(value = "工序id)")
+    private Long procedureId;
+
+    /**
+     * 工序名称
+     */
+    @ApiModelProperty(value = "工序名称)")
+    private String procedureName;
+
+    /**
+     * 测量类型
+     */
+    @ApiModelProperty(value = "测量类型 1:质量检测 2工件坐标系检测 3人工测量)")
+    private int measuringType;
+
+    /**
+     * 测量类型
+     */
+    @ApiModelProperty(value = "测量程序")
+    private String measuringProgram;
+
+    /**
+     * 测量结果
+     */
+    @ApiModelProperty(value = "测量结果 OK：合格  NG：不合格")
+    private String okFlag;
+
+    /**
+     * x轴粗偏值
+     */
+    @ApiModelProperty(value = "x轴粗偏值")
+    private BigDecimal sketchyXaxisOffset;
+
+    /**
+     * y轴粗偏值
+     */
+    @ApiModelProperty(value = "y轴粗偏值")
+    private BigDecimal sketchyYaxisOffset;
+
+    /**
+     * z轴粗偏值
+     */
+    @ApiModelProperty(value = "z轴粗偏值")
+    private BigDecimal sketchyZaxisOffset;
+
+    /**
+     * a轴粗偏值
+     */
+    @ApiModelProperty(value = "a轴粗偏值")
+    private BigDecimal sketchyAaxisOffset;
+
+    /**
+     * b轴粗偏值
+     */
+    @ApiModelProperty(value = "b轴粗偏值")
+    private BigDecimal sketchyBaxisOffset;
+
+    /**
+     * c轴粗偏值
+     */
+    @ApiModelProperty(value = "c轴粗偏值")
+    private BigDecimal sketchyCaxisOffset;
+
+
+    /**
+     * x轴精偏值
+     */
+    @ApiModelProperty(value = "x轴精偏值")
+    private BigDecimal exactXaxisOffset;
+
+    /**
+     * y轴精偏值
+     */
+    @ApiModelProperty(value = "y轴精偏值")
+    private BigDecimal exactYaxisOffset;
+
+    /**
+     * z轴精偏值
+     */
+    @ApiModelProperty(value = "z轴精偏值")
+    private BigDecimal exactZaxisOffset;
+
+    /**
+     * a轴精偏值
+     */
+    @ApiModelProperty(value = "a轴精偏值")
+    private BigDecimal exactAaxisOffset;
+
+    /**
+     * b轴精偏值
+     */
+    @ApiModelProperty(value = "b轴精偏值")
+    private BigDecimal exactBaxisOffset;
+
+    /**
+     * c轴精偏值
+     */
+    @ApiModelProperty(value = "c轴精偏值")
+    private BigDecimal exactCaxisOffset;
+
+    /**
+     * 测量报告
+     */
+    @ApiModelProperty(value = "测量报告")
+    private String measuringReport;
+
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/dto/OrderQualityUpdateDTO.java

@@ -0,0 +1,184 @@
+package com.github.zuihou.business.operationManagementCenter.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.github.zuihou.base.entity.SuperEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 实体类
+ * 测量表
+ * </p>
+ *
+ * @author imcs
+ * @since 2020-12-28
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "OrderQualityUpdateDTO", description = "测量表")
+public class OrderQualityUpdateDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @NotNull(message = "id不能为空", groups = SuperEntity.Update.class)
+    private Long id;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty(value = "订单编号")
+    @Excel(name = "订单编号")
+    private String orderNo;
+
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty(value = "订单ID")
+    @TableField("order_id")
+    @Excel(name = "订单ID")
+    private Long orderId;
+
+    @ApiModelProperty(value = "任务ID")
+    private Long taskId;
+
+    /**
+     * 工件ID
+     */
+    @ApiModelProperty(value = "工件ID)")
+    private String workpieceId;
+
+    /**
+     * 工件名称
+     */
+    @ApiModelProperty(value = "工件名称)")
+    private String workpieceName;
+
+    /**
+     * 工序ID
+     */
+    @ApiModelProperty(value = "工序id)")
+    private Long procedureId;
+
+    /**
+     * 工序名称
+     */
+    @ApiModelProperty(value = "工序名称)")
+    private String procedureName;
+
+    /**
+     * 测量类型
+     */
+    @ApiModelProperty(value = "测量类型 1:质量检测 2工件坐标系检测 3人工测量)")
+    private int measuringType;
+
+    /**
+     * 测量类型
+     */
+    @ApiModelProperty(value = "测量程序")
+    private String measuringProgram;
+
+    /**
+     * 测量结果
+     */
+    @ApiModelProperty(value = "测量结果 OK：合格  NG：不合格")
+    private String okFlag;
+
+    /**
+     * x轴粗偏值
+     */
+    @ApiModelProperty(value = "x轴粗偏值")
+    private BigDecimal sketchyXaxisOffset;
+
+    /**
+     * y轴粗偏值
+     */
+    @ApiModelProperty(value = "y轴粗偏值")
+    private BigDecimal sketchyYaxisOffset;
+
+    /**
+     * z轴粗偏值
+     */
+    @ApiModelProperty(value = "z轴粗偏值")
+    private BigDecimal sketchyZaxisOffset;
+
+    /**
+     * a轴粗偏值
+     */
+    @ApiModelProperty(value = "a轴粗偏值")
+    private BigDecimal sketchyAaxisOffset;
+
+    /**
+     * b轴粗偏值
+     */
+    @ApiModelProperty(value = "b轴粗偏值")
+    private BigDecimal sketchyBaxisOffset;
+
+    /**
+     * c轴粗偏值
+     */
+    @ApiModelProperty(value = "c轴粗偏值")
+    private BigDecimal sketchyCaxisOffset;
+
+
+    /**
+     * x轴精偏值
+     */
+    @ApiModelProperty(value = "x轴精偏值")
+    @Excel(name = "x轴精偏值")
+    private BigDecimal exactXaxisOffset;
+
+    /**
+     * y轴精偏值
+     */
+    @ApiModelProperty(value = "y轴精偏值")
+    private BigDecimal exactYaxisOffset;
+
+    /**
+     * z轴精偏值
+     */
+    @ApiModelProperty(value = "z轴精偏值")
+    private BigDecimal exactZaxisOffset;
+
+    /**
+     * a轴精偏值
+     */
+    @ApiModelProperty(value = "a轴精偏值")
+    private BigDecimal exactAaxisOffset;
+
+    /**
+     * b轴精偏值
+     */
+    @ApiModelProperty(value = "b轴精偏值")
+    private BigDecimal exactBaxisOffset;
+
+    /**
+     * c轴精偏值
+     */
+    @ApiModelProperty(value = "c轴精偏值")
+    private BigDecimal exactCaxisOffset;
+
+    /**
+     * 测量报告
+     */
+    @ApiModelProperty(value = "测量报告")
+    private BigDecimal measuringReport;
+
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/OrderQuality.java

@@ -0,0 +1,223 @@
+package com.github.zuihou.business.operationManagementCenter.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.zuihou.base.entity.Entity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
+/**
+ * <p>
+ * 实体类
+ *
+ * </p>
+ *
+ * @author imcs_
+ * @since 2021-12-27
+ */
+@Data
+@NoArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("imcs_order_quality_info")
+@ApiModel(value = "orderQuality", description = "测量报告")
+@AllArgsConstructor
+@Builder
+public class OrderQuality extends Entity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty(value = "订单编号")
+    @TableField(value = "order_no", condition = LIKE)
+    @Excel(name = "订单编号")
+    private String orderNo;
+
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty(value = "订单ID")
+    @TableField("order_id")
+    @Excel(name = "订单ID")
+    private Long orderId;
+
+    @ApiModelProperty(value = "任务ID")
+    @TableField("task_id")
+    @Excel(name = "任务ID")
+    private Long taskId;
+
+    /**
+     * 工件ID
+     */
+    @ApiModelProperty(value = "工件ID)")
+    @TableField(value = "workpiece_id", condition = LIKE)
+    @Excel(name = "工件ID)")
+    private String workpieceId;
+
+    /**
+     * 工件名称
+     */
+    @ApiModelProperty(value = "工件名称)")
+    @TableField(value = "workpiece_name", condition = LIKE)
+    @Excel(name = "工件名称)")
+    private String workpieceName;
+
+    /**
+     * 工序ID
+     */
+    @ApiModelProperty(value = "工序id)")
+    @TableField(value = "procedure_id")
+    @Excel(name = "工序id)")
+    private Long procedureId;
+
+    /**
+     * 工序名称
+     */
+    @ApiModelProperty(value = "工序名称)")
+    @TableField(value = "procedure_name")
+    @Excel(name = "工序名称)")
+    private String procedureName;
+
+    /**
+     * 测量类型
+     */
+    @ApiModelProperty(value = "测量类型 1:质量检测 2工件坐标系检测 3人工测量)")
+    @TableField(value = "measuring_type")
+    @Excel(name = "测量类型 1:质量检测 2工件坐标系检测 3人工测量)")
+    private int measuringType;
+
+    /**
+     * 测量类型
+     */
+    @ApiModelProperty(value = "测量程序")
+    @TableField(value = "measuring_program")
+    @Excel(name = "测量程序")
+    private String measuringProgram;
+
+    /**
+     * 测量结果
+     */
+    @ApiModelProperty(value = "测量结果 OK：合格  NG：不合格")
+    @TableField(value = "ok_flag")
+    @Excel(name = "测量结果 OK：合格  NG：不合格")
+    private String okFlag;
+
+    /**
+     * x轴粗偏值
+     */
+    @ApiModelProperty(value = "x轴粗偏值")
+    @TableField(value = "sketchy_xaxis_offset")
+    @Excel(name = "x轴粗偏值")
+    private BigDecimal sketchyXaxisOffset;
+
+    /**
+     * y轴粗偏值
+     */
+    @ApiModelProperty(value = "y轴粗偏值")
+    @TableField(value = "sketchy_yaxis_offset")
+    @Excel(name = "y轴粗偏值")
+    private BigDecimal sketchyYaxisOffset;
+
+    /**
+     * z轴粗偏值
+     */
+    @ApiModelProperty(value = "z轴粗偏值")
+    @TableField(value = "sketchy_zaxis_offset")
+    @Excel(name = "z轴粗偏值")
+    private BigDecimal sketchyZaxisOffset;
+
+    /**
+     * a轴粗偏值
+     */
+    @ApiModelProperty(value = "a轴粗偏值")
+    @TableField(value = "sketchy_aaxis_offset")
+    @Excel(name = "a轴粗偏值")
+    private BigDecimal sketchyAaxisOffset;
+
+    /**
+     * b轴粗偏值
+     */
+    @ApiModelProperty(value = "b轴粗偏值")
+    @TableField(value = "sketchy_baxis_offset")
+    @Excel(name = "b轴粗偏值")
+    private BigDecimal sketchyBaxisOffset;
+
+    /**
+     * c轴粗偏值
+     */
+    @ApiModelProperty(value = "c轴粗偏值")
+    @TableField(value = "sketchy_caxis_offset")
+    @Excel(name = "c轴粗偏值")
+    private BigDecimal sketchyCaxisOffset;
+
+
+    /**
+     * x轴精偏值
+     */
+    @ApiModelProperty(value = "x轴精偏值")
+    @TableField(value = "exact_xaxis_offset")
+    @Excel(name = "x轴精偏值")
+    private BigDecimal exactXaxisOffset;
+
+    /**
+     * y轴精偏值
+     */
+    @ApiModelProperty(value = "y轴精偏值")
+    @TableField(value = "exact_yaxis_offset")
+    @Excel(name = "y轴精偏值")
+    private BigDecimal exactYaxisOffset;
+
+    /**
+     * z轴精偏值
+     */
+    @ApiModelProperty(value = "z轴精偏值")
+    @TableField(value = "exact_zaxis_offset")
+    @Excel(name = "z轴精偏值")
+    private BigDecimal exactZaxisOffset;
+
+    /**
+     * a轴精偏值
+     */
+    @ApiModelProperty(value = "a轴精偏值")
+    @TableField(value = "exact_aaxis_offset")
+    @Excel(name = "a轴精偏值")
+    private BigDecimal exactAaxisOffset;
+
+    /**
+     * b轴精偏值
+     */
+    @ApiModelProperty(value = "b轴精偏值")
+    @TableField(value = "exact_baxis_offset")
+    @Excel(name = "b轴精偏值")
+    private BigDecimal exactBaxisOffset;
+
+    /**
+     * c轴精偏值
+     */
+    @ApiModelProperty(value = "c轴精偏值")
+    @TableField(value = "exact_caxis_offset")
+    @Excel(name = "c轴精偏值")
+    private BigDecimal exactCaxisOffset;
+
+    /**
+     * 测量报告
+     */
+    @ApiModelProperty(value = "测量报告")
+    @TableField(value = "measuring_report")
+    @Excel(name = "测量报告")
+    private String measuringReport;
+
+}