#1
czkh
21 小时以前 fcc38f90f19b5dd09bac80cfa3069817c6243acb
#1
1个文件已修改
4 ■■■■ 已修改文件
src/main/java/com/zy/core/thread/SiemensCrnThread.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -252,7 +252,7 @@
                }
                // 复位信号
                else if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING) && crnProtocol.getTaskNoTwo() != null && crnProtocol.getTaskNoTwo() != 0) {
                else if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING) && crnProtocol.getTaskNoTwo() != null && crnProtocol.getTaskNoTwo() != 0) {
//                    if (crnProtocol.getTaskNoTwo() == 0){
//                        News.error("堆垛机工位2工作号为0,不予确认,工位2{}",crnProtocol.getLoadedTwo() == 1 ? "有物" : "无物");
//                        return;
@@ -263,7 +263,7 @@
                        if (crnProtocol.getTaskNo() == 9999) {
                            backHpFlag = false;
                        }
                        Short wrkNo = crnProtocol.getTaskNo();
                        Short wrkNo = crnProtocol.getTaskNoTwo();
                        CrnCommand crnCommand = new CrnCommand();
                        crnCommand.setAckFinish((short) 1);
                        if (write2(crnCommand)) {