对照协议调整

zhangchao

2024-08-31 17307572321cae05581f1cdaba4702a188ea7f4e

对照协议调整

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

@@ -565,7 +565,15 @@
                        wrkMast.setCrnEndTime(new Date());
                        if (wrkMastMapper.updateById(wrkMast) != 0) {
                            // 复位堆垛机
                            Short mode = crnProtocol.getMode();
                            if (mode == 1) {
                            crnThread.setResetFlag(true);
                            } else if (mode == 2) {
                                crnThread.setResetFlagTwo(true);
                            } else if (mode == 3) {
                                crnThread.setResetFlag(true);
                                crnThread.setResetFlagTwo(true);
                            }
                        } else {
                            News.error("" + mark + " - 1" + " - 更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast.getWrkNo());
                        }
@@ -1262,10 +1270,18 @@
            }
            //  状态：等待确认 并且  任务完成位 = 1
            if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
                News.warnNoLog("" + mark + " - 0" + " - 开始执行对工作档的完成操作");
                News.warn("" + mark + " - 0" + " - 开始执行对工作档的完成操作");
                if (crnProtocol.getTaskNo() == 9999) {
                    // 堆垛机复位
                    Short mode = crnProtocol.getMode();
                    if (mode == 1) {
                    crnThread.setResetFlag(true);
                    } else if (mode == 2) {
                        crnThread.setResetFlagTwo(true);
                    } else if (mode == 3) {
                        crnThread.setResetFlag(true);
                        crnThread.setResetFlagTwo(true);
                    }
                } else {
                    // 获取入库待确认工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
@@ -1286,7 +1302,15 @@
                    if (wrkMastMapper.updateById(wrkMast) > 0) {
                        // 堆垛机复位
                        News.warnNoLog("" + mark + " - 2" + " - 修改成功后复位堆垛机 : 堆垛机号={}", crnThread.getCrnProtocol().getCrnNo());
                        Short mode = crnProtocol.getMode();
                        if (mode == 1) {
                        crnThread.setResetFlag(true);
                        } else if (mode == 2) {
                            crnThread.setResetFlagTwo(true);
                        } else if (mode == 3) {
                            crnThread.setResetFlag(true);
                            crnThread.setResetFlagTwo(true);
                        }
                    }
                }


 src/main/java/com/zy/core/CrnThread.java

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

    void setResetFlag(boolean flag);

    void setResetFlagTwo(boolean flag);

    void setBackHpFlag(boolean flag);

    /**

 src/main/java/com/zy/core/enums/CrnStatusType.java

@@ -13,7 +13,7 @@
    ORIGIN_GO(7, "回原点"),
    ORIGIN_BACK(8, "回反原点"),
    MOVING(9, "走行中"),
    WAITING(90, "任务完成等待WCS确认"),
    WAITING(10, "任务完成等待WCS确认"),
    PAUSE(11, "任务暂停"),
    SOS(99, "报警"),
    UNKNOW(100, "其他"),

 src/main/java/com/zy/core/thread/MelsecCrnThread.java

@@ -35,7 +35,8 @@
 */
@Data
@Slf4j
public class MelsecCrnThread implements Runnable, ThreadHandler, CrnThread {
public class MelsecCrnThread implements Runnable, ThreadHandler, CrnThread
{

    private MelsecMcNet melsecMcNet;
    private CrnSlave slave;
@@ -473,4 +474,8 @@

    }

    @Override
    public void setResetFlagTwo(boolean flag) {

    }
}

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -39,6 +39,7 @@
    private CrnSlave slave;
    private CrnProtocol crnProtocol;
    private boolean resetFlag = false;
    private boolean resetFlagTwo = false;

    /**
     * 堆垛机是否在回原点运动中标记
@@ -186,11 +187,9 @@


                OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));

                if (crnProtocol.getMode() == 1) {
                    // 复位信号
                    if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
                        System.out.println(crnProtocol);
                        if (resetFlag) {
                            if (crnProtocol.getTaskNo() == 9999) {
                                backHpFlag = false;
@@ -205,8 +204,7 @@
                } else if (crnProtocol.getMode() == 2) {
                    // 复位信号
                    if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING)) {

                        if (resetFlag) {
                        if (resetFlagTwo) {
                            if (crnProtocol.getTaskNo() == 9999) {
                                backHpFlag = false;
                            }
@@ -220,8 +218,7 @@
                } else if (crnProtocol.getMode() == 3) {
                    // 复位信号
                    if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING) && !Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING)) {
                        System.out.println(crnProtocol);
                        if (resetFlag) {
                        if (resetFlag && resetFlagTwo) {
                            if (crnProtocol.getTaskNo() == 9999) {
                                backHpFlag = false;
                            }