对照协议调整

zhangchao

2024-09-01 86cb750364e49debb8586a29f0469ba37ce0f85c

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

@@ -565,7 +565,15 @@
                        wrkMast.setCrnEndTime(new Date());
                        if (wrkMastMapper.updateById(wrkMast) != 0) {
                            // 复位堆垛机
                            crnThread.setResetFlag(true);
                            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());
                        }
@@ -725,7 +733,9 @@
                flag = true;
            }
            if (!flag) {
                News.errorNoLog("" + mark + " - 1" + " - 3" + " - 堆垛机入库站信息(以下需要全true):"
                System.out.println(staProtocol);
                //TODO
                News.error("" + mark + " - 1" + " - 3" + " - 堆垛机入库站信息(以下需要全true):"
                        + "自动信号" + staProtocol.isAutoing() + "有物信号" + staProtocol.isLoading()
                        + "工作号>0" + staProtocol.getWorkNo() + "可入信号" + staProtocol.isInEnable()
                        + "能入信号（wms设置）.equals(\"Y\")" + staDetl.getCanining());
@@ -1260,10 +1270,18 @@
            }
            //  状态：等待确认 并且  任务完成位 = 1
            if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
                News.warnNoLog("" + mark + " - 0" + " - 开始执行对工作档的完成操作");
                News.warn("" + mark + " - 0" + " - 开始执行对工作档的完成操作");
                if (crnProtocol.getTaskNo() == 9999) {
                    // 堆垛机复位
                    crnThread.setResetFlag(true);
                    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());
@@ -1284,7 +1302,15 @@
                    if (wrkMastMapper.updateById(wrkMast) > 0) {
                        // 堆垛机复位
                        News.warnNoLog("" + mark + " - 2" + " - 修改成功后复位堆垛机 : 堆垛机号={}", crnThread.getCrnProtocol().getCrnNo());
                        crnThread.setResetFlag(true);
                        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);
                        }
                    }
                }