Merge remote-tracking branch 'origin/jx-gt-crn-wcs' into jx-gt-crn-wcs

zjj

3 天以前 da4f2304da2646aa0336b492514655e7cc8a494a

Merge remote-tracking branch 'origin/jx-gt-crn-wcs' into jx-gt-crn-wcs

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

@@ -185,8 +185,8 @@

                // 复位信号
                if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
//                    News.error("---第一步、[堆垛机号：{}, 工作号：{}, 载货台信号:{}]==>> 状态为10，等待确认！！",
//                            slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "有物" : "无物");
                    News.error("---第一步、[堆垛机号：{}, 工作号：{}, 载货台信号:{},状态:{}]==>> 状态为10，等待确认！！",
                            slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "有物" : "无物",crnProtocol.getStatusType());
                    if (resetFlag) {
                        if(crnProtocol.getTaskNo()==9999){
                            backHpFlag = false;
@@ -354,6 +354,7 @@
                    if(result.IsSuccess){
                        //堆垛机任务写入后，回读一次，看是否成功
                        Thread.sleep(200);
                        log.info("堆垛机任务完成复位，此时堆垛机状态:"+crnProtocol.getStatusType()+",堆垛机id:"+crnProtocol.getCrnNo());
                        OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.18", (short) 2);
                        if (resultRead.IsSuccess) {
                            commandFinish=siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);