#

luxiaotao1123

2022-10-25 b78b9ca2ef71de6b9af4a31b45defb12304289b7

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

@@ -138,6 +138,14 @@
                if (waitingRes.IsSuccess) {
                    steProtocol.setWaiting(waitingRes.Content);
                }
                OperateResultExOne<Boolean> inEmptyRes = siemensS7Net.ReadBool("V2001.2");
                if (inEmptyRes.IsSuccess) {
                    steProtocol.setInEmpty(inEmptyRes.Content);
                }
                OperateResultExOne<Boolean> outEmptyRes = siemensS7Net.ReadBool("V2001.3");
                if (outEmptyRes.IsSuccess) {
                    steProtocol.setOutEmpty(outEmptyRes.Content);
                }
                steProtocol.setAlarm(siemensS7Net.getByteTransform().TransInt16(result.Content, 6));
                steProtocol.setAlarm0(siemensS7Net.getByteTransform().TransInt16(result.Content, 8));
                steProtocol.setCharge(siemensS7Net.getByteTransform().TransSingle(result.Content, 10));
@@ -172,6 +180,8 @@

                // 复位信号
                if (steProtocol.getWaiting()) {
                    log.error("-------------------------------------------第一步、[穿梭车号：{}, 工作号：{}]==>> 状态为3，等待WCS确认！！",
                            slave.getId(),steProtocol.getTaskNo());
                    if (resetFlag) {
                        SteCommand steCommand = new SteCommand();
                        steCommand.setComplete(true);