模块名称修改

刘小明

2024-06-19 d05dd9bd1e32e95108b0a299ccf71459c685c222

模块名称修改

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

New file
@@ -0,0 +1,27 @@
package com.dy.pmsGlobal.daoSta;

import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory;
import org.apache.ibatis.annotations.Mapper;

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

    int deleteByPrimaryKey(Long id);

    int insert(StaAssemblyWorkHistory record);

    int insertSelective(StaAssemblyWorkHistory record);

    StaAssemblyWorkHistory selectByPrimaryKey(Long id);

    int updateByPrimaryKeySelective(StaAssemblyWorkHistory record);

    int updateByPrimaryKey(StaAssemblyWorkHistory record);

}

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

New file
@@ -0,0 +1,27 @@
package com.dy.pmsGlobal.daoSta;

import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import org.apache.ibatis.annotations.Mapper;

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

    int deleteByPrimaryKey(Long id);

    int insert(StaAssemblyWorkLast record);

    int insertSelective(StaAssemblyWorkLast record);

    StaAssemblyWorkLast selectByPrimaryKey(Long id);

    int updateByPrimaryKeySelective(StaAssemblyWorkLast record);

    int updateByPrimaryKey(StaAssemblyWorkLast record);

}

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

New file
@@ -0,0 +1,27 @@
package com.dy.pmsGlobal.daoSta;

import com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo;
import org.apache.ibatis.annotations.Mapper;

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

    int deleteByPrimaryKey(Long id);

    int insert(StaDevOpsTaskClaimInfo record);

    int insertSelective(StaDevOpsTaskClaimInfo record);

    StaDevOpsTaskClaimInfo selectByPrimaryKey(Long id);

    int updateByPrimaryKeySelective(StaDevOpsTaskClaimInfo record);

    int updateByPrimaryKey(StaDevOpsTaskClaimInfo record);

}

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

New file
@@ -0,0 +1,27 @@
package com.dy.pmsGlobal.daoSta;

import com.dy.pmsGlobal.pojoSta.StaDeviceLast;
import org.apache.ibatis.annotations.Mapper;

/**
* @author User
* @description 针对表【sta_device_last(设备最新状态表)】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @Entity com.dy.pmsGlobal.pojoSta.StaDeviceLast
*/
@Mapper
public interface StaDeviceLastMapper {

    int deleteByPrimaryKey(Long id);

    int insert(StaDeviceLast record);

    int insertSelective(StaDeviceLast record);

    StaDeviceLast selectByPrimaryKey(Long id);

    int updateByPrimaryKeySelective(StaDeviceLast record);

    int updateByPrimaryKey(StaDeviceLast record);

}

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

New file
@@ -0,0 +1,27 @@
package com.dy.pmsGlobal.daoSta;

import com.dy.pmsGlobal.pojoSta.StaDeviceLife;
import org.apache.ibatis.annotations.Mapper;

/**
* @author User
* @description 针对表【sta_device_life(设备生命周期表)】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @Entity com.dy.pmsGlobal.pojoSta.StaDeviceLife
*/
@Mapper
public interface StaDeviceLifeMapper {

    int deleteByPrimaryKey(Long id);

    int insert(StaDeviceLife record);

    int insertSelective(StaDeviceLife record);

    StaDeviceLife selectByPrimaryKey(Long id);

    int updateByPrimaryKeySelective(StaDeviceLife record);

    int updateByPrimaryKey(StaDeviceLife record);

}

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

New file
@@ -0,0 +1,27 @@
package com.dy.pmsGlobal.daoSta;

import com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog;
import org.apache.ibatis.annotations.Mapper;

/**
* @author User
* @description 针对表【sta_device_production_log(设备生产日志表)】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @Entity com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog
*/
@Mapper
public interface StaDeviceProductionLogMapper {

    int deleteByPrimaryKey(Long id);

    int insert(StaDeviceProductionLog record);

    int insertSelective(StaDeviceProductionLog record);

    StaDeviceProductionLog selectByPrimaryKey(Long id);

    int updateByPrimaryKeySelective(StaDeviceProductionLog record);

    int updateByPrimaryKey(StaDeviceProductionLog record);

}

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

New file
@@ -0,0 +1,27 @@
package com.dy.pmsGlobal.daoSta;

import com.dy.pmsGlobal.pojoSta.StaRepairInfo;
import org.apache.ibatis.annotations.Mapper;

/**
* @author User
* @description 针对表【sta_repair_info】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @Entity com.dy.pmsGlobal.pojoSta.StaRepairInfo
*/
@Mapper
public interface StaRepairInfoMapper {

    int deleteByPrimaryKey(Long id);

    int insert(StaRepairInfo record);

    int insertSelective(StaRepairInfo record);

    StaRepairInfo selectByPrimaryKey(Long id);

    int updateByPrimaryKeySelective(StaRepairInfo record);

    int updateByPrimaryKey(StaRepairInfo record);

}

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

New file
@@ -0,0 +1,27 @@
package com.dy.pmsGlobal.daoSta;

import com.dy.pmsGlobal.pojoSta.StaWipSnEx;
import org.apache.ibatis.annotations.Mapper;

/**
* @author User
* @description 针对表【sta_wip_sn_ex(设备关联表)】的数据库操作Mapper
* @createDate 2024-06-19 14:21:17
* @Entity com.dy.pmsGlobal.pojoSta.StaWipSnEx
*/
@Mapper
public interface StaWipSnExMapper {

    int deleteByPrimaryKey(Long id);

    int insert(StaWipSnEx record);

    int insertSelective(StaWipSnEx record);

    StaWipSnEx selectByPrimaryKey(Long id);

    int updateByPrimaryKeySelective(StaWipSnEx record);

    int updateByPrimaryKey(StaWipSnEx record);

}

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoAssemblyWorkHistoryMapper.java

File was deleted

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoAssemblyWorkLastMapper.java

File was deleted

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDevOpsTaskClaimInfoMapper.java

File was deleted

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceLastMapper.java

File was deleted

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceLifeMapper.java

File was deleted

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceProductionLogMapper.java

File was deleted

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoRepairInfoMapper.java

File was deleted

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoWipSnExMapper.java

File was deleted

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

File was renamed from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkLast.java
@@ -1,4 +1,4 @@
package com.dy.pmsGlobal.pojoWo;
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@

/**
 * 生产线生产任务认领表
 * @TableName wo_assembly_work_last
 * @TableName sta_assembly_work_history
 */
@Data
public class WoAssemblyWorkLast implements Serializable {
public class StaAssemblyWorkHistory implements Serializable {
    /**
     * 
     */
@@ -83,7 +83,7 @@
        if (getClass() != that.getClass()) {
            return false;
        }
        WoAssemblyWorkLast other = (WoAssemblyWorkLast) that;
        StaAssemblyWorkHistory other = (StaAssemblyWorkHistory) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
            && (this.getLineId() == null ? other.getLineId() == null : this.getLineId().equals(other.getLineId()))

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

copy from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkLast.java
copy to pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
File was copied from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkLast.java
@@ -1,4 +1,4 @@
package com.dy.pmsGlobal.pojoWo;
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@

/**
 * 生产线生产任务认领表
 * @TableName wo_assembly_work_last
 * @TableName sta_assembly_work_last
 */
@Data
public class WoAssemblyWorkLast implements Serializable {
public class StaAssemblyWorkLast implements Serializable {
    /**
     * 
     */
@@ -83,7 +83,7 @@
        if (getClass() != that.getClass()) {
            return false;
        }
        WoAssemblyWorkLast other = (WoAssemblyWorkLast) that;
        StaAssemblyWorkLast other = (StaAssemblyWorkLast) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
            && (this.getLineId() == null ? other.getLineId() == null : this.getLineId().equals(other.getLineId()))

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

File was renamed from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDevOpsTaskClaimInfo.java
@@ -1,4 +1,4 @@
package com.dy.pmsGlobal.pojoWo;
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@

/**
 * 安装运维任务认领表
 * @TableName wo_dev_ops_task_claim_info
 * @TableName sta_dev_ops_task_claim_info
 */
@Data
public class WoDevOpsTaskClaimInfo implements Serializable {
public class StaDevOpsTaskClaimInfo implements Serializable {
    /**
     * 
     */
@@ -48,7 +48,7 @@
        if (getClass() != that.getClass()) {
            return false;
        }
        WoDevOpsTaskClaimInfo other = (WoDevOpsTaskClaimInfo) that;
        StaDevOpsTaskClaimInfo other = (StaDevOpsTaskClaimInfo) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
            && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))

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

File was renamed from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceLast.java
@@ -1,4 +1,4 @@
package com.dy.pmsGlobal.pojoWo;
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@

/**
 * 设备最新状态表
 * @TableName wo_device_last
 * @TableName sta_device_last
 */
@Data
public class WoDeviceLast implements Serializable {
public class StaDeviceLast implements Serializable {
    /**
     * 
     */
@@ -98,7 +98,7 @@
        if (getClass() != that.getClass()) {
            return false;
        }
        WoDeviceLast other = (WoDeviceLast) that;
        StaDeviceLast other = (StaDeviceLast) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
            && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))

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

copy from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceProductionLog.java
copy to pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
File was copied from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceProductionLog.java
@@ -1,15 +1,15 @@
package com.dy.pmsGlobal.pojoWo;
package com.dy.pmsGlobal.pojoSta;

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

/**
 * 设备生产日志表
 * @TableName wo_device_production_log
 * 设备生命周期表
 * @TableName sta_device_life
 */
@Data
public class WoDeviceProductionLog implements Serializable {
public class StaDeviceLife implements Serializable {
    /**
     * 
     */
@@ -36,7 +36,7 @@
    private String currNode;

    /**
     * 
     * 下一节点
     */
    private String nextNode;

@@ -56,7 +56,7 @@
    private Integer result;

    /**
     * 
     * 维修节点返回的错误码
     */
    private String errorCode;

@@ -103,7 +103,7 @@
        if (getClass() != that.getClass()) {
            return false;
        }
        WoDeviceProductionLog other = (WoDeviceProductionLog) that;
        StaDeviceLife other = (StaDeviceLife) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
            && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))

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

File was renamed from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceProductionLog.java
@@ -1,4 +1,4 @@
package com.dy.pmsGlobal.pojoWo;
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@

/**
 * 设备生产日志表
 * @TableName wo_device_production_log
 * @TableName sta_device_production_log
 */
@Data
public class WoDeviceProductionLog implements Serializable {
public class StaDeviceProductionLog implements Serializable {
    /**
     * 
     */
@@ -103,7 +103,7 @@
        if (getClass() != that.getClass()) {
            return false;
        }
        WoDeviceProductionLog other = (WoDeviceProductionLog) that;
        StaDeviceProductionLog other = (StaDeviceProductionLog) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
            && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))

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

File was renamed from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoRepairInfo.java
@@ -1,4 +1,4 @@
package com.dy.pmsGlobal.pojoWo;
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@

/**
 * 
 * @TableName wo_repair_info
 * @TableName sta_repair_info
 */
@Data
public class WoRepairInfo implements Serializable {
public class StaRepairInfo implements Serializable {
    /**
     * 
     */
@@ -68,7 +68,7 @@
        if (getClass() != that.getClass()) {
            return false;
        }
        WoRepairInfo other = (WoRepairInfo) that;
        StaRepairInfo other = (StaRepairInfo) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
            && (this.getFromNode() == null ? other.getFromNode() == null : this.getFromNode().equals(other.getFromNode()))

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

File was renamed from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoWipSnEx.java
@@ -1,4 +1,4 @@
package com.dy.pmsGlobal.pojoWo;
package com.dy.pmsGlobal.pojoSta;

import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@

/**
 * 设备关联表
 * @TableName wo_wip_sn_ex
 * @TableName sta_wip_sn_ex
 */
@Data
public class WoWipSnEx implements Serializable {
public class StaWipSnEx implements Serializable {
    /**
     * 
     */
@@ -58,7 +58,7 @@
        if (getClass() != that.getClass()) {
            return false;
        }
        WoWipSnEx other = (WoWipSnEx) that;
        StaWipSnEx other = (StaWipSnEx) that;
        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
            && (this.getDeviceNo() == null ? other.getDeviceNo() == null : this.getDeviceNo().equals(other.getDeviceNo()))
            && (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId()))

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkHistory.java

File was deleted

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceLife.java

File was deleted

 pms-parent/pms-global/src/main/resources/application-global.yml

@@ -69,7 +69,7 @@
    other:
        webPort: 12348
        idSuffix: 5
    work:
    station:
        webPort: 12349
        idSuffix: 6
    file:

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

File was renamed from pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkHistoryMapper.xml
@@ -2,9 +2,9 @@
<!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">
<mapper namespace="com.dy.pmsGlobal.daoSta.StaAssemblyWorkHistoryMapper">

    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="userId" column="user_id" jdbcType="BIGINT"/>
            <result property="lineId" column="line_id" jdbcType="BIGINT"/>
@@ -29,16 +29,16 @@
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_assembly_work_history
        from sta_assembly_work_history
        where  id = #{id,jdbcType=BIGINT} 
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_assembly_work_history
        delete from sta_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
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory" useGeneratedKeys="true">
        insert into sta_assembly_work_history
        ( id,user_id,line_id
        ,station_id,plan_id,process_id
        ,node_id,dt,status
@@ -50,8 +50,8 @@
        ,#{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
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory" useGeneratedKeys="true">
        insert into sta_assembly_work_history
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="userId != null">user_id,</if>
@@ -81,8 +81,8 @@
                <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
        update wo_assembly_work_history
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
        update sta_assembly_work_history
        <set>
                <if test="userId != null">
                    user_id = #{userId,jdbcType=BIGINT},
@@ -120,8 +120,8 @@
        </set>
        where   id = #{id,jdbcType=BIGINT} 
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
        update wo_assembly_work_history
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
        update sta_assembly_work_history
        set 
            user_id =  #{userId,jdbcType=BIGINT},
            line_id =  #{lineId,jdbcType=BIGINT},

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

copy from pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkHistoryMapper.xml
copy to pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
File was copied from pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkHistoryMapper.xml
@@ -2,9 +2,9 @@
<!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">
<mapper namespace="com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper">

    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="userId" column="user_id" jdbcType="BIGINT"/>
            <result property="lineId" column="line_id" jdbcType="BIGINT"/>
@@ -29,16 +29,16 @@
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_assembly_work_history
        from sta_assembly_work_last
        where  id = #{id,jdbcType=BIGINT} 
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_assembly_work_history
        delete from sta_assembly_work_last
        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
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast" useGeneratedKeys="true">
        insert into sta_assembly_work_last
        ( id,user_id,line_id
        ,station_id,plan_id,process_id
        ,node_id,dt,status
@@ -50,8 +50,8 @@
        ,#{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
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast" useGeneratedKeys="true">
        insert into sta_assembly_work_last
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="userId != null">user_id,</if>
@@ -81,8 +81,8 @@
                <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
        update wo_assembly_work_history
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
        update sta_assembly_work_last
        <set>
                <if test="userId != null">
                    user_id = #{userId,jdbcType=BIGINT},
@@ -120,8 +120,8 @@
        </set>
        where   id = #{id,jdbcType=BIGINT} 
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
        update wo_assembly_work_history
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
        update sta_assembly_work_last
        set 
            user_id =  #{userId,jdbcType=BIGINT},
            line_id =  #{lineId,jdbcType=BIGINT},

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

File was renamed from pms-parent/pms-global/src/main/resources/mapper/WoDevOpsTaskClaimInfoMapper.xml
@@ -2,9 +2,9 @@
<!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">
<mapper namespace="com.dy.pmsGlobal.daoSta.StaDevOpsTaskClaimInfoMapper">

    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="userId" column="user_id" jdbcType="BIGINT"/>
            <result property="planId" column="plan_id" jdbcType="BIGINT"/>
@@ -20,23 +20,23 @@
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_dev_ops_task_claim_info
        from sta_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
        delete from sta_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
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo" useGeneratedKeys="true">
        insert into sta_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
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo" useGeneratedKeys="true">
        insert into sta_dev_ops_task_claim_info
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="userId != null">user_id,</if>
@@ -52,8 +52,8 @@
                <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
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo">
        update sta_dev_ops_task_claim_info
        <set>
                <if test="userId != null">
                    user_id = #{userId,jdbcType=BIGINT},
@@ -70,8 +70,8 @@
        </set>
        where   id = #{id,jdbcType=BIGINT} 
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo">
        update wo_dev_ops_task_claim_info
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo">
        update sta_dev_ops_task_claim_info
        set 
            user_id =  #{userId,jdbcType=BIGINT},
            plan_id =  #{planId,jdbcType=BIGINT},

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

File was renamed from pms-parent/pms-global/src/main/resources/mapper/WoDeviceLastMapper.xml
@@ -2,9 +2,9 @@
<!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">
<mapper namespace="com.dy.pmsGlobal.daoSta.StaDeviceLastMapper">

    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDeviceLast">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
            <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
@@ -33,16 +33,16 @@
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_device_last
        from sta_device_last
        where  id = #{id,jdbcType=BIGINT} 
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_device_last
        delete from sta_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
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
        insert into sta_device_last
        ( id,equip_no,plan_id
        ,station_id,curr_node,next_node
        ,status,result,error_code
@@ -56,8 +56,8 @@
        ,#{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
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
        insert into sta_device_last
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="equipNo != null">equip_no,</if>
@@ -93,8 +93,8 @@
                <if test="inStationTime != null">#{inStationTime,jdbcType=TIMESTAMP},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLast">
        update wo_device_last
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
        update sta_device_last
        <set>
                <if test="equipNo != null">
                    equip_no = #{equipNo,jdbcType=VARCHAR},
@@ -141,8 +141,8 @@
        </set>
        where   id = #{id,jdbcType=BIGINT} 
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLast">
        update wo_device_last
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
        update sta_device_last
        set 
            equip_no =  #{equipNo,jdbcType=VARCHAR},
            plan_id =  #{planId,jdbcType=VARCHAR},

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

File was renamed from pms-parent/pms-global/src/main/resources/mapper/WoDeviceProductionLogMapper.xml
@@ -2,9 +2,9 @@
<!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">
<mapper namespace="com.dy.pmsGlobal.daoSta.StaDeviceLifeMapper">

    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
            <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
@@ -35,16 +35,16 @@
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_device_production_log
        from sta_device_life
        where  id = #{id,jdbcType=BIGINT} 
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_device_production_log
        delete from sta_device_life
        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
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife" useGeneratedKeys="true">
        insert into sta_device_life
        ( id,equip_no,plan_id
        ,station_id,curr_node,next_node
        ,in_line_time,status,result
@@ -58,8 +58,8 @@
        ,#{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
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife" useGeneratedKeys="true">
        insert into sta_device_life
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="equipNo != null">equip_no,</if>
@@ -97,8 +97,8 @@
                <if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
        update wo_device_production_log
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
        update sta_device_life
        <set>
                <if test="equipNo != null">
                    equip_no = #{equipNo,jdbcType=VARCHAR},
@@ -148,8 +148,8 @@
        </set>
        where   id = #{id,jdbcType=BIGINT} 
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
        update wo_device_production_log
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
        update sta_device_life
        set 
            equip_no =  #{equipNo,jdbcType=VARCHAR},
            plan_id =  #{planId,jdbcType=VARCHAR},

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

copy from pms-parent/pms-global/src/main/resources/mapper/WoDeviceProductionLogMapper.xml
copy to pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
File was copied from pms-parent/pms-global/src/main/resources/mapper/WoDeviceProductionLogMapper.xml
@@ -2,9 +2,9 @@
<!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">
<mapper namespace="com.dy.pmsGlobal.daoSta.StaDeviceProductionLogMapper">

    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
            <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
@@ -35,16 +35,16 @@
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_device_production_log
        from sta_device_production_log
        where  id = #{id,jdbcType=BIGINT} 
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_device_production_log
        delete from sta_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
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
        insert into sta_device_production_log
        ( id,equip_no,plan_id
        ,station_id,curr_node,next_node
        ,in_line_time,status,result
@@ -58,8 +58,8 @@
        ,#{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
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
        insert into sta_device_production_log
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="equipNo != null">equip_no,</if>
@@ -97,8 +97,8 @@
                <if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
        update wo_device_production_log
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
        update sta_device_production_log
        <set>
                <if test="equipNo != null">
                    equip_no = #{equipNo,jdbcType=VARCHAR},
@@ -148,8 +148,8 @@
        </set>
        where   id = #{id,jdbcType=BIGINT} 
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
        update wo_device_production_log
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
        update sta_device_production_log
        set 
            equip_no =  #{equipNo,jdbcType=VARCHAR},
            plan_id =  #{planId,jdbcType=VARCHAR},

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

File was renamed from pms-parent/pms-global/src/main/resources/mapper/WoRepairInfoMapper.xml
@@ -2,9 +2,9 @@
<!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">
<mapper namespace="com.dy.pmsGlobal.daoSta.StaRepairInfoMapper">

    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoRepairInfo">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
            <result property="fromNode" column="from_node" jdbcType="VARCHAR"/>
@@ -25,16 +25,16 @@
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_repair_info
        from sta_repair_info
        where  id = #{id,jdbcType=BIGINT} 
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_repair_info
        delete from sta_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
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo" useGeneratedKeys="true">
        insert into sta_repair_info
        ( id,equip_no,from_node
        ,repair_reason,to_node,repair_by
        ,repair_time,create_time,create_by
@@ -44,8 +44,8 @@
        ,#{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
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo" useGeneratedKeys="true">
        insert into sta_repair_info
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="equipNo != null">equip_no,</if>
@@ -69,8 +69,8 @@
                <if test="createBy != null">#{createBy,jdbcType=BIGINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoRepairInfo">
        update wo_repair_info
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
        update sta_repair_info
        <set>
                <if test="equipNo != null">
                    equip_no = #{equipNo,jdbcType=VARCHAR},
@@ -99,8 +99,8 @@
        </set>
        where   id = #{id,jdbcType=BIGINT} 
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoRepairInfo">
        update wo_repair_info
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
        update sta_repair_info
        set 
            equip_no =  #{equipNo,jdbcType=VARCHAR},
            from_node =  #{fromNode,jdbcType=VARCHAR},

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

File was renamed from pms-parent/pms-global/src/main/resources/mapper/WoWipSnExMapper.xml
@@ -2,9 +2,9 @@
<!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">
<mapper namespace="com.dy.pmsGlobal.daoSta.StaWipSnExMapper">

    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoWipSnEx">
    <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
            <id property="id" column="id" jdbcType="VARCHAR"/>
            <result property="deviceNo" column="device_no" jdbcType="VARCHAR"/>
            <result property="productId" column="product_id" jdbcType="INTEGER"/>
@@ -23,16 +23,16 @@
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from wo_wip_sn_ex
        from sta_wip_sn_ex
        where  id = #{id,jdbcType=VARCHAR} 
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from wo_wip_sn_ex
        delete from sta_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
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx" useGeneratedKeys="true">
        insert into sta_wip_sn_ex
        ( id,device_no,product_id
        ,product_name,product_no,create_time
        ,create_by)
@@ -40,8 +40,8 @@
        ,#{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
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx" useGeneratedKeys="true">
        insert into sta_wip_sn_ex
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="deviceNo != null">device_no,</if>
@@ -61,8 +61,8 @@
                <if test="createBy != null">#{createBy,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoWipSnEx">
        update wo_wip_sn_ex
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
        update sta_wip_sn_ex
        <set>
                <if test="deviceNo != null">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
@@ -85,8 +85,8 @@
        </set>
        where   id = #{id,jdbcType=VARCHAR} 
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoWipSnEx">
        update wo_wip_sn_ex
    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
        update sta_wip_sn_ex
        set 
            device_no =  #{deviceNo,jdbcType=VARCHAR},
            product_id =  #{productId,jdbcType=INTEGER},

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

File was deleted

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

File was deleted

 pms-parent/pms-web-station/pom.xml

File was renamed from pms-parent/pms-web-work/pom.xml
@@ -12,9 +12,9 @@

    <packaging>jar</packaging>
    <groupId>com.dy</groupId>
    <artifactId>pms-web-work</artifactId>
    <artifactId>pms-web-station</artifactId>
    <version>1.0.0</version>
    <name>pms-web-work</name>
    <name>pms-web-station</name>
    <description>免登录模块</description>



 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/PmsStationApplication.java

File was renamed from pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/PmsWorkApplication.java
@@ -1,4 +1,4 @@
package com.dy.pmsWork;
package com.dy.pmsStation;

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.pmsWork"})
@ComponentScan(basePackages = {"com.dy.common", "com.dy.pmsGlobal", "com.dy.pmsStation"})
@MapperScan(basePackages={"com.dy.pmsGlobal.dao*"})
public class PmsWorkApplication {
public class PmsStationApplication {
    public static void main(String[] args) {
        SpringApplication.run(PmsWorkApplication.class, args);
        SpringApplication.run(PmsStationApplication.class, args);
    }
}

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java

File was renamed from pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/assemblyStep/AssemblyStepCtrl.java
@@ -1,4 +1,4 @@
package com.dy.pmsWork.assemblyStep;
package com.dy.pmsStation.assemblyStep;

import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java

File was renamed from pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/workOrder/WorkOrderCtrl.java
@@ -1,4 +1,4 @@
package com.dy.pmsWork.workOrder;
package com.dy.pmsStation.workOrder;

import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;

 pms-parent/pms-web-station/src/main/resources/application.yml

File was renamed from pms-parent/pms-web-work/src/main/resources/application.yml
@@ -4,11 +4,11 @@

#web服务端口，tomcat默认是8080
server:
    port: ${pms.work.webPort}
    port: ${pms.station.webPort}
    servlet:
        context-path: /work #web访问上下文路径
        context-path: /station #web访问上下文路径
        context-parameters:
            #GenerateIdSetSuffixListener中应用，取值范围是0-99
            idSuffix: ${pms.work.idSuffix}
            idSuffix: ${pms.station.idSuffix}
            #ConfigListener中应用
            #configFileNames: config-global.xml,config-demo.xml

 pms-parent/pms-web-station/src/main/resources/log4j2.yml

File was renamed from pms-parent/pms-web-work/src/main/resources/log4j2.yml
@@ -9,7 +9,7 @@
              value: ./logs
            #日志文件存储名称
            - name: project.name
              value: pmsWork
              value: pmsStation

    #定义输出器，可以输出到控制台和文件.
    Appenders: