Merge remote-tracking branch 'origin/master'

Fancy

2024-06-20 4837d8e606a630945a8150cd8dff3fb0e48f0784

Merge remote-tracking branch 'origin/master'

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaAssemblyWorkHistoryMapper.java

@@ -6,7 +6,7 @@
/**
* @author User
* @description 针对表【sta_assembly_work_history(生产线生产任务认领表)】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @createDate 2024-06-20 11:31:20
* @Entity com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory
*/
@Mapper

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaAssemblyWorkLastMapper.java

@@ -6,7 +6,7 @@
/**
* @author User
* @description 针对表【sta_assembly_work_last(生产线生产任务认领表)】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @createDate 2024-06-20 11:31:20
* @Entity com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast
*/
@Mapper

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDevOpsTaskClaimInfoMapper.java

@@ -6,7 +6,7 @@
/**
* @author User
* @description 针对表【sta_dev_ops_task_claim_info(安装运维任务认领表)】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @createDate 2024-06-20 11:31:20
* @Entity com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo
*/
@Mapper

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLastMapper.java

@@ -6,7 +6,7 @@
/**
* @author User
* @description 针对表【sta_device_last(设备最新状态表)】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @createDate 2024-06-20 11:31:20
* @Entity com.dy.pmsGlobal.pojoSta.StaDeviceLast
*/
@Mapper

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLifeMapper.java

@@ -6,7 +6,7 @@
/**
* @author User
* @description 针对表【sta_device_life(设备生命周期表)】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @createDate 2024-06-20 11:31:20
* @Entity com.dy.pmsGlobal.pojoSta.StaDeviceLife
*/
@Mapper

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java

@@ -6,7 +6,7 @@
/**
* @author User
* @description 针对表【sta_device_production_log(设备生产日志表)】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @createDate 2024-06-20 11:31:20
* @Entity com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog
*/
@Mapper

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java

@@ -6,7 +6,7 @@
/**
* @author User
* @description 针对表【sta_repair_info】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @createDate 2024-06-20 11:31:20
* @Entity com.dy.pmsGlobal.pojoSta.StaRepairInfo
*/
@Mapper

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaWipSnExMapper.java

@@ -6,7 +6,7 @@
/**
* @author User
* @description 针对表【sta_wip_sn_ex(设备关联表)】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @createDate 2024-06-20 11:31:20
* @Entity com.dy.pmsGlobal.pojoSta.StaWipSnEx
*/
@Mapper

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkHistory.java

@@ -1,142 +1,89 @@
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotNull;
import lombok.*;



import java.util.Date;
import lombok.Data;

/**
 * 生产线生产任务认领表
 * @TableName sta_assembly_work_history
 */
* 生产线生产任务认领表
* @TableName sta_assembly_work_history
*/
@TableName(value="sta_assembly_work_history", autoResultMap = true)
@Data
public class StaAssemblyWorkHistory implements Serializable {
    /**
     * 
     */
    private Long id;
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class StaAssemblyWorkHistory implements BaseEntity {

    /**
     * 用户实体编号
     */
    private Long userId;

    * 
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long id;
    /**
     * 生产线实体编号
     */
    private Long lineId;

    * 用户实体编号
    */
    @NotNull(message="[用户实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long userId;
    /**
     * 工站实体编号
     */
    private Long stationId;

    * 生产线实体编号
    */
    @NotNull(message="[生产线实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long lineId;
    /**
     * 组装生产任务实体编号
     */
    private Long planId;

    * 工站实体编号
    */
    @NotNull(message="[工站实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long stationId;
    /**
     * 生产流程实体编号
     */
    private Long processId;

    * 组装生产任务实体编号
    */
    @NotNull(message="[组装生产任务实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long planId;
    /**
     * 生产流程节点实体编号
     */
    private Long nodeId;

    * 生产流程实体编号
    */
    @NotNull(message="[生产流程实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long processId;
    /**
     * 任务认领时间
     */
    private Date dt;

    * 生产流程节点实体编号
    */
    @NotNull(message="[生产流程节点实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long nodeId;
    /**
     * 状态:正常(1)、结束(0)
     */
    private Integer status;

    * 任务认领时间
    */
    public Date dt;
    /**
     * 开始时间
     */
    private Date startTime;

    * 状态:正常(1)、结束(0)
    */
    public Integer status;
    /**
     * 结束时间
     */
    private Date endTime;

    * 开始时间
    */
    public Date startTime;
    /**
     * 辅助人员:辅助员工id,以逗号隔开
     */
    private String assistants;
    * 结束时间
    */
    public Date endTime;
    /**
    * 辅助人员:辅助员工id,以逗号隔开
    */
    public String assistants;

    private static final long serialVersionUID = 1L;

    @Override
    public boolean equals(Object that) {
        if (this == that) {
            return true;
        }
        if (that == null) {
            return false;
        }
        if (getClass() != that.getClass()) {
            return false;
        }
        StaAssemblyWorkHistory other = (StaAssemblyWorkHistory) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
            && (this.getLineId() == null ? other.getLineId() == null : this.getLineId().equals(other.getLineId()))
            && (this.getStationId() == null ? other.getStationId() == null : this.getStationId().equals(other.getStationId()))
            && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
            && (this.getProcessId() == null ? other.getProcessId() == null : this.getProcessId().equals(other.getProcessId()))
            && (this.getNodeId() == null ? other.getNodeId() == null : this.getNodeId().equals(other.getNodeId()))
            && (this.getDt() == null ? other.getDt() == null : this.getDt().equals(other.getDt()))
            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
            && (this.getStartTime() == null ? other.getStartTime() == null : this.getStartTime().equals(other.getStartTime()))
            && (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime()))
            && (this.getAssistants() == null ? other.getAssistants() == null : this.getAssistants().equals(other.getAssistants()));
    }

    @Override
    public int hashCode() {
        final int prime = 31;
        int result = 1;
        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
        result = prime * result + ((getLineId() == null) ? 0 : getLineId().hashCode());
        result = prime * result + ((getStationId() == null) ? 0 : getStationId().hashCode());
        result = prime * result + ((getPlanId() == null) ? 0 : getPlanId().hashCode());
        result = prime * result + ((getProcessId() == null) ? 0 : getProcessId().hashCode());
        result = prime * result + ((getNodeId() == null) ? 0 : getNodeId().hashCode());
        result = prime * result + ((getDt() == null) ? 0 : getDt().hashCode());
        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
        result = prime * result + ((getStartTime() == null) ? 0 : getStartTime().hashCode());
        result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode());
        result = prime * result + ((getAssistants() == null) ? 0 : getAssistants().hashCode());
        return result;
    }

    @Override
    public String toString() {
        StringBuilder sb = new StringBuilder();
        sb.append(getClass().getSimpleName());
        sb.append(" [");
        sb.append("Hash = ").append(hashCode());
        sb.append(", id=").append(id);
        sb.append(", userId=").append(userId);
        sb.append(", lineId=").append(lineId);
        sb.append(", stationId=").append(stationId);
        sb.append(", planId=").append(planId);
        sb.append(", processId=").append(processId);
        sb.append(", nodeId=").append(nodeId);
        sb.append(", dt=").append(dt);
        sb.append(", status=").append(status);
        sb.append(", startTime=").append(startTime);
        sb.append(", endTime=").append(endTime);
        sb.append(", assistants=").append(assistants);
        sb.append(", serialVersionUID=").append(serialVersionUID);
        sb.append("]");
        return sb.toString();
    }
}
}

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java

@@ -1,142 +1,89 @@
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotNull;
import lombok.*;



import java.util.Date;
import lombok.Data;

/**
 * 生产线生产任务认领表
 * @TableName sta_assembly_work_last
 */
* 生产线生产任务认领表
* @TableName sta_assembly_work_last
*/
@TableName(value="sta_assembly_work_last", autoResultMap = true)
@Data
public class StaAssemblyWorkLast implements Serializable {
    /**
     * 
     */
    private Long id;
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class StaAssemblyWorkLast implements BaseEntity {

    /**
     * 用户实体编号
     */
    private Long userId;

    * 
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long id;
    /**
     * 生产线实体编号
     */
    private Long lineId;

    * 用户实体编号
    */
    @NotNull(message="[用户实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long userId;
    /**
     * 工站实体编号
     */
    private Long stationId;

    * 生产线实体编号
    */
    @NotNull(message="[生产线实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long lineId;
    /**
     * 组装生产任务实体编号
     */
    private Long planId;

    * 工站实体编号
    */
    @NotNull(message="[工站实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long stationId;
    /**
     * 生产流程实体编号
     */
    private Long processId;

    * 组装生产任务实体编号
    */
    @NotNull(message="[组装生产任务实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long planId;
    /**
     * 生产流程节点实体编号
     */
    private Long nodeId;

    * 生产流程实体编号
    */
    @NotNull(message="[生产流程实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long processId;
    /**
     * 任务认领时间
     */
    private Date dt;

    * 生产流程节点实体编号
    */
    @NotNull(message="[生产流程节点实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long nodeId;
    /**
     * 状态:正常(1)、结束(0)
     */
    private Integer status;

    * 任务认领时间
    */
    public Date dt;
    /**
     * 开始时间
     */
    private Date startTime;

    * 状态:正常(1)、结束(0)
    */
    public Integer status;
    /**
     * 结束时间
     */
    private Date endTime;

    * 开始时间
    */
    public Date startTime;
    /**
     * 辅助人员:辅助员工id,以逗号隔开
     */
    private String assistants;
    * 结束时间
    */
    public Date endTime;
    /**
    * 辅助人员:辅助员工id,以逗号隔开
    */
    public String assistants;

    private static final long serialVersionUID = 1L;

    @Override
    public boolean equals(Object that) {
        if (this == that) {
            return true;
        }
        if (that == null) {
            return false;
        }
        if (getClass() != that.getClass()) {
            return false;
        }
        StaAssemblyWorkLast other = (StaAssemblyWorkLast) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
            && (this.getLineId() == null ? other.getLineId() == null : this.getLineId().equals(other.getLineId()))
            && (this.getStationId() == null ? other.getStationId() == null : this.getStationId().equals(other.getStationId()))
            && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
            && (this.getProcessId() == null ? other.getProcessId() == null : this.getProcessId().equals(other.getProcessId()))
            && (this.getNodeId() == null ? other.getNodeId() == null : this.getNodeId().equals(other.getNodeId()))
            && (this.getDt() == null ? other.getDt() == null : this.getDt().equals(other.getDt()))
            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
            && (this.getStartTime() == null ? other.getStartTime() == null : this.getStartTime().equals(other.getStartTime()))
            && (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime()))
            && (this.getAssistants() == null ? other.getAssistants() == null : this.getAssistants().equals(other.getAssistants()));
    }

    @Override
    public int hashCode() {
        final int prime = 31;
        int result = 1;
        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
        result = prime * result + ((getLineId() == null) ? 0 : getLineId().hashCode());
        result = prime * result + ((getStationId() == null) ? 0 : getStationId().hashCode());
        result = prime * result + ((getPlanId() == null) ? 0 : getPlanId().hashCode());
        result = prime * result + ((getProcessId() == null) ? 0 : getProcessId().hashCode());
        result = prime * result + ((getNodeId() == null) ? 0 : getNodeId().hashCode());
        result = prime * result + ((getDt() == null) ? 0 : getDt().hashCode());
        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
        result = prime * result + ((getStartTime() == null) ? 0 : getStartTime().hashCode());
        result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode());
        result = prime * result + ((getAssistants() == null) ? 0 : getAssistants().hashCode());
        return result;
    }

    @Override
    public String toString() {
        StringBuilder sb = new StringBuilder();
        sb.append(getClass().getSimpleName());
        sb.append(" [");
        sb.append("Hash = ").append(hashCode());
        sb.append(", id=").append(id);
        sb.append(", userId=").append(userId);
        sb.append(", lineId=").append(lineId);
        sb.append(", stationId=").append(stationId);
        sb.append(", planId=").append(planId);
        sb.append(", processId=").append(processId);
        sb.append(", nodeId=").append(nodeId);
        sb.append(", dt=").append(dt);
        sb.append(", status=").append(status);
        sb.append(", startTime=").append(startTime);
        sb.append(", endTime=").append(endTime);
        sb.append(", assistants=").append(assistants);
        sb.append(", serialVersionUID=").append(serialVersionUID);
        sb.append("]");
        return sb.toString();
    }
}
}

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDevOpsTaskClaimInfo.java

@@ -1,86 +1,53 @@
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotNull;
import lombok.*;



import java.util.Date;
import lombok.Data;

/**
 * 安装运维任务认领表
 * @TableName sta_dev_ops_task_claim_info
 */
* 安装运维任务认领表
* @TableName sta_dev_ops_task_claim_info
*/
@TableName(value="sta_dev_ops_task_claim_info", autoResultMap = true)
@Data
public class StaDevOpsTaskClaimInfo implements Serializable {
    /**
     * 
     */
    private Long id;
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class StaDevOpsTaskClaimInfo implements BaseEntity {

    /**
     * 用户实体编号
     */
    private Long userId;

    * 
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long id;
    /**
     * 安装运维任务实体编号
     */
    private Long planId;

    * 用户实体编号
    */
    @NotNull(message="[用户实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long userId;
    /**
     * 任务认领时间
     */
    private Date dt;

    * 安装运维任务实体编号
    */
    @NotNull(message="[安装运维任务实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long planId;
    /**
     * 状态:正常(1)、结束(0)
     */
    private Integer status;
    * 任务认领时间
    */
    public Date dt;
    /**
    * 状态:正常(1)、结束(0)
    */
    public Integer status;

    private static final long serialVersionUID = 1L;

    @Override
    public boolean equals(Object that) {
        if (this == that) {
            return true;
        }
        if (that == null) {
            return false;
        }
        if (getClass() != that.getClass()) {
            return false;
        }
        StaDevOpsTaskClaimInfo other = (StaDevOpsTaskClaimInfo) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
            && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
            && (this.getDt() == null ? other.getDt() == null : this.getDt().equals(other.getDt()))
            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()));
    }

    @Override
    public int hashCode() {
        final int prime = 31;
        int result = 1;
        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
        result = prime * result + ((getPlanId() == null) ? 0 : getPlanId().hashCode());
        result = prime * result + ((getDt() == null) ? 0 : getDt().hashCode());
        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
        return result;
    }

    @Override
    public String toString() {
        StringBuilder sb = new StringBuilder();
        sb.append(getClass().getSimpleName());
        sb.append(" [");
        sb.append("Hash = ").append(hashCode());
        sb.append(", id=").append(id);
        sb.append(", userId=").append(userId);
        sb.append(", planId=").append(planId);
        sb.append(", dt=").append(dt);
        sb.append(", status=").append(status);
        sb.append(", serialVersionUID=").append(serialVersionUID);
        sb.append("]");
        return sb.toString();
    }
}
}

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java

@@ -1,166 +1,96 @@
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.*;



import java.util.Date;
import lombok.Data;

/**
 * 设备最新状态表
 * @TableName sta_device_last
 */
* 设备最新状态表
* @TableName sta_device_last
*/
@TableName(value="sta_device_last", autoResultMap = true)
@Data
public class StaDeviceLast implements Serializable {
    /**
     * 
     */
    private Long id;
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class StaDeviceLast implements BaseEntity {

    /**
     * 设备码
     */
    private String equipNo;

    * 
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long id;
    /**
     * 计划id
     */
    private String planId;

    * 设备码
    */
    @NotBlank(message="[设备码]不能为空")
    public String equipNo;
    /**
     * 工站id
     */
    private String stationId;

    * 计划id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long planId;
    /**
     * 当前节点
     */
    private String currNode;

    * 工站id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long stationId;
    /**
     * 下一节点
     */
    private String nextNode;

    * 当前节点
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long currNode;
    /**
     * 状态: 1:组装中,2:完成,3:维修,4:报废
     */
    private Integer status;

    * 下一节点
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long nextNode;
    /**
     * 1:成功,2:失败
     */
    private Integer result;

    * 状态: 1:组装中,2:完成,3:维修,4:报废
    */
    public Integer status;
    /**
     * 维修节点返回的错误码
     */
    private String errorCode;

    * 1:成功,2:失败
    */
    public Integer result;
    /**
     * 备注
     */
    private String memo;

    * 维修节点返回的错误码
    */
    public String errorCode;
    /**
     * 辅助人员:辅助员工id,以逗号隔开
     */
    private String assistants;

    * 备注
    */
    public String memo;
    /**
     * 创建时间
     */
    private Date createTime;

    * 辅助人员:辅助员工id,以逗号隔开
    */
    public String assistants;
    /**
     * 
     */
    private Date updatedDate;

    * 创建时间
    */
    public Date createTime;
    /**
     * 操作员id
     */
    private String updatedBy;

    * 
    */
    public Date updatedDate;
    /**
     * 入站时间(上一节点的出站时间)
     */
    private Date inStationTime;
    * 操作员id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long updatedBy;
    /**
    * 入站时间(上一节点的出站时间)
    */
    public Date inStationTime;

    private static final long serialVersionUID = 1L;

    @Override
    public boolean equals(Object that) {
        if (this == that) {
            return true;
        }
        if (that == null) {
            return false;
        }
        if (getClass() != that.getClass()) {
            return false;
        }
        StaDeviceLast other = (StaDeviceLast) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
            && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
            && (this.getStationId() == null ? other.getStationId() == null : this.getStationId().equals(other.getStationId()))
            && (this.getCurrNode() == null ? other.getCurrNode() == null : this.getCurrNode().equals(other.getCurrNode()))
            && (this.getNextNode() == null ? other.getNextNode() == null : this.getNextNode().equals(other.getNextNode()))
            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
            && (this.getResult() == null ? other.getResult() == null : this.getResult().equals(other.getResult()))
            && (this.getErrorCode() == null ? other.getErrorCode() == null : this.getErrorCode().equals(other.getErrorCode()))
            && (this.getMemo() == null ? other.getMemo() == null : this.getMemo().equals(other.getMemo()))
            && (this.getAssistants() == null ? other.getAssistants() == null : this.getAssistants().equals(other.getAssistants()))
            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
            && (this.getUpdatedDate() == null ? other.getUpdatedDate() == null : this.getUpdatedDate().equals(other.getUpdatedDate()))
            && (this.getUpdatedBy() == null ? other.getUpdatedBy() == null : this.getUpdatedBy().equals(other.getUpdatedBy()))
            && (this.getInStationTime() == null ? other.getInStationTime() == null : this.getInStationTime().equals(other.getInStationTime()));
    }

    @Override
    public int hashCode() {
        final int prime = 31;
        int result = 1;
        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
        result = prime * result + ((getEquipNo() == null) ? 0 : getEquipNo().hashCode());
        result = prime * result + ((getPlanId() == null) ? 0 : getPlanId().hashCode());
        result = prime * result + ((getStationId() == null) ? 0 : getStationId().hashCode());
        result = prime * result + ((getCurrNode() == null) ? 0 : getCurrNode().hashCode());
        result = prime * result + ((getNextNode() == null) ? 0 : getNextNode().hashCode());
        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
        result = prime * result + ((getResult() == null) ? 0 : getResult().hashCode());
        result = prime * result + ((getErrorCode() == null) ? 0 : getErrorCode().hashCode());
        result = prime * result + ((getMemo() == null) ? 0 : getMemo().hashCode());
        result = prime * result + ((getAssistants() == null) ? 0 : getAssistants().hashCode());
        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
        result = prime * result + ((getUpdatedDate() == null) ? 0 : getUpdatedDate().hashCode());
        result = prime * result + ((getUpdatedBy() == null) ? 0 : getUpdatedBy().hashCode());
        result = prime * result + ((getInStationTime() == null) ? 0 : getInStationTime().hashCode());
        return result;
    }

    @Override
    public String toString() {
        StringBuilder sb = new StringBuilder();
        sb.append(getClass().getSimpleName());
        sb.append(" [");
        sb.append("Hash = ").append(hashCode());
        sb.append(", id=").append(id);
        sb.append(", equipNo=").append(equipNo);
        sb.append(", planId=").append(planId);
        sb.append(", stationId=").append(stationId);
        sb.append(", currNode=").append(currNode);
        sb.append(", nextNode=").append(nextNode);
        sb.append(", status=").append(status);
        sb.append(", result=").append(result);
        sb.append(", errorCode=").append(errorCode);
        sb.append(", memo=").append(memo);
        sb.append(", assistants=").append(assistants);
        sb.append(", createTime=").append(createTime);
        sb.append(", updatedDate=").append(updatedDate);
        sb.append(", updatedBy=").append(updatedBy);
        sb.append(", inStationTime=").append(inStationTime);
        sb.append(", serialVersionUID=").append(serialVersionUID);
        sb.append("]");
        return sb.toString();
    }
}
}

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java

@@ -1,174 +1,102 @@
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.*;



import java.util.Date;
import lombok.Data;

/**
 * 设备生命周期表
 * @TableName sta_device_life
 */
* 设备生命周期表
* @TableName sta_device_life
*/
@TableName(value="sta_device_life", autoResultMap = true)
@Data
public class StaDeviceLife implements Serializable {
    /**
     * 
     */
    private Long id;
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class StaDeviceLife implements BaseEntity {

    /**
     * 设备码
     */
    private String equipNo;

    * 
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long id;
    /**
     * 计划id
     */
    private String planId;

    * 设备码
    */
    @NotBlank(message="[设备码]不能为空")
    public String equipNo;
    /**
     * 工站id
     */
    private String stationId;

    * 计划id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long planId;
    /**
     * 当前节点
     */
    private String currNode;

    * 工站id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long stationId;
    /**
     * 下一节点
     */
    private String nextNode;

    * 当前节点
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long currNode;
    /**
     * 投入时间
     */
    private Date inLineTime;

    * 下一节点
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long nextNode;
    /**
     * 状态: 1:组装中,2:完成,3:维修,4:报废
     */
    private Integer status;

    * 投入时间
    */
    public Date inLineTime;
    /**
     * 1:成功,2:失败
     */
    private Integer result;

    * 状态: 1:组装中,2:完成,3:维修,4:报废
    */
    public Integer status;
    /**
     * 维修节点返回的错误码
     */
    private String errorCode;

    * 1:成功,2:失败
    */
    public Integer result;
    /**
     * 备注
     */
    private String memo;

    * 维修节点返回的错误码
    */
    public String errorCode;
    /**
     * 辅助人员:辅助员工id,以逗号隔开
     */
    private String assistants;

    * 备注
    */
    public String memo;
    /**
     * 
     */
    private Date updatedDate;

    * 辅助人员:辅助员工id,以逗号隔开
    */
    public String assistants;
    /**
     * 操作员id
     */
    private String updatedBy;

    * 
    */
    public Date updatedDate;
    /**
     * 生产登录id
     */
    private Long claimId;

    * 操作员id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long updatedBy;
    /**
     * 维修id
     */
    private Long repairId;
    * 生产登录id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long claimId;
    /**
    * 维修id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long repairId;

    private static final long serialVersionUID = 1L;

    @Override
    public boolean equals(Object that) {
        if (this == that) {
            return true;
        }
        if (that == null) {
            return false;
        }
        if (getClass() != that.getClass()) {
            return false;
        }
        StaDeviceLife other = (StaDeviceLife) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
            && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
            && (this.getStationId() == null ? other.getStationId() == null : this.getStationId().equals(other.getStationId()))
            && (this.getCurrNode() == null ? other.getCurrNode() == null : this.getCurrNode().equals(other.getCurrNode()))
            && (this.getNextNode() == null ? other.getNextNode() == null : this.getNextNode().equals(other.getNextNode()))
            && (this.getInLineTime() == null ? other.getInLineTime() == null : this.getInLineTime().equals(other.getInLineTime()))
            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
            && (this.getResult() == null ? other.getResult() == null : this.getResult().equals(other.getResult()))
            && (this.getErrorCode() == null ? other.getErrorCode() == null : this.getErrorCode().equals(other.getErrorCode()))
            && (this.getMemo() == null ? other.getMemo() == null : this.getMemo().equals(other.getMemo()))
            && (this.getAssistants() == null ? other.getAssistants() == null : this.getAssistants().equals(other.getAssistants()))
            && (this.getUpdatedDate() == null ? other.getUpdatedDate() == null : this.getUpdatedDate().equals(other.getUpdatedDate()))
            && (this.getUpdatedBy() == null ? other.getUpdatedBy() == null : this.getUpdatedBy().equals(other.getUpdatedBy()))
            && (this.getClaimId() == null ? other.getClaimId() == null : this.getClaimId().equals(other.getClaimId()))
            && (this.getRepairId() == null ? other.getRepairId() == null : this.getRepairId().equals(other.getRepairId()));
    }

    @Override
    public int hashCode() {
        final int prime = 31;
        int result = 1;
        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
        result = prime * result + ((getEquipNo() == null) ? 0 : getEquipNo().hashCode());
        result = prime * result + ((getPlanId() == null) ? 0 : getPlanId().hashCode());
        result = prime * result + ((getStationId() == null) ? 0 : getStationId().hashCode());
        result = prime * result + ((getCurrNode() == null) ? 0 : getCurrNode().hashCode());
        result = prime * result + ((getNextNode() == null) ? 0 : getNextNode().hashCode());
        result = prime * result + ((getInLineTime() == null) ? 0 : getInLineTime().hashCode());
        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
        result = prime * result + ((getResult() == null) ? 0 : getResult().hashCode());
        result = prime * result + ((getErrorCode() == null) ? 0 : getErrorCode().hashCode());
        result = prime * result + ((getMemo() == null) ? 0 : getMemo().hashCode());
        result = prime * result + ((getAssistants() == null) ? 0 : getAssistants().hashCode());
        result = prime * result + ((getUpdatedDate() == null) ? 0 : getUpdatedDate().hashCode());
        result = prime * result + ((getUpdatedBy() == null) ? 0 : getUpdatedBy().hashCode());
        result = prime * result + ((getClaimId() == null) ? 0 : getClaimId().hashCode());
        result = prime * result + ((getRepairId() == null) ? 0 : getRepairId().hashCode());
        return result;
    }

    @Override
    public String toString() {
        StringBuilder sb = new StringBuilder();
        sb.append(getClass().getSimpleName());
        sb.append(" [");
        sb.append("Hash = ").append(hashCode());
        sb.append(", id=").append(id);
        sb.append(", equipNo=").append(equipNo);
        sb.append(", planId=").append(planId);
        sb.append(", stationId=").append(stationId);
        sb.append(", currNode=").append(currNode);
        sb.append(", nextNode=").append(nextNode);
        sb.append(", inLineTime=").append(inLineTime);
        sb.append(", status=").append(status);
        sb.append(", result=").append(result);
        sb.append(", errorCode=").append(errorCode);
        sb.append(", memo=").append(memo);
        sb.append(", assistants=").append(assistants);
        sb.append(", updatedDate=").append(updatedDate);
        sb.append(", updatedBy=").append(updatedBy);
        sb.append(", claimId=").append(claimId);
        sb.append(", repairId=").append(repairId);
        sb.append(", serialVersionUID=").append(serialVersionUID);
        sb.append("]");
        return sb.toString();
    }
}
}

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java

@@ -1,174 +1,102 @@
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.*;



import java.util.Date;
import lombok.Data;

/**
 * 设备生产日志表
 * @TableName sta_device_production_log
 */
* 设备生产日志表
* @TableName sta_device_production_log
*/
@TableName(value="sta_device_production_log", autoResultMap = true)
@Data
public class StaDeviceProductionLog implements Serializable {
    /**
     * 
     */
    private Long id;
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class StaDeviceProductionLog implements BaseEntity {

    /**
     * 设备码
     */
    private String equipNo;

    * 
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long id;
    /**
     * 计划id
     */
    private String planId;

    * 设备码
    */
    @NotBlank(message="[设备码]不能为空")
    public String equipNo;
    /**
     * 工站id
     */
    private String stationId;

    * 计划id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long planId;
    /**
     * 当前节点
     */
    private String currNode;

    * 工站id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long stationId;
    /**
     * 
     */
    private String nextNode;

    * 当前节点
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long currNode;
    /**
     * 投入时间
     */
    private Date inLineTime;

    * 
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long nextNode;
    /**
     * 状态: 1:组装中,2:完成,3:维修,4:报废
     */
    private Integer status;

    * 投入时间
    */
    public Date inLineTime;
    /**
     * 1:成功,2:失败
     */
    private Integer result;

    * 状态: 1:组装中,2:完成,3:维修,4:报废
    */
    public Integer status;
    /**
     * 
     */
    private String errorCode;

    * 1:成功,2:失败
    */
    public Integer result;
    /**
     * 备注
     */
    private String memo;

    * 
    */
    public String errorCode;
    /**
     * 辅助人员:辅助员工id,以逗号隔开
     */
    private String assistants;

    * 备注
    */
    public String memo;
    /**
     * 
     */
    private Date updatedDate;

    * 辅助人员:辅助员工id,以逗号隔开
    */
    public String assistants;
    /**
     * 操作员id
     */
    private String updatedBy;

    * 
    */
    public Date updatedDate;
    /**
     * 生产登录id
     */
    private Long claimId;

    * 操作员id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long updatedBy;
    /**
     * 维修id
     */
    private Long repairId;
    * 生产登录id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long claimId;
    /**
    * 维修id
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long repairId;

    private static final long serialVersionUID = 1L;

    @Override
    public boolean equals(Object that) {
        if (this == that) {
            return true;
        }
        if (that == null) {
            return false;
        }
        if (getClass() != that.getClass()) {
            return false;
        }
        StaDeviceProductionLog other = (StaDeviceProductionLog) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
            && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
            && (this.getStationId() == null ? other.getStationId() == null : this.getStationId().equals(other.getStationId()))
            && (this.getCurrNode() == null ? other.getCurrNode() == null : this.getCurrNode().equals(other.getCurrNode()))
            && (this.getNextNode() == null ? other.getNextNode() == null : this.getNextNode().equals(other.getNextNode()))
            && (this.getInLineTime() == null ? other.getInLineTime() == null : this.getInLineTime().equals(other.getInLineTime()))
            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
            && (this.getResult() == null ? other.getResult() == null : this.getResult().equals(other.getResult()))
            && (this.getErrorCode() == null ? other.getErrorCode() == null : this.getErrorCode().equals(other.getErrorCode()))
            && (this.getMemo() == null ? other.getMemo() == null : this.getMemo().equals(other.getMemo()))
            && (this.getAssistants() == null ? other.getAssistants() == null : this.getAssistants().equals(other.getAssistants()))
            && (this.getUpdatedDate() == null ? other.getUpdatedDate() == null : this.getUpdatedDate().equals(other.getUpdatedDate()))
            && (this.getUpdatedBy() == null ? other.getUpdatedBy() == null : this.getUpdatedBy().equals(other.getUpdatedBy()))
            && (this.getClaimId() == null ? other.getClaimId() == null : this.getClaimId().equals(other.getClaimId()))
            && (this.getRepairId() == null ? other.getRepairId() == null : this.getRepairId().equals(other.getRepairId()));
    }

    @Override
    public int hashCode() {
        final int prime = 31;
        int result = 1;
        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
        result = prime * result + ((getEquipNo() == null) ? 0 : getEquipNo().hashCode());
        result = prime * result + ((getPlanId() == null) ? 0 : getPlanId().hashCode());
        result = prime * result + ((getStationId() == null) ? 0 : getStationId().hashCode());
        result = prime * result + ((getCurrNode() == null) ? 0 : getCurrNode().hashCode());
        result = prime * result + ((getNextNode() == null) ? 0 : getNextNode().hashCode());
        result = prime * result + ((getInLineTime() == null) ? 0 : getInLineTime().hashCode());
        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
        result = prime * result + ((getResult() == null) ? 0 : getResult().hashCode());
        result = prime * result + ((getErrorCode() == null) ? 0 : getErrorCode().hashCode());
        result = prime * result + ((getMemo() == null) ? 0 : getMemo().hashCode());
        result = prime * result + ((getAssistants() == null) ? 0 : getAssistants().hashCode());
        result = prime * result + ((getUpdatedDate() == null) ? 0 : getUpdatedDate().hashCode());
        result = prime * result + ((getUpdatedBy() == null) ? 0 : getUpdatedBy().hashCode());
        result = prime * result + ((getClaimId() == null) ? 0 : getClaimId().hashCode());
        result = prime * result + ((getRepairId() == null) ? 0 : getRepairId().hashCode());
        return result;
    }

    @Override
    public String toString() {
        StringBuilder sb = new StringBuilder();
        sb.append(getClass().getSimpleName());
        sb.append(" [");
        sb.append("Hash = ").append(hashCode());
        sb.append(", id=").append(id);
        sb.append(", equipNo=").append(equipNo);
        sb.append(", planId=").append(planId);
        sb.append(", stationId=").append(stationId);
        sb.append(", currNode=").append(currNode);
        sb.append(", nextNode=").append(nextNode);
        sb.append(", inLineTime=").append(inLineTime);
        sb.append(", status=").append(status);
        sb.append(", result=").append(result);
        sb.append(", errorCode=").append(errorCode);
        sb.append(", memo=").append(memo);
        sb.append(", assistants=").append(assistants);
        sb.append(", updatedDate=").append(updatedDate);
        sb.append(", updatedBy=").append(updatedBy);
        sb.append(", claimId=").append(claimId);
        sb.append(", repairId=").append(repairId);
        sb.append(", serialVersionUID=").append(serialVersionUID);
        sb.append("]");
        return sb.toString();
    }
}
}

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaRepairInfo.java

@@ -1,118 +1,69 @@
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotNull;
import lombok.*;



import java.util.Date;
import lombok.Data;

/**
 * 
 * @TableName sta_repair_info
 */
* 
* @TableName sta_repair_info
*/
@TableName(value="sta_repair_info", autoResultMap = true)
@Data
public class StaRepairInfo implements Serializable {
    /**
     * 
     */
    private Long id;
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class StaRepairInfo implements BaseEntity {

    /**
     * 设备码
     */
    private String equipNo;

    * 
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long id;
    /**
     * 从哪个节点进入维修
     */
    private String fromNode;

    * 设备码
    */
    public String equipNo;
    /**
     * 维修原因
     */
    private String repairReason;

    * 从哪个节点进入维修
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long fromNode;
    /**
     * 去向节点
     */
    private String toNode;

    * 维修原因
    */
    public String repairReason;
    /**
     * 维修员工
     */
    private String repairBy;

    * 去向节点
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long toNode;
    /**
     * 维修时间
     */
    private Date repairTime;

    * 维修员工
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long repairBy;
    /**
     * 创建时间
     */
    private Date createTime;

    * 维修时间
    */
    public Date repairTime;
    /**
     * 推送员工
     */
    private Long createBy;
    * 创建时间
    */
    public Date createTime;
    /**
    * 推送员工
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long createBy;

    private static final long serialVersionUID = 1L;

    @Override
    public boolean equals(Object that) {
        if (this == that) {
            return true;
        }
        if (that == null) {
            return false;
        }
        if (getClass() != that.getClass()) {
            return false;
        }
        StaRepairInfo other = (StaRepairInfo) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
            && (this.getFromNode() == null ? other.getFromNode() == null : this.getFromNode().equals(other.getFromNode()))
            && (this.getRepairReason() == null ? other.getRepairReason() == null : this.getRepairReason().equals(other.getRepairReason()))
            && (this.getToNode() == null ? other.getToNode() == null : this.getToNode().equals(other.getToNode()))
            && (this.getRepairBy() == null ? other.getRepairBy() == null : this.getRepairBy().equals(other.getRepairBy()))
            && (this.getRepairTime() == null ? other.getRepairTime() == null : this.getRepairTime().equals(other.getRepairTime()))
            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
            && (this.getCreateBy() == null ? other.getCreateBy() == null : this.getCreateBy().equals(other.getCreateBy()));
    }

    @Override
    public int hashCode() {
        final int prime = 31;
        int result = 1;
        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
        result = prime * result + ((getEquipNo() == null) ? 0 : getEquipNo().hashCode());
        result = prime * result + ((getFromNode() == null) ? 0 : getFromNode().hashCode());
        result = prime * result + ((getRepairReason() == null) ? 0 : getRepairReason().hashCode());
        result = prime * result + ((getToNode() == null) ? 0 : getToNode().hashCode());
        result = prime * result + ((getRepairBy() == null) ? 0 : getRepairBy().hashCode());
        result = prime * result + ((getRepairTime() == null) ? 0 : getRepairTime().hashCode());
        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
        result = prime * result + ((getCreateBy() == null) ? 0 : getCreateBy().hashCode());
        return result;
    }

    @Override
    public String toString() {
        StringBuilder sb = new StringBuilder();
        sb.append(getClass().getSimpleName());
        sb.append(" [");
        sb.append("Hash = ").append(hashCode());
        sb.append(", id=").append(id);
        sb.append(", equipNo=").append(equipNo);
        sb.append(", fromNode=").append(fromNode);
        sb.append(", repairReason=").append(repairReason);
        sb.append(", toNode=").append(toNode);
        sb.append(", repairBy=").append(repairBy);
        sb.append(", repairTime=").append(repairTime);
        sb.append(", createTime=").append(createTime);
        sb.append(", createBy=").append(createBy);
        sb.append(", serialVersionUID=").append(serialVersionUID);
        sb.append("]");
        return sb.toString();
    }
}
}

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaWipSnEx.java

@@ -1,102 +1,59 @@
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotNull;
import lombok.*;



import java.util.Date;
import lombok.Data;

/**
 * 设备关联表
 * @TableName sta_wip_sn_ex
 */
* 设备关联表
* @TableName sta_wip_sn_ex
*/
@TableName(value="sta_wip_sn_ex", autoResultMap = true)
@Data
public class StaWipSnEx implements Serializable {
    /**
     * 
     */
    private String id;
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class StaWipSnEx implements BaseEntity {

    /**
     * 设备码
     */
    private String deviceNo;

    * 
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long id;
    /**
     * 
     */
    private Integer productId;

    * 设备码
    */
    public String deviceNo;
    /**
     * 关联产品名
     */
    private String productName;

    * 
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long productId;
    /**
     * 关联设备码
     */
    private String productNo;

    * 关联产品名
    */
    public String productName;
    /**
     * 创建时间
     */
    private Date createTime;

    * 关联设备码
    */
    public String productNo;
    /**
     * 更新人
     */
    private String createBy;
    * 创建时间
    */
    public Date createTime;
    /**
    * 更新人
    */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long createBy;

    private static final long serialVersionUID = 1L;

    @Override
    public boolean equals(Object that) {
        if (this == that) {
            return true;
        }
        if (that == null) {
            return false;
        }
        if (getClass() != that.getClass()) {
            return false;
        }
        StaWipSnEx other = (StaWipSnEx) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getDeviceNo() == null ? other.getDeviceNo() == null : this.getDeviceNo().equals(other.getDeviceNo()))
            && (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId()))
            && (this.getProductName() == null ? other.getProductName() == null : this.getProductName().equals(other.getProductName()))
            && (this.getProductNo() == null ? other.getProductNo() == null : this.getProductNo().equals(other.getProductNo()))
            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
            && (this.getCreateBy() == null ? other.getCreateBy() == null : this.getCreateBy().equals(other.getCreateBy()));
    }

    @Override
    public int hashCode() {
        final int prime = 31;
        int result = 1;
        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
        result = prime * result + ((getDeviceNo() == null) ? 0 : getDeviceNo().hashCode());
        result = prime * result + ((getProductId() == null) ? 0 : getProductId().hashCode());
        result = prime * result + ((getProductName() == null) ? 0 : getProductName().hashCode());
        result = prime * result + ((getProductNo() == null) ? 0 : getProductNo().hashCode());
        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
        result = prime * result + ((getCreateBy() == null) ? 0 : getCreateBy().hashCode());
        return result;
    }

    @Override
    public String toString() {
        StringBuilder sb = new StringBuilder();
        sb.append(getClass().getSimpleName());
        sb.append(" [");
        sb.append("Hash = ").append(hashCode());
        sb.append(", id=").append(id);
        sb.append(", deviceNo=").append(deviceNo);
        sb.append(", productId=").append(productId);
        sb.append(", productName=").append(productName);
        sb.append(", productNo=").append(productNo);
        sb.append(", createTime=").append(createTime);
        sb.append(", createBy=").append(createBy);
        sb.append(", serialVersionUID=").append(serialVersionUID);
        sb.append("]");
        return sb.toString();
    }
}
}

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml

@@ -7,10 +7,10 @@
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
            <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
            <result property="stationId" column="station_id" jdbcType="VARCHAR"/>
            <result property="currNode" column="curr_node" jdbcType="VARCHAR"/>
            <result property="nextNode" column="next_node" jdbcType="VARCHAR"/>
            <result property="planId" column="plan_id" jdbcType="BIGINT"/>
            <result property="stationId" column="station_id" jdbcType="BIGINT"/>
            <result property="currNode" column="curr_node" jdbcType="BIGINT"/>
            <result property="nextNode" column="next_node" jdbcType="BIGINT"/>
            <result property="status" column="status" jdbcType="TINYINT"/>
            <result property="result" column="result" jdbcType="TINYINT"/>
            <result property="errorCode" column="error_code" jdbcType="VARCHAR"/>
@@ -18,7 +18,7 @@
            <result property="assistants" column="assistants" jdbcType="VARCHAR"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updatedDate" column="updated_date" jdbcType="TIMESTAMP"/>
            <result property="updatedBy" column="updated_by" jdbcType="VARCHAR"/>
            <result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
            <result property="inStationTime" column="in_station_time" jdbcType="TIMESTAMP"/>
    </resultMap>

@@ -49,11 +49,11 @@
        ,memo,assistants,create_time
        ,updated_date,updated_by,in_station_time
        )
        values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{planId,jdbcType=VARCHAR}
        ,#{stationId,jdbcType=VARCHAR},#{currNode,jdbcType=VARCHAR},#{nextNode,jdbcType=VARCHAR}
        values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{planId,jdbcType=BIGINT}
        ,#{stationId,jdbcType=BIGINT},#{currNode,jdbcType=BIGINT},#{nextNode,jdbcType=BIGINT}
        ,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT},#{errorCode,jdbcType=VARCHAR}
        ,#{memo,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP}
        ,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=VARCHAR},#{inStationTime,jdbcType=TIMESTAMP}
        ,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{inStationTime,jdbcType=TIMESTAMP}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
@@ -78,10 +78,10 @@
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="equipNo != null">#{equipNo,jdbcType=VARCHAR},</if>
                <if test="planId != null">#{planId,jdbcType=VARCHAR},</if>
                <if test="stationId != null">#{stationId,jdbcType=VARCHAR},</if>
                <if test="currNode != null">#{currNode,jdbcType=VARCHAR},</if>
                <if test="nextNode != null">#{nextNode,jdbcType=VARCHAR},</if>
                <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
                <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
                <if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
                <if test="nextNode != null">#{nextNode,jdbcType=BIGINT},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="result != null">#{result,jdbcType=TINYINT},</if>
                <if test="errorCode != null">#{errorCode,jdbcType=VARCHAR},</if>
@@ -89,7 +89,7 @@
                <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
                <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
                <if test="updatedDate != null">#{updatedDate,jdbcType=TIMESTAMP},</if>
                <if test="updatedBy != null">#{updatedBy,jdbcType=VARCHAR},</if>
                <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="inStationTime != null">#{inStationTime,jdbcType=TIMESTAMP},</if>
        </trim>
    </insert>
@@ -100,16 +100,16 @@
                    equip_no = #{equipNo,jdbcType=VARCHAR},
                </if>
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=VARCHAR},
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=VARCHAR},
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="currNode != null">
                    curr_node = #{currNode,jdbcType=VARCHAR},
                    curr_node = #{currNode,jdbcType=BIGINT},
                </if>
                <if test="nextNode != null">
                    next_node = #{nextNode,jdbcType=VARCHAR},
                    next_node = #{nextNode,jdbcType=BIGINT},
                </if>
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
@@ -133,7 +133,7 @@
                    updated_date = #{updatedDate,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedBy != null">
                    updated_by = #{updatedBy,jdbcType=VARCHAR},
                    updated_by = #{updatedBy,jdbcType=BIGINT},
                </if>
                <if test="inStationTime != null">
                    in_station_time = #{inStationTime,jdbcType=TIMESTAMP},
@@ -145,10 +145,10 @@
        update sta_device_last
        set 
            equip_no =  #{equipNo,jdbcType=VARCHAR},
            plan_id =  #{planId,jdbcType=VARCHAR},
            station_id =  #{stationId,jdbcType=VARCHAR},
            curr_node =  #{currNode,jdbcType=VARCHAR},
            next_node =  #{nextNode,jdbcType=VARCHAR},
            plan_id =  #{planId,jdbcType=BIGINT},
            station_id =  #{stationId,jdbcType=BIGINT},
            curr_node =  #{currNode,jdbcType=BIGINT},
            next_node =  #{nextNode,jdbcType=BIGINT},
            status =  #{status,jdbcType=TINYINT},
            result =  #{result,jdbcType=TINYINT},
            error_code =  #{errorCode,jdbcType=VARCHAR},
@@ -156,7 +156,7 @@
            assistants =  #{assistants,jdbcType=VARCHAR},
            create_time =  #{createTime,jdbcType=TIMESTAMP},
            updated_date =  #{updatedDate,jdbcType=TIMESTAMP},
            updated_by =  #{updatedBy,jdbcType=VARCHAR},
            updated_by =  #{updatedBy,jdbcType=BIGINT},
            in_station_time =  #{inStationTime,jdbcType=TIMESTAMP}
        where   id = #{id,jdbcType=BIGINT} 
    </update>

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml

@@ -7,10 +7,10 @@
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
            <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
            <result property="stationId" column="station_id" jdbcType="VARCHAR"/>
            <result property="currNode" column="curr_node" jdbcType="VARCHAR"/>
            <result property="nextNode" column="next_node" jdbcType="VARCHAR"/>
            <result property="planId" column="plan_id" jdbcType="BIGINT"/>
            <result property="stationId" column="station_id" jdbcType="BIGINT"/>
            <result property="currNode" column="curr_node" jdbcType="BIGINT"/>
            <result property="nextNode" column="next_node" jdbcType="BIGINT"/>
            <result property="inLineTime" column="in_line_time" jdbcType="TIMESTAMP"/>
            <result property="status" column="status" jdbcType="TINYINT"/>
            <result property="result" column="result" jdbcType="TINYINT"/>
@@ -18,7 +18,7 @@
            <result property="memo" column="memo" jdbcType="VARCHAR"/>
            <result property="assistants" column="assistants" jdbcType="VARCHAR"/>
            <result property="updatedDate" column="updated_date" jdbcType="TIMESTAMP"/>
            <result property="updatedBy" column="updated_by" jdbcType="VARCHAR"/>
            <result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
            <result property="claimId" column="claim_id" jdbcType="BIGINT"/>
            <result property="repairId" column="repair_id" jdbcType="BIGINT"/>
    </resultMap>
@@ -51,11 +51,11 @@
        ,error_code,memo,assistants
        ,updated_date,updated_by,claim_id
        ,repair_id)
        values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{planId,jdbcType=VARCHAR}
        ,#{stationId,jdbcType=VARCHAR},#{currNode,jdbcType=VARCHAR},#{nextNode,jdbcType=VARCHAR}
        values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{planId,jdbcType=BIGINT}
        ,#{stationId,jdbcType=BIGINT},#{currNode,jdbcType=BIGINT},#{nextNode,jdbcType=BIGINT}
        ,#{inLineTime,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
        ,#{errorCode,jdbcType=VARCHAR},#{memo,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
        ,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=VARCHAR},#{claimId,jdbcType=BIGINT}
        ,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{claimId,jdbcType=BIGINT}
        ,#{repairId,jdbcType=BIGINT})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife" useGeneratedKeys="true">
@@ -81,10 +81,10 @@
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="equipNo != null">#{equipNo,jdbcType=VARCHAR},</if>
                <if test="planId != null">#{planId,jdbcType=VARCHAR},</if>
                <if test="stationId != null">#{stationId,jdbcType=VARCHAR},</if>
                <if test="currNode != null">#{currNode,jdbcType=VARCHAR},</if>
                <if test="nextNode != null">#{nextNode,jdbcType=VARCHAR},</if>
                <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
                <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
                <if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
                <if test="nextNode != null">#{nextNode,jdbcType=BIGINT},</if>
                <if test="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="result != null">#{result,jdbcType=TINYINT},</if>
@@ -92,7 +92,7 @@
                <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
                <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
                <if test="updatedDate != null">#{updatedDate,jdbcType=TIMESTAMP},</if>
                <if test="updatedBy != null">#{updatedBy,jdbcType=VARCHAR},</if>
                <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="claimId != null">#{claimId,jdbcType=BIGINT},</if>
                <if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
        </trim>
@@ -104,16 +104,16 @@
                    equip_no = #{equipNo,jdbcType=VARCHAR},
                </if>
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=VARCHAR},
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=VARCHAR},
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="currNode != null">
                    curr_node = #{currNode,jdbcType=VARCHAR},
                    curr_node = #{currNode,jdbcType=BIGINT},
                </if>
                <if test="nextNode != null">
                    next_node = #{nextNode,jdbcType=VARCHAR},
                    next_node = #{nextNode,jdbcType=BIGINT},
                </if>
                <if test="inLineTime != null">
                    in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
@@ -137,7 +137,7 @@
                    updated_date = #{updatedDate,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedBy != null">
                    updated_by = #{updatedBy,jdbcType=VARCHAR},
                    updated_by = #{updatedBy,jdbcType=BIGINT},
                </if>
                <if test="claimId != null">
                    claim_id = #{claimId,jdbcType=BIGINT},
@@ -152,10 +152,10 @@
        update sta_device_life
        set 
            equip_no =  #{equipNo,jdbcType=VARCHAR},
            plan_id =  #{planId,jdbcType=VARCHAR},
            station_id =  #{stationId,jdbcType=VARCHAR},
            curr_node =  #{currNode,jdbcType=VARCHAR},
            next_node =  #{nextNode,jdbcType=VARCHAR},
            plan_id =  #{planId,jdbcType=BIGINT},
            station_id =  #{stationId,jdbcType=BIGINT},
            curr_node =  #{currNode,jdbcType=BIGINT},
            next_node =  #{nextNode,jdbcType=BIGINT},
            in_line_time =  #{inLineTime,jdbcType=TIMESTAMP},
            status =  #{status,jdbcType=TINYINT},
            result =  #{result,jdbcType=TINYINT},
@@ -163,7 +163,7 @@
            memo =  #{memo,jdbcType=VARCHAR},
            assistants =  #{assistants,jdbcType=VARCHAR},
            updated_date =  #{updatedDate,jdbcType=TIMESTAMP},
            updated_by =  #{updatedBy,jdbcType=VARCHAR},
            updated_by =  #{updatedBy,jdbcType=BIGINT},
            claim_id =  #{claimId,jdbcType=BIGINT},
            repair_id =  #{repairId,jdbcType=BIGINT}
        where   id = #{id,jdbcType=BIGINT} 

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml

@@ -7,10 +7,10 @@
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
            <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
            <result property="stationId" column="station_id" jdbcType="VARCHAR"/>
            <result property="currNode" column="curr_node" jdbcType="VARCHAR"/>
            <result property="nextNode" column="next_node" jdbcType="VARCHAR"/>
            <result property="planId" column="plan_id" jdbcType="BIGINT"/>
            <result property="stationId" column="station_id" jdbcType="BIGINT"/>
            <result property="currNode" column="curr_node" jdbcType="BIGINT"/>
            <result property="nextNode" column="next_node" jdbcType="BIGINT"/>
            <result property="inLineTime" column="in_line_time" jdbcType="TIMESTAMP"/>
            <result property="status" column="status" jdbcType="TINYINT"/>
            <result property="result" column="result" jdbcType="TINYINT"/>
@@ -18,7 +18,7 @@
            <result property="memo" column="memo" jdbcType="VARCHAR"/>
            <result property="assistants" column="assistants" jdbcType="VARCHAR"/>
            <result property="updatedDate" column="updated_date" jdbcType="TIMESTAMP"/>
            <result property="updatedBy" column="updated_by" jdbcType="VARCHAR"/>
            <result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
            <result property="claimId" column="claim_id" jdbcType="BIGINT"/>
            <result property="repairId" column="repair_id" jdbcType="BIGINT"/>
    </resultMap>
@@ -51,11 +51,11 @@
        ,error_code,memo,assistants
        ,updated_date,updated_by,claim_id
        ,repair_id)
        values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{planId,jdbcType=VARCHAR}
        ,#{stationId,jdbcType=VARCHAR},#{currNode,jdbcType=VARCHAR},#{nextNode,jdbcType=VARCHAR}
        values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{planId,jdbcType=BIGINT}
        ,#{stationId,jdbcType=BIGINT},#{currNode,jdbcType=BIGINT},#{nextNode,jdbcType=BIGINT}
        ,#{inLineTime,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
        ,#{errorCode,jdbcType=VARCHAR},#{memo,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
        ,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=VARCHAR},#{claimId,jdbcType=BIGINT}
        ,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{claimId,jdbcType=BIGINT}
        ,#{repairId,jdbcType=BIGINT})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
@@ -81,10 +81,10 @@
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="equipNo != null">#{equipNo,jdbcType=VARCHAR},</if>
                <if test="planId != null">#{planId,jdbcType=VARCHAR},</if>
                <if test="stationId != null">#{stationId,jdbcType=VARCHAR},</if>
                <if test="currNode != null">#{currNode,jdbcType=VARCHAR},</if>
                <if test="nextNode != null">#{nextNode,jdbcType=VARCHAR},</if>
                <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
                <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
                <if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
                <if test="nextNode != null">#{nextNode,jdbcType=BIGINT},</if>
                <if test="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="result != null">#{result,jdbcType=TINYINT},</if>
@@ -92,7 +92,7 @@
                <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
                <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
                <if test="updatedDate != null">#{updatedDate,jdbcType=TIMESTAMP},</if>
                <if test="updatedBy != null">#{updatedBy,jdbcType=VARCHAR},</if>
                <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="claimId != null">#{claimId,jdbcType=BIGINT},</if>
                <if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
        </trim>
@@ -104,16 +104,16 @@
                    equip_no = #{equipNo,jdbcType=VARCHAR},
                </if>
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=VARCHAR},
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=VARCHAR},
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="currNode != null">
                    curr_node = #{currNode,jdbcType=VARCHAR},
                    curr_node = #{currNode,jdbcType=BIGINT},
                </if>
                <if test="nextNode != null">
                    next_node = #{nextNode,jdbcType=VARCHAR},
                    next_node = #{nextNode,jdbcType=BIGINT},
                </if>
                <if test="inLineTime != null">
                    in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
@@ -137,7 +137,7 @@
                    updated_date = #{updatedDate,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedBy != null">
                    updated_by = #{updatedBy,jdbcType=VARCHAR},
                    updated_by = #{updatedBy,jdbcType=BIGINT},
                </if>
                <if test="claimId != null">
                    claim_id = #{claimId,jdbcType=BIGINT},
@@ -152,10 +152,10 @@
        update sta_device_production_log
        set 
            equip_no =  #{equipNo,jdbcType=VARCHAR},
            plan_id =  #{planId,jdbcType=VARCHAR},
            station_id =  #{stationId,jdbcType=VARCHAR},
            curr_node =  #{currNode,jdbcType=VARCHAR},
            next_node =  #{nextNode,jdbcType=VARCHAR},
            plan_id =  #{planId,jdbcType=BIGINT},
            station_id =  #{stationId,jdbcType=BIGINT},
            curr_node =  #{currNode,jdbcType=BIGINT},
            next_node =  #{nextNode,jdbcType=BIGINT},
            in_line_time =  #{inLineTime,jdbcType=TIMESTAMP},
            status =  #{status,jdbcType=TINYINT},
            result =  #{result,jdbcType=TINYINT},
@@ -163,7 +163,7 @@
            memo =  #{memo,jdbcType=VARCHAR},
            assistants =  #{assistants,jdbcType=VARCHAR},
            updated_date =  #{updatedDate,jdbcType=TIMESTAMP},
            updated_by =  #{updatedBy,jdbcType=VARCHAR},
            updated_by =  #{updatedBy,jdbcType=BIGINT},
            claim_id =  #{claimId,jdbcType=BIGINT},
            repair_id =  #{repairId,jdbcType=BIGINT}
        where   id = #{id,jdbcType=BIGINT} 

 pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml

@@ -7,10 +7,10 @@
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
            <result property="fromNode" column="from_node" jdbcType="VARCHAR"/>
            <result property="fromNode" column="from_node" jdbcType="BIGINT"/>
            <result property="repairReason" column="repair_reason" jdbcType="VARCHAR"/>
            <result property="toNode" column="to_node" jdbcType="VARCHAR"/>
            <result property="repairBy" column="repair_by" jdbcType="VARCHAR"/>
            <result property="toNode" column="to_node" jdbcType="BIGINT"/>
            <result property="repairBy" column="repair_by" jdbcType="BIGINT"/>
            <result property="repairTime" column="repair_time" jdbcType="TIMESTAMP"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="createBy" column="create_by" jdbcType="BIGINT"/>
@@ -39,8 +39,8 @@
        ,repair_reason,to_node,repair_by
        ,repair_time,create_time,create_by
        )
        values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{fromNode,jdbcType=VARCHAR}
        ,#{repairReason,jdbcType=VARCHAR},#{toNode,jdbcType=VARCHAR},#{repairBy,jdbcType=VARCHAR}
        values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{fromNode,jdbcType=BIGINT}
        ,#{repairReason,jdbcType=VARCHAR},#{toNode,jdbcType=BIGINT},#{repairBy,jdbcType=BIGINT}
        ,#{repairTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{createBy,jdbcType=BIGINT}
        )
    </insert>
@@ -60,10 +60,10 @@
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="equipNo != null">#{equipNo,jdbcType=VARCHAR},</if>
                <if test="fromNode != null">#{fromNode,jdbcType=VARCHAR},</if>
                <if test="fromNode != null">#{fromNode,jdbcType=BIGINT},</if>
                <if test="repairReason != null">#{repairReason,jdbcType=VARCHAR},</if>
                <if test="toNode != null">#{toNode,jdbcType=VARCHAR},</if>
                <if test="repairBy != null">#{repairBy,jdbcType=VARCHAR},</if>
                <if test="toNode != null">#{toNode,jdbcType=BIGINT},</if>
                <if test="repairBy != null">#{repairBy,jdbcType=BIGINT},</if>
                <if test="repairTime != null">#{repairTime,jdbcType=TIMESTAMP},</if>
                <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
                <if test="createBy != null">#{createBy,jdbcType=BIGINT},</if>
@@ -76,16 +76,16 @@
                    equip_no = #{equipNo,jdbcType=VARCHAR},
                </if>
                <if test="fromNode != null">
                    from_node = #{fromNode,jdbcType=VARCHAR},
                    from_node = #{fromNode,jdbcType=BIGINT},
                </if>
                <if test="repairReason != null">
                    repair_reason = #{repairReason,jdbcType=VARCHAR},
                </if>
                <if test="toNode != null">
                    to_node = #{toNode,jdbcType=VARCHAR},
                    to_node = #{toNode,jdbcType=BIGINT},
                </if>
                <if test="repairBy != null">
                    repair_by = #{repairBy,jdbcType=VARCHAR},
                    repair_by = #{repairBy,jdbcType=BIGINT},
                </if>
                <if test="repairTime != null">
                    repair_time = #{repairTime,jdbcType=TIMESTAMP},
@@ -103,10 +103,10 @@
        update sta_repair_info
        set 
            equip_no =  #{equipNo,jdbcType=VARCHAR},
            from_node =  #{fromNode,jdbcType=VARCHAR},
            from_node =  #{fromNode,jdbcType=BIGINT},
            repair_reason =  #{repairReason,jdbcType=VARCHAR},
            to_node =  #{toNode,jdbcType=VARCHAR},
            repair_by =  #{repairBy,jdbcType=VARCHAR},
            to_node =  #{toNode,jdbcType=BIGINT},
            repair_by =  #{repairBy,jdbcType=BIGINT},
            repair_time =  #{repairTime,jdbcType=TIMESTAMP},
            create_time =  #{createTime,jdbcType=TIMESTAMP},
            create_by =  #{createBy,jdbcType=BIGINT}

 pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml

@@ -5,13 +5,13 @@
<mapper namespace="com.dy.pmsGlobal.daoSta.StaWipSnExMapper">

    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
            <id property="id" column="id" jdbcType="VARCHAR"/>
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="deviceNo" column="device_no" jdbcType="VARCHAR"/>
            <result property="productId" column="product_id" jdbcType="INTEGER"/>
            <result property="productId" column="product_id" jdbcType="BIGINT"/>
            <result property="productName" column="product_name" jdbcType="VARCHAR"/>
            <result property="productNo" column="product_no" jdbcType="VARCHAR"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
            <result property="createBy" column="create_by" jdbcType="BIGINT"/>
    </resultMap>

    <sql id="Base_Column_List">
@@ -24,21 +24,21 @@
        select
        <include refid="Base_Column_List" />
        from sta_wip_sn_ex
        where  id = #{id,jdbcType=VARCHAR} 
        where  id = #{id,jdbcType=BIGINT} 
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from sta_wip_sn_ex
        where  id = #{id,jdbcType=VARCHAR} 
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx" useGeneratedKeys="true">
        insert into sta_wip_sn_ex
        ( id,device_no,product_id
        ,product_name,product_no,create_time
        ,create_by)
        values (#{id,jdbcType=VARCHAR},#{deviceNo,jdbcType=VARCHAR},#{productId,jdbcType=INTEGER}
        values (#{id,jdbcType=BIGINT},#{deviceNo,jdbcType=VARCHAR},#{productId,jdbcType=BIGINT}
        ,#{productName,jdbcType=VARCHAR},#{productNo,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP}
        ,#{createBy,jdbcType=VARCHAR})
        ,#{createBy,jdbcType=BIGINT})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx" useGeneratedKeys="true">
        insert into sta_wip_sn_ex
@@ -52,13 +52,13 @@
                <if test="createBy != null">create_by,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=VARCHAR},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</if>
                <if test="productId != null">#{productId,jdbcType=INTEGER},</if>
                <if test="productId != null">#{productId,jdbcType=BIGINT},</if>
                <if test="productName != null">#{productName,jdbcType=VARCHAR},</if>
                <if test="productNo != null">#{productNo,jdbcType=VARCHAR},</if>
                <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
                <if test="createBy != null">#{createBy,jdbcType=VARCHAR},</if>
                <if test="createBy != null">#{createBy,jdbcType=BIGINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
@@ -68,7 +68,7 @@
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="productId != null">
                    product_id = #{productId,jdbcType=INTEGER},
                    product_id = #{productId,jdbcType=BIGINT},
                </if>
                <if test="productName != null">
                    product_name = #{productName,jdbcType=VARCHAR},
@@ -80,20 +80,20 @@
                    create_time = #{createTime,jdbcType=TIMESTAMP},
                </if>
                <if test="createBy != null">
                    create_by = #{createBy,jdbcType=VARCHAR},
                    create_by = #{createBy,jdbcType=BIGINT},
                </if>
        </set>
        where   id = #{id,jdbcType=VARCHAR} 
        where   id = #{id,jdbcType=BIGINT} 
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
        update sta_wip_sn_ex
        set 
            device_no =  #{deviceNo,jdbcType=VARCHAR},
            product_id =  #{productId,jdbcType=INTEGER},
            product_id =  #{productId,jdbcType=BIGINT},
            product_name =  #{productName,jdbcType=VARCHAR},
            product_no =  #{productNo,jdbcType=VARCHAR},
            create_time =  #{createTime,jdbcType=TIMESTAMP},
            create_by =  #{createBy,jdbcType=VARCHAR}
        where   id = #{id,jdbcType=VARCHAR} 
            create_by =  #{createBy,jdbcType=BIGINT}
        where   id = #{id,jdbcType=BIGINT} 
    </update>
</mapper>