#

lsh

2024-06-27 8163e62236bdf7b648e6f330e268aee789eabc6d

#

 src/main/java/com/zy/asrs/entity/BasJarMast.java

@@ -29,13 +29,13 @@
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 工作号
     */
    @ApiModelProperty(value= "工作号")
    @TableId(value = "wrk_no", type = IdType.INPUT)
    @TableField("wrk_no")
    private Long wrkNo;


 src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java

@@ -14,6 +14,8 @@

    WrkMastExecute getWrkMastExecuteByWrkNo(@Param("wrkNo") Long wrkNo);

    List<WrkMastExecute> getWrkMastExecuteByWrkNoList(@Param("wrkNo") Long wrkNo);

    List<WrkMastExecute> getWrkMastExecuteByJarNo(@Param("jarId") Integer jarId);

    List<WrkMastExecute> selectWrkMastExecuteByType(@Param("type") Integer type);

 src/main/java/com/zy/asrs/service/WrkMastExecuteService.java

@@ -9,6 +9,8 @@

    WrkMastExecute getWrkMastExecuteByWrkNo(Long wrkNo);

    List<WrkMastExecute> getWrkMastExecuteByWrkNoList(Long wrkNo);

    List<WrkMastExecute> getWrkMastExecuteByJarNo(Integer jarId);

    List<WrkMastExecute> selectWrkMastExecuteByType(Integer type);

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -6219,7 +6219,7 @@
                        if (wrkMastExecute.getIoType()==7){  //7  B=>C
                            if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
                                //调车  == > 移动
                                if (jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT26.id,SteTaskModeType.STE_WFQH_12,false)){
                                if (jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT26.id,SteTaskModeType.STE_MOVE_14,false)){
                                    log.error("穿梭板Ste命令下发失败，ste号={},任务数据={},硫化罐数据={},sign={}",
                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
                                }
@@ -6240,7 +6240,7 @@
                        } else { //8 C=>B
                            if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),3,SteStatusType.IDLE)){
                                //调车  == > 移动
                                if (!jarSteTake(wrkMastExecute,SteLocaType.POINT26.id,SteLocaType.POINT23.id,SteTaskModeType.STE_WFQH_12,false)){
                                if (!jarSteTake(wrkMastExecute,SteLocaType.POINT26.id,SteLocaType.POINT23.id,SteTaskModeType.STE_MOVE_14,false)){
                                    log.error("穿梭板Ste命令下发失败，ste号={},任务数据={},硫化罐数据={},sign={}",
                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
                                }
@@ -6522,7 +6522,7 @@
                        if (wrkMastExecute.getIoType()==10){//10：A=>B
                            if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE)){
                                //调车  == > 移动
                                if (!jarSteTake(wrkMastExecute,SteLocaType.POINT20.id,SteLocaType.POINT23.id,SteTaskModeType.STE_WFQH_12,false)){
                                if (!jarSteTake(wrkMastExecute,SteLocaType.POINT20.id,SteLocaType.POINT23.id,SteTaskModeType.STE_MOVE_14,false)){
                                    log.error("穿梭板Ste命令下发失败，ste号={},任务数据={},硫化罐数据={},sign={}",
                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
                                }
@@ -6543,7 +6543,7 @@
                        } else {//11:B=>A
                            if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
                                //调车  == > 移动
                                if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT20.id,SteTaskModeType.STE_WFQH_12,false)){
                                if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT20.id,SteTaskModeType.STE_MOVE_14,false)){
                                    log.error("穿梭板Ste命令下发失败，ste号={},任务数据={},硫化罐数据={},sign={}",
                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
                                }
@@ -6752,7 +6752,8 @@
//                    if (steProtocol.statusType.equals(SteStatusType.WAITING)){
//
//                    }
                    WrkMastExecute wrkMastExecute = wrkMastExecuteService.getWrkMastExecuteByWrkNo(steProtocol.getTaskNo().longValue());
                    List<WrkMastExecute> wrkMastExecuteByWrkNoList = wrkMastExecuteService.getWrkMastExecuteByWrkNoList(steProtocol.getTaskNo().longValue());
                    for (WrkMastExecute wrkMastExecute : wrkMastExecuteByWrkNoList){
                    if (!Cools.isEmpty(wrkMastExecute)){
                        switch (wrkMastExecute.getIoType()){
                            case 6:
@@ -6793,7 +6794,7 @@
                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
                                    return true;
                                }
                                return false;
                                    continue;
                            case 7:
                            case 8:
                            case 10:
@@ -6816,7 +6817,7 @@
                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
                                    return true;
                                }
                                return false;
                                    continue;
                            case 9:
                                if (wrkMastExecute.getWrkSts()==1){
                                    //1：Ste穿梭版取放货中、2：放货完成等待下一步、3：输送线任务下发完成、4：更新完成   //io_type = 9
@@ -6834,11 +6835,13 @@
                                    }
                                    log.error("穿梭车Ste命令下发失败===>下发异常，jar号={},任务数据={},穿梭车数据={},sign={}",
                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
                                    return true;
                                        continue;
                                }
                            default: return false;
                                default: continue;
                        }
                    }

                    }
                }
            }
            return true;

 src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java

@@ -17,6 +17,11 @@
    }

    @Override
    public List<WrkMastExecute> getWrkMastExecuteByWrkNoList(Long wrkNo) {
        return this.baseMapper.getWrkMastExecuteByWrkNoList(wrkNo);
    }

    @Override
    public List<WrkMastExecute> getWrkMastExecuteByJarNo(Integer jarId) {
        return this.baseMapper.getWrkMastExecuteByJarNo(jarId);
    }

 src/main/resources/mapper/WrkMastExecuteMapper.xml

@@ -62,6 +62,12 @@
        and wrk_no = #{wrkNo}
    </select>

    <select id="getWrkMastExecuteByWrkNoList" resultMap="BaseResultMap">
        select * from jar_wrk_mast_execute
        where 1=1
        and wrk_no = #{wrkNo}
    </select>

    <select id="getWrkMastExecuteByJarNo" resultMap="BaseResultMap">
        select * from jar_wrk_mast_execute
        where 1=1