刘小明
2024-06-19 0d9f926ceac74c9fba899f4b76d113fd281579a5
work模块名称修改
7个文件已删除
2个文件已修改
25个文件已添加
5 文件已重命名
2938 ■■■■ 已修改文件
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPlt/PltProductTestInspectionItemsMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrDevOpsTaskClaimInfoMapper.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrProductionTaskClaimInfoMapper.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoAssemblyWorkHistoryMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoAssemblyWorkLastMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDevOpsTaskClaimInfoMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceLastMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceLifeMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceProductionLogMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoRepairInfoMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoWipSnExMapper.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrDevOpsTaskClaimInfo.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionTaskClaimInfo.java 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkHistory.java 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkLast.java 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDevOpsTaskClaimInfo.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceLast.java 166 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceLife.java 158 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceProductionLog.java 174 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoRepairInfo.java 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoWipSnEx.java 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/application-global.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrDevOpsTaskClaimInfoMapper.xml 138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrProductionTaskClaimInfoMapper.xml 195 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkHistoryMapper.xml 139 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkLastMapper.xml 139 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/WoDevOpsTaskClaimInfoMapper.xml 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/WoDeviceLastMapper.xml 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/WoDeviceLifeMapper.xml 154 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/WoDeviceProductionLogMapper.xml 171 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/WoRepairInfoMapper.xml 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/WoWipSnExMapper.xml 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-nologin/src/main/java/com/dy/pmsNoLogin/tracking/TrackingCtrl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-work/pom.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/PmsWorkApplication.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/assemblyStep/AssemblyStepCtrl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/workOrder/WorkOrderCtrl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-work/src/main/resources/application.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-work/src/main/resources/log4j2.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPlt/PltProductTestInspectionItemsMapper.java
@@ -7,7 +7,7 @@
import java.util.Map;
/**
* @author User
* @description 针对表【plt_product_test_inspection_items(产品测试检查项目表)】的数据库操作Mapper
* @createDate 2024-06-19 09:05:53
* @Entity com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrDevOpsTaskClaimInfoMapper.java
File was deleted
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrProductionTaskClaimInfoMapper.java
File was deleted
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoAssemblyWorkHistoryMapper.java
New file
@@ -0,0 +1,25 @@
package com.dy.pmsGlobal.daoWo;
import com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory;
/**
* @description 针对表【wo_assembly_work_history(生产线生产任务认领表)】的数据库操作Mapper
* @createDate 2024-06-19 10:20:29
* @Entity com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory
*/
public interface WoAssemblyWorkHistoryMapper {
    int deleteByPrimaryKey(Long id);
    int insert(WoAssemblyWorkHistory record);
    int insertSelective(WoAssemblyWorkHistory record);
    WoAssemblyWorkHistory selectByPrimaryKey(Long id);
    int updateByPrimaryKeySelective(WoAssemblyWorkHistory record);
    int updateByPrimaryKey(WoAssemblyWorkHistory record);
}
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoAssemblyWorkLastMapper.java
New file
@@ -0,0 +1,25 @@
package com.dy.pmsGlobal.daoWo;
import com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast;
/**
* @description 针对表【wo_assembly_work_last(生产线生产任务认领表)】的数据库操作Mapper
* @createDate 2024-06-19 10:21:40
* @Entity com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast
*/
public interface WoAssemblyWorkLastMapper {
    int deleteByPrimaryKey(Long id);
    int insert(WoAssemblyWorkLast record);
    int insertSelective(WoAssemblyWorkLast record);
    WoAssemblyWorkLast selectByPrimaryKey(Long id);
    int updateByPrimaryKeySelective(WoAssemblyWorkLast record);
    int updateByPrimaryKey(WoAssemblyWorkLast record);
}
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDevOpsTaskClaimInfoMapper.java
New file
@@ -0,0 +1,25 @@
package com.dy.pmsGlobal.daoWo;
import com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo;
/**
* @description 针对表【wo_dev_ops_task_claim_info(安装运维任务认领表)】的数据库操作Mapper
* @createDate 2024-06-19 10:21:40
* @Entity com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo
*/
public interface WoDevOpsTaskClaimInfoMapper {
    int deleteByPrimaryKey(Long id);
    int insert(WoDevOpsTaskClaimInfo record);
    int insertSelective(WoDevOpsTaskClaimInfo record);
    WoDevOpsTaskClaimInfo selectByPrimaryKey(Long id);
    int updateByPrimaryKeySelective(WoDevOpsTaskClaimInfo record);
    int updateByPrimaryKey(WoDevOpsTaskClaimInfo record);
}
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceLastMapper.java
New file
@@ -0,0 +1,25 @@
package com.dy.pmsGlobal.daoWo;
import com.dy.pmsGlobal.pojoWo.WoDeviceLast;
/**
* @description 针对表【wo_device_last(设备最新状态表)】的数据库操作Mapper
* @createDate 2024-06-19 10:21:40
* @Entity com.dy.pmsGlobal.pojoWo.WoDeviceLast
*/
public interface WoDeviceLastMapper {
    int deleteByPrimaryKey(Long id);
    int insert(WoDeviceLast record);
    int insertSelective(WoDeviceLast record);
    WoDeviceLast selectByPrimaryKey(Long id);
    int updateByPrimaryKeySelective(WoDeviceLast record);
    int updateByPrimaryKey(WoDeviceLast record);
}
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceLifeMapper.java
New file
@@ -0,0 +1,25 @@
package com.dy.pmsGlobal.daoWo;
import com.dy.pmsGlobal.pojoWo.WoDeviceLife;
/**
* @description 针对表【wo_device_life(设备生命周期表)】的数据库操作Mapper
* @createDate 2024-06-19 10:21:40
* @Entity com.dy.pmsGlobal.pojoWo.WoDeviceLife
*/
public interface WoDeviceLifeMapper {
    int deleteByPrimaryKey(Long id);
    int insert(WoDeviceLife record);
    int insertSelective(WoDeviceLife record);
    WoDeviceLife selectByPrimaryKey(Long id);
    int updateByPrimaryKeySelective(WoDeviceLife record);
    int updateByPrimaryKey(WoDeviceLife record);
}
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceProductionLogMapper.java
New file
@@ -0,0 +1,25 @@
package com.dy.pmsGlobal.daoWo;
import com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog;
/**
* @description 针对表【wo_device_production_log(设备生产日志表)】的数据库操作Mapper
* @createDate 2024-06-19 10:21:40
* @Entity com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog
*/
public interface WoDeviceProductionLogMapper {
    int deleteByPrimaryKey(Long id);
    int insert(WoDeviceProductionLog record);
    int insertSelective(WoDeviceProductionLog record);
    WoDeviceProductionLog selectByPrimaryKey(Long id);
    int updateByPrimaryKeySelective(WoDeviceProductionLog record);
    int updateByPrimaryKey(WoDeviceProductionLog record);
}
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoRepairInfoMapper.java
New file
@@ -0,0 +1,25 @@
package com.dy.pmsGlobal.daoWo;
import com.dy.pmsGlobal.pojoWo.WoRepairInfo;
/**
* @description 针对表【wo_repair_info】的数据库操作Mapper
* @createDate 2024-06-19 10:21:40
* @Entity com.dy.pmsGlobal.pojoWo.WoRepairInfo
*/
public interface WoRepairInfoMapper {
    int deleteByPrimaryKey(Long id);
    int insert(WoRepairInfo record);
    int insertSelective(WoRepairInfo record);
    WoRepairInfo selectByPrimaryKey(Long id);
    int updateByPrimaryKeySelective(WoRepairInfo record);
    int updateByPrimaryKey(WoRepairInfo record);
}
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoWipSnExMapper.java
New file
@@ -0,0 +1,24 @@
package com.dy.pmsGlobal.daoWo;
import com.dy.pmsGlobal.pojoWo.WoWipSnEx;
/**
* @description 针对表【wo_wip_sn_ex(设备关联表)】的数据库操作Mapper
* @createDate 2024-06-19 10:21:40
* @Entity com.dy.pmsGlobal.pojoWo.WoWipSnEx
*/
public interface WoWipSnExMapper {
    int deleteByPrimaryKey(Long id);
    int insert(WoWipSnEx record);
    int insertSelective(WoWipSnEx record);
    WoWipSnEx selectByPrimaryKey(Long id);
    int updateByPrimaryKeySelective(WoWipSnEx record);
    int updateByPrimaryKey(WoWipSnEx record);
}
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrDevOpsTaskClaimInfo.java
File was deleted
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionTaskClaimInfo.java
File was deleted
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkHistory.java
New file
@@ -0,0 +1,142 @@
package com.dy.pmsGlobal.pojoWo;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 生产线生产任务认领表
 * @TableName wo_assembly_work_history
 */
@Data
public class WoAssemblyWorkHistory implements Serializable {
    /**
     *
     */
    private Long id;
    /**
     * 用户实体编号
     */
    private Long userId;
    /**
     * 生产线实体编号
     */
    private Long lineId;
    /**
     * 工站实体编号
     */
    private Long stationId;
    /**
     * 组装生产任务实体编号
     */
    private Long planId;
    /**
     * 生产流程实体编号
     */
    private Long processId;
    /**
     * 生产流程节点实体编号
     */
    private Long nodeId;
    /**
     * 任务认领时间
     */
    private Date dt;
    /**
     * 状态:正常(1)、结束(0)
     */
    private Integer status;
    /**
     * 开始时间
     */
    private Date startTime;
    /**
     * 结束时间
     */
    private Date endTime;
    /**
     * 辅助人员:辅助员工id,以逗号隔开
     */
    private 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;
        }
        WoAssemblyWorkHistory other = (WoAssemblyWorkHistory) 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/pojoWo/WoAssemblyWorkLast.java
New file
@@ -0,0 +1,142 @@
package com.dy.pmsGlobal.pojoWo;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 生产线生产任务认领表
 * @TableName wo_assembly_work_last
 */
@Data
public class WoAssemblyWorkLast implements Serializable {
    /**
     *
     */
    private Long id;
    /**
     * 用户实体编号
     */
    private Long userId;
    /**
     * 生产线实体编号
     */
    private Long lineId;
    /**
     * 工站实体编号
     */
    private Long stationId;
    /**
     * 组装生产任务实体编号
     */
    private Long planId;
    /**
     * 生产流程实体编号
     */
    private Long processId;
    /**
     * 生产流程节点实体编号
     */
    private Long nodeId;
    /**
     * 任务认领时间
     */
    private Date dt;
    /**
     * 状态:正常(1)、结束(0)
     */
    private Integer status;
    /**
     * 开始时间
     */
    private Date startTime;
    /**
     * 结束时间
     */
    private Date endTime;
    /**
     * 辅助人员:辅助员工id,以逗号隔开
     */
    private 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;
        }
        WoAssemblyWorkLast other = (WoAssemblyWorkLast) 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/pojoWo/WoDevOpsTaskClaimInfo.java
New file
@@ -0,0 +1,86 @@
package com.dy.pmsGlobal.pojoWo;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 安装运维任务认领表
 * @TableName wo_dev_ops_task_claim_info
 */
@Data
public class WoDevOpsTaskClaimInfo implements Serializable {
    /**
     *
     */
    private Long id;
    /**
     * 用户实体编号
     */
    private Long userId;
    /**
     * 安装运维任务实体编号
     */
    private Long planId;
    /**
     * 任务认领时间
     */
    private Date dt;
    /**
     * 状态:正常(1)、结束(0)
     */
    private 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;
        }
        WoDevOpsTaskClaimInfo other = (WoDevOpsTaskClaimInfo) 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/pojoWo/WoDeviceLast.java
New file
@@ -0,0 +1,166 @@
package com.dy.pmsGlobal.pojoWo;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 设备最新状态表
 * @TableName wo_device_last
 */
@Data
public class WoDeviceLast implements Serializable {
    /**
     *
     */
    private Long id;
    /**
     * 设备码
     */
    private String equipNo;
    /**
     * 计划id
     */
    private String planId;
    /**
     * 工站id
     */
    private String stationId;
    /**
     * 当前节点
     */
    private String currNode;
    /**
     * 下一节点
     */
    private String nextNode;
    /**
     * 状态: 1:组装中,2:完成,3:维修,4:报废
     */
    private Integer status;
    /**
     * 1:成功,2:失败
     */
    private Integer result;
    /**
     * 维修节点返回的错误码
     */
    private String errorCode;
    /**
     * 备注
     */
    private String memo;
    /**
     * 辅助人员:辅助员工id,以逗号隔开
     */
    private String assistants;
    /**
     * 创建时间
     */
    private Date createTime;
    /**
     *
     */
    private Date updatedDate;
    /**
     * 操作员id
     */
    private String updatedBy;
    /**
     * 入站时间(上一节点的出站时间)
     */
    private 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;
        }
        WoDeviceLast other = (WoDeviceLast) 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/pojoWo/WoDeviceLife.java
New file
@@ -0,0 +1,158 @@
package com.dy.pmsGlobal.pojoWo;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 设备生命周期表
 * @TableName wo_device_life
 */
@Data
public class WoDeviceLife implements Serializable {
    /**
     *
     */
    private Long id;
    /**
     * 设备码
     */
    private String equipNo;
    /**
     * 计划id
     */
    private String planId;
    /**
     * 工站id
     */
    private String stationId;
    /**
     * 当前节点
     */
    private String currNode;
    /**
     * 下一节点
     */
    private String nextNode;
    /**
     * 投入时间
     */
    private Date inLineTime;
    /**
     * 状态: 1:组装中,2:完成,3:维修,4:报废
     */
    private Integer status;
    /**
     * 1:成功,2:失败
     */
    private Integer result;
    /**
     * 维修节点返回的错误码
     */
    private String errorCode;
    /**
     * 备注
     */
    private String memo;
    /**
     * 辅助人员:辅助员工id,以逗号隔开
     */
    private String assistants;
    /**
     *
     */
    private Date updatedDate;
    /**
     * 操作员id
     */
    private String updatedBy;
    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;
        }
        WoDeviceLife other = (WoDeviceLife) 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()));
    }
    @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());
        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(", serialVersionUID=").append(serialVersionUID);
        sb.append("]");
        return sb.toString();
    }
}
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceProductionLog.java
New file
@@ -0,0 +1,174 @@
package com.dy.pmsGlobal.pojoWo;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 设备生产日志表
 * @TableName wo_device_production_log
 */
@Data
public class WoDeviceProductionLog implements Serializable {
    /**
     *
     */
    private Long id;
    /**
     * 设备码
     */
    private String equipNo;
    /**
     * 计划id
     */
    private String planId;
    /**
     * 工站id
     */
    private String stationId;
    /**
     * 当前节点
     */
    private String currNode;
    /**
     *
     */
    private String nextNode;
    /**
     * 投入时间
     */
    private Date inLineTime;
    /**
     * 状态: 1:组装中,2:完成,3:维修,4:报废
     */
    private Integer status;
    /**
     * 1:成功,2:失败
     */
    private Integer result;
    /**
     *
     */
    private String errorCode;
    /**
     * 备注
     */
    private String memo;
    /**
     * 辅助人员:辅助员工id,以逗号隔开
     */
    private String assistants;
    /**
     *
     */
    private Date updatedDate;
    /**
     * 操作员id
     */
    private String updatedBy;
    /**
     * 生产登录id
     */
    private Long claimId;
    /**
     * 维修id
     */
    private 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;
        }
        WoDeviceProductionLog other = (WoDeviceProductionLog) 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/pojoWo/WoRepairInfo.java
New file
@@ -0,0 +1,118 @@
package com.dy.pmsGlobal.pojoWo;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 *
 * @TableName wo_repair_info
 */
@Data
public class WoRepairInfo implements Serializable {
    /**
     *
     */
    private Long id;
    /**
     * 设备码
     */
    private String equipNo;
    /**
     * 从哪个节点进入维修
     */
    private String fromNode;
    /**
     * 维修原因
     */
    private String repairReason;
    /**
     * 去向节点
     */
    private String toNode;
    /**
     * 维修员工
     */
    private String repairBy;
    /**
     * 维修时间
     */
    private Date repairTime;
    /**
     * 创建时间
     */
    private Date createTime;
    /**
     * 推送员工
     */
    private 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;
        }
        WoRepairInfo other = (WoRepairInfo) 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/pojoWo/WoWipSnEx.java
New file
@@ -0,0 +1,102 @@
package com.dy.pmsGlobal.pojoWo;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 设备关联表
 * @TableName wo_wip_sn_ex
 */
@Data
public class WoWipSnEx implements Serializable {
    /**
     *
     */
    private String id;
    /**
     * 设备码
     */
    private String deviceNo;
    /**
     *
     */
    private Integer productId;
    /**
     * 关联产品名
     */
    private String productName;
    /**
     * 关联设备码
     */
    private String productNo;
    /**
     * 创建时间
     */
    private Date createTime;
    /**
     * 更新人
     */
    private String 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;
        }
        WoWipSnEx other = (WoWipSnEx) 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/application-global.yml
@@ -69,7 +69,7 @@
    other:
        webPort: 12348
        idSuffix: 5
    nologin:
    work:
        webPort: 12349
        idSuffix: 6
    file:
pms-parent/pms-global/src/main/resources/mapper/PrDevOpsTaskClaimInfoMapper.xml
File was deleted
pms-parent/pms-global/src/main/resources/mapper/PrProductionTaskClaimInfoMapper.xml
File was deleted
pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkHistoryMapper.xml
New file
@@ -0,0 +1,139 @@
<?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.dy.pmsGlobal.daoWo.WoAssemblyWorkHistoryMapper">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="userId" column="user_id" jdbcType="BIGINT"/>
            <result property="lineId" column="line_id" jdbcType="BIGINT"/>
            <result property="stationId" column="station_id" jdbcType="BIGINT"/>
            <result property="planId" column="plan_id" jdbcType="BIGINT"/>
            <result property="processId" column="process_id" jdbcType="BIGINT"/>
            <result property="nodeId" column="node_id" jdbcType="BIGINT"/>
            <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
            <result property="status" column="status" jdbcType="TINYINT"/>
            <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
            <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
            <result property="assistants" column="assistants" jdbcType="VARCHAR"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,user_id,line_id,
        station_id,plan_id,process_id,
        node_id,dt,status,
        start_time,end_time,assistants
    </sql>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_assembly_work_history
        where  id = #{id,jdbcType=BIGINT}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_assembly_work_history
        where  id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory" useGeneratedKeys="true">
        insert into wo_assembly_work_history
        ( id,user_id,line_id
        ,station_id,plan_id,process_id
        ,node_id,dt,status
        ,start_time,end_time,assistants
        )
        values (#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT},#{lineId,jdbcType=BIGINT}
        ,#{stationId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{processId,jdbcType=BIGINT}
        ,#{nodeId,jdbcType=BIGINT},#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT}
        ,#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{assistants,jdbcType=VARCHAR}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory" useGeneratedKeys="true">
        insert into wo_assembly_work_history
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="userId != null">user_id,</if>
                <if test="lineId != null">line_id,</if>
                <if test="stationId != null">station_id,</if>
                <if test="planId != null">plan_id,</if>
                <if test="processId != null">process_id,</if>
                <if test="nodeId != null">node_id,</if>
                <if test="dt != null">dt,</if>
                <if test="status != null">status,</if>
                <if test="startTime != null">start_time,</if>
                <if test="endTime != null">end_time,</if>
                <if test="assistants != null">assistants,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="userId != null">#{userId,jdbcType=BIGINT},</if>
                <if test="lineId != null">#{lineId,jdbcType=BIGINT},</if>
                <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
                <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
                <if test="processId != null">#{processId,jdbcType=BIGINT},</if>
                <if test="nodeId != null">#{nodeId,jdbcType=BIGINT},</if>
                <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
                <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>
                <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
        update wo_assembly_work_history
        <set>
                <if test="userId != null">
                    user_id = #{userId,jdbcType=BIGINT},
                </if>
                <if test="lineId != null">
                    line_id = #{lineId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="processId != null">
                    process_id = #{processId,jdbcType=BIGINT},
                </if>
                <if test="nodeId != null">
                    node_id = #{nodeId,jdbcType=BIGINT},
                </if>
                <if test="dt != null">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="startTime != null">
                    start_time = #{startTime,jdbcType=TIMESTAMP},
                </if>
                <if test="endTime != null">
                    end_time = #{endTime,jdbcType=TIMESTAMP},
                </if>
                <if test="assistants != null">
                    assistants = #{assistants,jdbcType=VARCHAR},
                </if>
        </set>
        where   id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
        update wo_assembly_work_history
        set
            user_id =  #{userId,jdbcType=BIGINT},
            line_id =  #{lineId,jdbcType=BIGINT},
            station_id =  #{stationId,jdbcType=BIGINT},
            plan_id =  #{planId,jdbcType=BIGINT},
            process_id =  #{processId,jdbcType=BIGINT},
            node_id =  #{nodeId,jdbcType=BIGINT},
            dt =  #{dt,jdbcType=TIMESTAMP},
            status =  #{status,jdbcType=TINYINT},
            start_time =  #{startTime,jdbcType=TIMESTAMP},
            end_time =  #{endTime,jdbcType=TIMESTAMP},
            assistants =  #{assistants,jdbcType=VARCHAR}
        where   id = #{id,jdbcType=BIGINT}
    </update>
</mapper>
pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkLastMapper.xml
New file
@@ -0,0 +1,139 @@
<?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.dy.pmsGlobal.daoWo.WoAssemblyWorkLastMapper">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="userId" column="user_id" jdbcType="BIGINT"/>
            <result property="lineId" column="line_id" jdbcType="BIGINT"/>
            <result property="stationId" column="station_id" jdbcType="BIGINT"/>
            <result property="planId" column="plan_id" jdbcType="BIGINT"/>
            <result property="processId" column="process_id" jdbcType="BIGINT"/>
            <result property="nodeId" column="node_id" jdbcType="BIGINT"/>
            <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
            <result property="status" column="status" jdbcType="TINYINT"/>
            <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
            <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
            <result property="assistants" column="assistants" jdbcType="VARCHAR"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,user_id,line_id,
        station_id,plan_id,process_id,
        node_id,dt,status,
        start_time,end_time,assistants
    </sql>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_assembly_work_last
        where  id = #{id,jdbcType=BIGINT}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_assembly_work_last
        where  id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast" useGeneratedKeys="true">
        insert into wo_assembly_work_last
        ( id,user_id,line_id
        ,station_id,plan_id,process_id
        ,node_id,dt,status
        ,start_time,end_time,assistants
        )
        values (#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT},#{lineId,jdbcType=BIGINT}
        ,#{stationId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{processId,jdbcType=BIGINT}
        ,#{nodeId,jdbcType=BIGINT},#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT}
        ,#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{assistants,jdbcType=VARCHAR}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast" useGeneratedKeys="true">
        insert into wo_assembly_work_last
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="userId != null">user_id,</if>
                <if test="lineId != null">line_id,</if>
                <if test="stationId != null">station_id,</if>
                <if test="planId != null">plan_id,</if>
                <if test="processId != null">process_id,</if>
                <if test="nodeId != null">node_id,</if>
                <if test="dt != null">dt,</if>
                <if test="status != null">status,</if>
                <if test="startTime != null">start_time,</if>
                <if test="endTime != null">end_time,</if>
                <if test="assistants != null">assistants,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="userId != null">#{userId,jdbcType=BIGINT},</if>
                <if test="lineId != null">#{lineId,jdbcType=BIGINT},</if>
                <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
                <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
                <if test="processId != null">#{processId,jdbcType=BIGINT},</if>
                <if test="nodeId != null">#{nodeId,jdbcType=BIGINT},</if>
                <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
                <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>
                <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast">
        update wo_assembly_work_last
        <set>
                <if test="userId != null">
                    user_id = #{userId,jdbcType=BIGINT},
                </if>
                <if test="lineId != null">
                    line_id = #{lineId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="processId != null">
                    process_id = #{processId,jdbcType=BIGINT},
                </if>
                <if test="nodeId != null">
                    node_id = #{nodeId,jdbcType=BIGINT},
                </if>
                <if test="dt != null">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="startTime != null">
                    start_time = #{startTime,jdbcType=TIMESTAMP},
                </if>
                <if test="endTime != null">
                    end_time = #{endTime,jdbcType=TIMESTAMP},
                </if>
                <if test="assistants != null">
                    assistants = #{assistants,jdbcType=VARCHAR},
                </if>
        </set>
        where   id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast">
        update wo_assembly_work_last
        set
            user_id =  #{userId,jdbcType=BIGINT},
            line_id =  #{lineId,jdbcType=BIGINT},
            station_id =  #{stationId,jdbcType=BIGINT},
            plan_id =  #{planId,jdbcType=BIGINT},
            process_id =  #{processId,jdbcType=BIGINT},
            node_id =  #{nodeId,jdbcType=BIGINT},
            dt =  #{dt,jdbcType=TIMESTAMP},
            status =  #{status,jdbcType=TINYINT},
            start_time =  #{startTime,jdbcType=TIMESTAMP},
            end_time =  #{endTime,jdbcType=TIMESTAMP},
            assistants =  #{assistants,jdbcType=VARCHAR}
        where   id = #{id,jdbcType=BIGINT}
    </update>
</mapper>
pms-parent/pms-global/src/main/resources/mapper/WoDevOpsTaskClaimInfoMapper.xml
New file
@@ -0,0 +1,82 @@
<?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.dy.pmsGlobal.daoWo.WoDevOpsTaskClaimInfoMapper">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="userId" column="user_id" jdbcType="BIGINT"/>
            <result property="planId" column="plan_id" jdbcType="BIGINT"/>
            <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
            <result property="status" column="status" jdbcType="TINYINT"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,user_id,plan_id,
        dt,status
    </sql>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_dev_ops_task_claim_info
        where  id = #{id,jdbcType=BIGINT}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_dev_ops_task_claim_info
        where  id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo" useGeneratedKeys="true">
        insert into wo_dev_ops_task_claim_info
        ( id,user_id,plan_id
        ,dt,status)
        values (#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT}
        ,#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo" useGeneratedKeys="true">
        insert into wo_dev_ops_task_claim_info
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="userId != null">user_id,</if>
                <if test="planId != null">plan_id,</if>
                <if test="dt != null">dt,</if>
                <if test="status != null">status,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="userId != null">#{userId,jdbcType=BIGINT},</if>
                <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
                <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo">
        update wo_dev_ops_task_claim_info
        <set>
                <if test="userId != null">
                    user_id = #{userId,jdbcType=BIGINT},
                </if>
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="dt != null">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
        </set>
        where   id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo">
        update wo_dev_ops_task_claim_info
        set
            user_id =  #{userId,jdbcType=BIGINT},
            plan_id =  #{planId,jdbcType=BIGINT},
            dt =  #{dt,jdbcType=TIMESTAMP},
            status =  #{status,jdbcType=TINYINT}
        where   id = #{id,jdbcType=BIGINT}
    </update>
</mapper>
pms-parent/pms-global/src/main/resources/mapper/WoDeviceLastMapper.xml
New file
@@ -0,0 +1,163 @@
<?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.dy.pmsGlobal.daoWo.WoDeviceLastMapper">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDeviceLast">
            <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="status" column="status" jdbcType="TINYINT"/>
            <result property="result" column="result" jdbcType="TINYINT"/>
            <result property="errorCode" column="error_code" jdbcType="VARCHAR"/>
            <result property="memo" column="memo" jdbcType="VARCHAR"/>
            <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="inStationTime" column="in_station_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,equip_no,plan_id,
        station_id,curr_node,next_node,
        status,result,error_code,
        memo,assistants,create_time,
        updated_date,updated_by,in_station_time
    </sql>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_device_last
        where  id = #{id,jdbcType=BIGINT}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_device_last
        where  id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLast" useGeneratedKeys="true">
        insert into wo_device_last
        ( id,equip_no,plan_id
        ,station_id,curr_node,next_node
        ,status,result,error_code
        ,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}
        ,#{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}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLast" useGeneratedKeys="true">
        insert into wo_device_last
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="equipNo != null">equip_no,</if>
                <if test="planId != null">plan_id,</if>
                <if test="stationId != null">station_id,</if>
                <if test="currNode != null">curr_node,</if>
                <if test="nextNode != null">next_node,</if>
                <if test="status != null">status,</if>
                <if test="result != null">result,</if>
                <if test="errorCode != null">error_code,</if>
                <if test="memo != null">memo,</if>
                <if test="assistants != null">assistants,</if>
                <if test="createTime != null">create_time,</if>
                <if test="updatedDate != null">updated_date,</if>
                <if test="updatedBy != null">updated_by,</if>
                <if test="inStationTime != null">in_station_time,</if>
        </trim>
        <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="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="result != null">#{result,jdbcType=TINYINT},</if>
                <if test="errorCode != null">#{errorCode,jdbcType=VARCHAR},</if>
                <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
                <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="inStationTime != null">#{inStationTime,jdbcType=TIMESTAMP},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLast">
        update wo_device_last
        <set>
                <if test="equipNo != null">
                    equip_no = #{equipNo,jdbcType=VARCHAR},
                </if>
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=VARCHAR},
                </if>
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=VARCHAR},
                </if>
                <if test="currNode != null">
                    curr_node = #{currNode,jdbcType=VARCHAR},
                </if>
                <if test="nextNode != null">
                    next_node = #{nextNode,jdbcType=VARCHAR},
                </if>
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="result != null">
                    result = #{result,jdbcType=TINYINT},
                </if>
                <if test="errorCode != null">
                    error_code = #{errorCode,jdbcType=VARCHAR},
                </if>
                <if test="memo != null">
                    memo = #{memo,jdbcType=VARCHAR},
                </if>
                <if test="assistants != null">
                    assistants = #{assistants,jdbcType=VARCHAR},
                </if>
                <if test="createTime != null">
                    create_time = #{createTime,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedDate != null">
                    updated_date = #{updatedDate,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedBy != null">
                    updated_by = #{updatedBy,jdbcType=VARCHAR},
                </if>
                <if test="inStationTime != null">
                    in_station_time = #{inStationTime,jdbcType=TIMESTAMP},
                </if>
        </set>
        where   id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLast">
        update wo_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},
            status =  #{status,jdbcType=TINYINT},
            result =  #{result,jdbcType=TINYINT},
            error_code =  #{errorCode,jdbcType=VARCHAR},
            memo =  #{memo,jdbcType=VARCHAR},
            assistants =  #{assistants,jdbcType=VARCHAR},
            create_time =  #{createTime,jdbcType=TIMESTAMP},
            updated_date =  #{updatedDate,jdbcType=TIMESTAMP},
            updated_by =  #{updatedBy,jdbcType=VARCHAR},
            in_station_time =  #{inStationTime,jdbcType=TIMESTAMP}
        where   id = #{id,jdbcType=BIGINT}
    </update>
</mapper>
pms-parent/pms-global/src/main/resources/mapper/WoDeviceLifeMapper.xml
New file
@@ -0,0 +1,154 @@
<?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.dy.pmsGlobal.daoWo.WoDeviceLifeMapper">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDeviceLife">
            <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="inLineTime" column="in_line_time" jdbcType="TIMESTAMP"/>
            <result property="status" column="status" jdbcType="TINYINT"/>
            <result property="result" column="result" jdbcType="TINYINT"/>
            <result property="errorCode" column="error_code" jdbcType="VARCHAR"/>
            <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"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,equip_no,plan_id,
        station_id,curr_node,next_node,
        in_line_time,status,result,
        error_code,memo,assistants,
        updated_date,updated_by
    </sql>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_device_life
        where  id = #{id,jdbcType=BIGINT}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_device_life
        where  id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLife" useGeneratedKeys="true">
        insert into wo_device_life
        ( id,equip_no,plan_id
        ,station_id,curr_node,next_node
        ,in_line_time,status,result
        ,error_code,memo,assistants
        ,updated_date,updated_by)
        values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{planId,jdbcType=VARCHAR}
        ,#{stationId,jdbcType=VARCHAR},#{currNode,jdbcType=VARCHAR},#{nextNode,jdbcType=VARCHAR}
        ,#{inLineTime,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
        ,#{errorCode,jdbcType=VARCHAR},#{memo,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
        ,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=VARCHAR})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLife" useGeneratedKeys="true">
        insert into wo_device_life
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="equipNo != null">equip_no,</if>
                <if test="planId != null">plan_id,</if>
                <if test="stationId != null">station_id,</if>
                <if test="currNode != null">curr_node,</if>
                <if test="nextNode != null">next_node,</if>
                <if test="inLineTime != null">in_line_time,</if>
                <if test="status != null">status,</if>
                <if test="result != null">result,</if>
                <if test="errorCode != null">error_code,</if>
                <if test="memo != null">memo,</if>
                <if test="assistants != null">assistants,</if>
                <if test="updatedDate != null">updated_date,</if>
                <if test="updatedBy != null">updated_by,</if>
        </trim>
        <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="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</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>
                <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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLife">
        update wo_device_life
        <set>
                <if test="equipNo != null">
                    equip_no = #{equipNo,jdbcType=VARCHAR},
                </if>
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=VARCHAR},
                </if>
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=VARCHAR},
                </if>
                <if test="currNode != null">
                    curr_node = #{currNode,jdbcType=VARCHAR},
                </if>
                <if test="nextNode != null">
                    next_node = #{nextNode,jdbcType=VARCHAR},
                </if>
                <if test="inLineTime != null">
                    in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
                </if>
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="result != null">
                    result = #{result,jdbcType=TINYINT},
                </if>
                <if test="errorCode != null">
                    error_code = #{errorCode,jdbcType=VARCHAR},
                </if>
                <if test="memo != null">
                    memo = #{memo,jdbcType=VARCHAR},
                </if>
                <if test="assistants != null">
                    assistants = #{assistants,jdbcType=VARCHAR},
                </if>
                <if test="updatedDate != null">
                    updated_date = #{updatedDate,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedBy != null">
                    updated_by = #{updatedBy,jdbcType=VARCHAR},
                </if>
        </set>
        where   id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLife">
        update wo_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},
            in_line_time =  #{inLineTime,jdbcType=TIMESTAMP},
            status =  #{status,jdbcType=TINYINT},
            result =  #{result,jdbcType=TINYINT},
            error_code =  #{errorCode,jdbcType=VARCHAR},
            memo =  #{memo,jdbcType=VARCHAR},
            assistants =  #{assistants,jdbcType=VARCHAR},
            updated_date =  #{updatedDate,jdbcType=TIMESTAMP},
            updated_by =  #{updatedBy,jdbcType=VARCHAR}
        where   id = #{id,jdbcType=BIGINT}
    </update>
</mapper>
pms-parent/pms-global/src/main/resources/mapper/WoDeviceProductionLogMapper.xml
New file
@@ -0,0 +1,171 @@
<?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.dy.pmsGlobal.daoWo.WoDeviceProductionLogMapper">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
            <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="inLineTime" column="in_line_time" jdbcType="TIMESTAMP"/>
            <result property="status" column="status" jdbcType="TINYINT"/>
            <result property="result" column="result" jdbcType="TINYINT"/>
            <result property="errorCode" column="error_code" jdbcType="VARCHAR"/>
            <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="claimId" column="claim_id" jdbcType="BIGINT"/>
            <result property="repairId" column="repair_id" jdbcType="BIGINT"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,equip_no,plan_id,
        station_id,curr_node,next_node,
        in_line_time,status,result,
        error_code,memo,assistants,
        updated_date,updated_by,claim_id,
        repair_id
    </sql>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_device_production_log
        where  id = #{id,jdbcType=BIGINT}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_device_production_log
        where  id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog" useGeneratedKeys="true">
        insert into wo_device_production_log
        ( id,equip_no,plan_id
        ,station_id,curr_node,next_node
        ,in_line_time,status,result
        ,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}
        ,#{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}
        ,#{repairId,jdbcType=BIGINT})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog" useGeneratedKeys="true">
        insert into wo_device_production_log
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="equipNo != null">equip_no,</if>
                <if test="planId != null">plan_id,</if>
                <if test="stationId != null">station_id,</if>
                <if test="currNode != null">curr_node,</if>
                <if test="nextNode != null">next_node,</if>
                <if test="inLineTime != null">in_line_time,</if>
                <if test="status != null">status,</if>
                <if test="result != null">result,</if>
                <if test="errorCode != null">error_code,</if>
                <if test="memo != null">memo,</if>
                <if test="assistants != null">assistants,</if>
                <if test="updatedDate != null">updated_date,</if>
                <if test="updatedBy != null">updated_by,</if>
                <if test="claimId != null">claim_id,</if>
                <if test="repairId != null">repair_id,</if>
        </trim>
        <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="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</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>
                <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="claimId != null">#{claimId,jdbcType=BIGINT},</if>
                <if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
        update wo_device_production_log
        <set>
                <if test="equipNo != null">
                    equip_no = #{equipNo,jdbcType=VARCHAR},
                </if>
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=VARCHAR},
                </if>
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=VARCHAR},
                </if>
                <if test="currNode != null">
                    curr_node = #{currNode,jdbcType=VARCHAR},
                </if>
                <if test="nextNode != null">
                    next_node = #{nextNode,jdbcType=VARCHAR},
                </if>
                <if test="inLineTime != null">
                    in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
                </if>
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="result != null">
                    result = #{result,jdbcType=TINYINT},
                </if>
                <if test="errorCode != null">
                    error_code = #{errorCode,jdbcType=VARCHAR},
                </if>
                <if test="memo != null">
                    memo = #{memo,jdbcType=VARCHAR},
                </if>
                <if test="assistants != null">
                    assistants = #{assistants,jdbcType=VARCHAR},
                </if>
                <if test="updatedDate != null">
                    updated_date = #{updatedDate,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedBy != null">
                    updated_by = #{updatedBy,jdbcType=VARCHAR},
                </if>
                <if test="claimId != null">
                    claim_id = #{claimId,jdbcType=BIGINT},
                </if>
                <if test="repairId != null">
                    repair_id = #{repairId,jdbcType=BIGINT},
                </if>
        </set>
        where   id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
        update wo_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},
            in_line_time =  #{inLineTime,jdbcType=TIMESTAMP},
            status =  #{status,jdbcType=TINYINT},
            result =  #{result,jdbcType=TINYINT},
            error_code =  #{errorCode,jdbcType=VARCHAR},
            memo =  #{memo,jdbcType=VARCHAR},
            assistants =  #{assistants,jdbcType=VARCHAR},
            updated_date =  #{updatedDate,jdbcType=TIMESTAMP},
            updated_by =  #{updatedBy,jdbcType=VARCHAR},
            claim_id =  #{claimId,jdbcType=BIGINT},
            repair_id =  #{repairId,jdbcType=BIGINT}
        where   id = #{id,jdbcType=BIGINT}
    </update>
</mapper>
pms-parent/pms-global/src/main/resources/mapper/WoRepairInfoMapper.xml
New file
@@ -0,0 +1,115 @@
<?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.dy.pmsGlobal.daoWo.WoRepairInfoMapper">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoRepairInfo">
            <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="repairReason" column="repair_reason" jdbcType="VARCHAR"/>
            <result property="toNode" column="to_node" jdbcType="VARCHAR"/>
            <result property="repairBy" column="repair_by" jdbcType="VARCHAR"/>
            <result property="repairTime" column="repair_time" jdbcType="TIMESTAMP"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="createBy" column="create_by" jdbcType="BIGINT"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,equip_no,from_node,
        repair_reason,to_node,repair_by,
        repair_time,create_time,create_by
    </sql>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_repair_info
        where  id = #{id,jdbcType=BIGINT}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_repair_info
        where  id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoRepairInfo" useGeneratedKeys="true">
        insert into wo_repair_info
        ( id,equip_no,from_node
        ,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}
        ,#{repairTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{createBy,jdbcType=BIGINT}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoRepairInfo" useGeneratedKeys="true">
        insert into wo_repair_info
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="equipNo != null">equip_no,</if>
                <if test="fromNode != null">from_node,</if>
                <if test="repairReason != null">repair_reason,</if>
                <if test="toNode != null">to_node,</if>
                <if test="repairBy != null">repair_by,</if>
                <if test="repairTime != null">repair_time,</if>
                <if test="createTime != null">create_time,</if>
                <if test="createBy != null">create_by,</if>
        </trim>
        <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="repairReason != null">#{repairReason,jdbcType=VARCHAR},</if>
                <if test="toNode != null">#{toNode,jdbcType=VARCHAR},</if>
                <if test="repairBy != null">#{repairBy,jdbcType=VARCHAR},</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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoRepairInfo">
        update wo_repair_info
        <set>
                <if test="equipNo != null">
                    equip_no = #{equipNo,jdbcType=VARCHAR},
                </if>
                <if test="fromNode != null">
                    from_node = #{fromNode,jdbcType=VARCHAR},
                </if>
                <if test="repairReason != null">
                    repair_reason = #{repairReason,jdbcType=VARCHAR},
                </if>
                <if test="toNode != null">
                    to_node = #{toNode,jdbcType=VARCHAR},
                </if>
                <if test="repairBy != null">
                    repair_by = #{repairBy,jdbcType=VARCHAR},
                </if>
                <if test="repairTime != null">
                    repair_time = #{repairTime,jdbcType=TIMESTAMP},
                </if>
                <if test="createTime != null">
                    create_time = #{createTime,jdbcType=TIMESTAMP},
                </if>
                <if test="createBy != null">
                    create_by = #{createBy,jdbcType=BIGINT},
                </if>
        </set>
        where   id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoRepairInfo">
        update wo_repair_info
        set
            equip_no =  #{equipNo,jdbcType=VARCHAR},
            from_node =  #{fromNode,jdbcType=VARCHAR},
            repair_reason =  #{repairReason,jdbcType=VARCHAR},
            to_node =  #{toNode,jdbcType=VARCHAR},
            repair_by =  #{repairBy,jdbcType=VARCHAR},
            repair_time =  #{repairTime,jdbcType=TIMESTAMP},
            create_time =  #{createTime,jdbcType=TIMESTAMP},
            create_by =  #{createBy,jdbcType=BIGINT}
        where   id = #{id,jdbcType=BIGINT}
    </update>
</mapper>
pms-parent/pms-global/src/main/resources/mapper/WoWipSnExMapper.xml
New file
@@ -0,0 +1,99 @@
<?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.dy.pmsGlobal.daoWo.WoWipSnExMapper">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoWipSnEx">
            <id property="id" column="id" jdbcType="VARCHAR"/>
            <result property="deviceNo" column="device_no" jdbcType="VARCHAR"/>
            <result property="productId" column="product_id" jdbcType="INTEGER"/>
            <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"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,device_no,product_id,
        product_name,product_no,create_time,
        create_by
    </sql>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_wip_sn_ex
        where  id = #{id,jdbcType=VARCHAR}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_wip_sn_ex
        where  id = #{id,jdbcType=VARCHAR}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoWipSnEx" useGeneratedKeys="true">
        insert into wo_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}
        ,#{productName,jdbcType=VARCHAR},#{productNo,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP}
        ,#{createBy,jdbcType=VARCHAR})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoWipSnEx" useGeneratedKeys="true">
        insert into wo_wip_sn_ex
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="deviceNo != null">device_no,</if>
                <if test="productId != null">product_id,</if>
                <if test="productName != null">product_name,</if>
                <if test="productNo != null">product_no,</if>
                <if test="createTime != null">create_time,</if>
                <if test="createBy != null">create_by,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=VARCHAR},</if>
                <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</if>
                <if test="productId != null">#{productId,jdbcType=INTEGER},</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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoWipSnEx">
        update wo_wip_sn_ex
        <set>
                <if test="deviceNo != null">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="productId != null">
                    product_id = #{productId,jdbcType=INTEGER},
                </if>
                <if test="productName != null">
                    product_name = #{productName,jdbcType=VARCHAR},
                </if>
                <if test="productNo != null">
                    product_no = #{productNo,jdbcType=VARCHAR},
                </if>
                <if test="createTime != null">
                    create_time = #{createTime,jdbcType=TIMESTAMP},
                </if>
                <if test="createBy != null">
                    create_by = #{createBy,jdbcType=VARCHAR},
                </if>
        </set>
        where   id = #{id,jdbcType=VARCHAR}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoWipSnEx">
        update wo_wip_sn_ex
        set
            device_no =  #{deviceNo,jdbcType=VARCHAR},
            product_id =  #{productId,jdbcType=INTEGER},
            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}
    </update>
</mapper>
pms-parent/pms-web-nologin/src/main/java/com/dy/pmsNoLogin/tracking/TrackingCtrl.java
File was deleted
pms-parent/pms-web-work/pom.xml
File was renamed from pms-parent/pms-web-nologin/pom.xml
@@ -12,9 +12,9 @@
    <packaging>jar</packaging>
    <groupId>com.dy</groupId>
    <artifactId>pms-web-nologin</artifactId>
    <artifactId>pms-web-work</artifactId>
    <version>1.0.0</version>
    <name>pms-web-noLogin</name>
    <name>pms-web-work</name>
    <description>免登录模块</description>
pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/PmsWorkApplication.java
File was renamed from pms-parent/pms-web-nologin/src/main/java/com/dy/pmsNoLogin/NoLoginApplication.java
@@ -1,4 +1,4 @@
package com.dy.pmsNoLogin;
package com.dy.pmsWork;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
@@ -8,10 +8,10 @@
@SpringBootApplication
@EnableAspectJAutoProxy
@ComponentScan(basePackages = {"com.dy.common", "com.dy.pmsGlobal", "com.dy.pmsNoLogin"})
@ComponentScan(basePackages = {"com.dy.common", "com.dy.pmsGlobal", "com.dy.pmsWork"})
@MapperScan(basePackages={"com.dy.pmsGlobal.dao*"})
public class NoLoginApplication {
public class PmsWorkApplication {
    public static void main(String[] args) {
        SpringApplication.run(NoLoginApplication.class, args);
        SpringApplication.run(PmsWorkApplication.class, args);
    }
}
pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/assemblyStep/AssemblyStepCtrl.java
New file
@@ -0,0 +1,14 @@
package com.dy.pmsWork.assemblyStep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 *记录组装各步骤
 */
@Slf4j
@RestController
@RequestMapping(path = "assemblyStep")
public class AssemblyStepCtrl {
}
pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/workOrder/WorkOrderCtrl.java
File was renamed from pms-parent/pms-web-nologin/src/main/java/com/dy/pmsNoLogin/claim/ClaimCtrl.java
@@ -1,4 +1,4 @@
package com.dy.pmsNoLogin.claim;
package com.dy.pmsWork.workOrder;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
@@ -12,8 +12,8 @@
 */
@Slf4j
@RestController
@RequestMapping(path = "claim")
public class ClaimCtrl {
@RequestMapping(path = "workOrder")
public class WorkOrderCtrl {
    @GetMapping(path = "test")
    public BaseResponse test() {
pms-parent/pms-web-work/src/main/resources/application.yml
File was renamed from pms-parent/pms-web-nologin/src/main/resources/application.yml
@@ -4,11 +4,11 @@
#web服务端口,tomcat默认是8080
server:
    port: ${pms.nologin.webPort}
    port: ${pms.work.webPort}
    servlet:
        context-path: /nologin #web访问上下文路径
        context-path: /work #web访问上下文路径
        context-parameters:
            #GenerateIdSetSuffixListener中应用,取值范围是0-99
            idSuffix: ${pms.nologin.idSuffix}
            idSuffix: ${pms.work.idSuffix}
            #ConfigListener中应用
            #configFileNames: config-global.xml,config-demo.xml
pms-parent/pms-web-work/src/main/resources/log4j2.yml
File was renamed from pms-parent/pms-web-nologin/src/main/resources/log4j2.yml
@@ -9,7 +9,7 @@
              value: ./logs
            #日志文件存储名称
            - name: project.name
              value: pmsNologin
              value: pmsWork
    #定义输出器,可以输出到控制台和文件.
    Appenders: