add getworklast

Fancy

2024-07-05 1416681fe19d6e9feb1538b1f64a2bcd7f53a5fe

add getworklast

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

@@ -41,7 +41,6 @@
    /**
    * 生产线实体编号
    */
    @NotNull(message="[生产线实体编号]不能为空")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long lineId;

@@ -56,6 +55,9 @@

    @TableField(exist = false)
    public String stationName;

    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long proId;

    @TableField(exist = false)
    public String proName;
@@ -92,9 +94,7 @@
    @TableField(exist = false)
    public String nodeName;

    public Integer nodeType;


    public Integer workType;

    /**
    * 任务认领时间

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

@@ -12,7 +12,7 @@
        <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="nodeType" column="node_type" jdbcType="TINYINT"/>
        <result property="workType" column="work_type" jdbcType="TINYINT"/>
        <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
        <result property="status" column="status" jdbcType="TINYINT"/>
        <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
@@ -44,7 +44,7 @@
        <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="nodeType" column="node_type" jdbcType="TINYINT"/>
        <result property="workType" column="work_type" jdbcType="TINYINT"/>
        <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
        <result property="status" column="status" jdbcType="TINYINT"/>
        <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
@@ -65,50 +65,23 @@
        id
        ,user_id,line_id,
        station_id,plan_id,process_id,
        node_id,node_type,dt,status,
        node_id,work_type,dt,status,
        start_time,end_time,assistants
    </sql>
    <sql id="part_Column_List">
        ${alias}
        .
        id
        ,
        ${alias}
        .
        user_id,
        ${alias}
        .
        line_id,
        ${alias}
        .
        station_id,
        ${alias}
        .
        plan_id,
        ${alias}
        .
        process_id,
        ${alias}
        .
        node_id,
        ${alias}
        .
        node_type,
        ${alias}
        .
        dt,
        ${alias}
        .
        status,
        ${alias}
        .
        start_time,
        ${alias}
        .
        end_time,
        ${alias}
        .
        assistants
        ${alias}.id,
        ${alias}.user_id,
        ${alias}.line_id,
        ${alias}.station_id,
        ${alias}.plan_id,
        ${alias}.process_id,
        ${alias}.node_id,
        ${alias}.work_type,
        ${alias}.dt,
        ${alias}.status,
        ${alias}.start_time,
        ${alias}.end_time,
        ${alias}.assistants
    </sql>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
@@ -327,11 +300,11 @@
        insert into sta_assembly_work_last
        ( id, user_id, line_id
        , station_id, plan_id, process_id
        , node_id, node_type, dt, status
        , node_id, work_type, 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}, #{nodeType,jdbcType=TINYINT}, #{dt,jdbcType=TIMESTAMP}
               , #{nodeId,jdbcType=BIGINT}, #{workType,jdbcType=TINYINT}, #{dt,jdbcType=TIMESTAMP}
               , #{status,jdbcType=TINYINT}
               , #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{assistants,jdbcType=VARCHAR})
    </insert>
@@ -346,7 +319,7 @@
            <if test="planId != null">plan_id,</if>
            <if test="processId != null">process_id,</if>
            <if test="nodeId != null">node_id,</if>
            <if test="nodeType != null">node_Type,</if>
            <if test="workType != null">work_Type,</if>
            <if test="dt != null">dt,</if>
            <if test="status != null">status,</if>
            <if test="startTime != null">start_time,</if>
@@ -361,7 +334,7 @@
            <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="nodeType != null">#{nodeType,jdbcType=TINYINT},</if>
            <if test="workType != null">#{workType,jdbcType=TINYINT},</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>
@@ -390,8 +363,8 @@
            <if test="nodeId != null">
                node_id = #{nodeId,jdbcType=BIGINT},
            </if>
            <if test="nodeType != null">
                node_type = #{nodeType,jdbcType=TINYINT},
            <if test="workType != null">
                work_type = #{workType,jdbcType=TINYINT},
            </if>
            <if test="dt != null">
                dt = #{dt,jdbcType=TIMESTAMP},
@@ -419,7 +392,7 @@
            plan_id    = #{planId,jdbcType=BIGINT},
            process_id = #{processId,jdbcType=BIGINT},
            node_id    = #{nodeId,jdbcType=BIGINT},
            node_type  = #{nodeType,jdbcType=TINYINT},
            work_type  = #{workType,jdbcType=TINYINT},
            dt         = #{dt,jdbcType=TIMESTAMP},
            status     = #{status,jdbcType=TINYINT},
            start_time = #{startTime,jdbcType=TIMESTAMP},

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

@@ -51,7 +51,7 @@
    public Long nodeId;

    @NotNull(message="[生产流程节点类型]不能为空")
    public Integer nodeType;
    public Integer workType;
    /**
     * 任务认领时间
     */

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

@@ -121,52 +121,6 @@
        return stationInfo;
    }

    public StaAssemblyWorkLast checkStationUsed(String id) {
        StaAssemblyWorkLast result = new StaAssemblyWorkLast();
        PltStation stationInfo = null;
        if (StringUtils.isBlank(id)) {
            throw new RuntimeException("工站编码不能为空,请检查");
        }
        stationInfo = getStationInfo(id);
        //检查表中stationId是否已经存在
        StaAssemblyWorkLast param = new StaAssemblyWorkLast();
        param.setStationId(stationInfo.getId());
        param.setStatus(STATUS_NORMAL);
        List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
        if (workLasts.size() > 0) {
            BeanUtils.copyProperties(workLasts.get(0), result);
            //校验planId processId nodeId
            PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(workLasts.get(0).getPlanId());
            if (assyPlan == null) {
                //直接删除记录
                logout(workLasts.get(0).getId().toString());
            }
            boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
                    .anyMatch(node -> node.id.equals(workLasts.get(0).getNodeId()));
            if (!hasNodeId) {
                //直接删除记录
                logout(workLasts.get(0).getId().toString());
            } else {
                result.setPlanName(assyPlan.getName());
                result.setProcessName(assyPlan.getProcessName());
                result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
                //找到对应的产品信息
                PltProduct  product = productDao.selectByPrimaryKey(assyPlan.getProId());
                if (product == null) {
                    throw new RuntimeException("产品信息有误或被其他人员修改,请登录管理系统查看任务关联产品ID为:" + assyPlan.getProId());
                }
                result.setProName(product.getName());
                String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
                result.setDevicePrefix(devicePrefix);
            }
        }
        result.setStationId(stationInfo.getId());
        result.setStationName(stationInfo.getName());
        result.setLineId(stationInfo.getLineId());
        result.setLineName(stationInfo.getLineName());
        return result;
    }

    public StaAssemblyWorkLast checkUserAndStationUsed(QueryVo vo) {
        StaAssemblyWorkLast result = new StaAssemblyWorkLast();
        PltStation stationInfo = null;
@@ -215,6 +169,79 @@
        return result;
    }

    public StaAssemblyWorkLast getWorkLast(String workId) {
        StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
        if (result == null) {
            return null;
        }
        BaUser userInfo = getUserInfo(result.getUserId().toString());
        PltStation stationInfo = getStationInfo(result.getStationId().toString());
        //校验planId processId nodeId
        PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(result.getPlanId());
        boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
                .anyMatch(node -> node.id.equals(result.getNodeId()));
        if (userInfo == null || stationInfo == null || assyPlan == null || (!hasNodeId)) {
            //直接删除记录
            logout(result.getId().toString());
            result.setId(null);
            if(userInfo == null){
                result.setUserId(null);
                result.setUserName("");
            }
            if(stationInfo == null){
                result.setStationId(null);
                result.setStationName("");
            }
            if(assyPlan == null){
                result.setPlanId(null);
                result.setPlanName("");
            }
            if(!hasNodeId){
                result.setNodeId(null);
                result.setNodeName("");
            }
            return result;
        }else {
            result.setPlanName(assyPlan.getName());
            result.setProcessName(assyPlan.getProcessName());
            result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
            //找到对应的产品信息
            PltProduct  product = productDao.selectByPrimaryKey(assyPlan.getProId());
            if (product != null) {
                result.setProName(product.getName());
                String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
                result.setDevicePrefix(devicePrefix);
            }
        }
        result.setStationId(stationInfo.getId());
        result.setStationName(stationInfo.getName());
        result.setLineId(stationInfo.getLineId());
        result.setLineName(stationInfo.getLineName());
        return result;
    }

    public StaAssemblyWorkLast checkStationUsed(String stationId) {
        StaAssemblyWorkLast result = new StaAssemblyWorkLast();
        PltStation stationInfo = null;
        if (StringUtils.isBlank(stationId)) {
            throw new RuntimeException("工站编码不能为空,请检查");
        }
        stationInfo = getStationInfo(stationId);
        //检查表中stationId是否已经存在
        StaAssemblyWorkLast param = new StaAssemblyWorkLast();
        param.setStationId(stationInfo.getId());
        param.setStatus(STATUS_NORMAL);
        List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
        if (workLasts.size() > 0) {
            result =  getWorkLast(workLasts.get(0).getId().toString());
        }
        result.setStationId(stationInfo.getId());
        result.setStationName(stationInfo.getName());
        result.setLineId(stationInfo.getLineId());
        result.setLineName(stationInfo.getLineName());
        return result;
    }

    @Transactional
    public StaAssemblyWorkLast save(QueryVo vo) {
        //先check
@@ -230,7 +257,7 @@
            throw new RuntimeException("节点信息有误或被其他人员修改,请重新选择节点信息");
        }

        //怎么将只包含这个节点的信息全部回传呢
        //数据逐个封装返回
        vo.setLineId(checkResult.getLineId());
        StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
        BeanUtils.copyProperties(vo, staLast);
@@ -238,7 +265,7 @@
        staLast.setStationId(checkResult.getStationId());
        int count = 0;
        if (checkResult.getId() == null) {
            BeanUtils.copyProperties(vo, staLast);
            BeanUtils.copyProperties(vo, staLast);//vo拷贝到staLast
            staLast.setUserId(checkResult.getUserId());
            staLast.setStationId(checkResult.getStationId());
            staLast.setStatus(STATUS_NORMAL);