From d3f3d4b309cfb285fcbbc48b91c4046111c7e9cd Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 02 七月 2025 13:45:54 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/SiemensCrnThread.java | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java index 4c0cd05..31de838 100644 --- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java +++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java @@ -5,32 +5,30 @@ import HslCommunication.Profinet.Siemens.SiemensPLCS; import HslCommunication.Profinet.Siemens.SiemensS7Net; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.SpringUtils; import com.zy.asrs.entity.*; -import com.zy.asrs.entity.param.TaskOverToWms; import com.zy.asrs.service.*; -import com.zy.common.utils.HttpHandler; -import com.zy.common.utils.News; import com.zy.core.CrnThread; import com.zy.core.cache.MessageQueue; import com.zy.core.cache.OutputQueue; -import com.zy.core.enums.*; +import com.zy.core.enums.CommandStatusType; +import com.zy.core.enums.CrnTaskModeType; +import com.zy.core.enums.SlaveType; import com.zy.core.model.CrnSlave; import com.zy.core.model.Task; -import com.zy.core.model.command.CommandPackage; import com.zy.core.model.command.CrnCommand; import com.zy.core.model.protocol.CrnProtocol; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import java.text.MessageFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * 鍫嗗灈鏈虹嚎绋� @@ -198,9 +196,11 @@ // 澶嶄綅淇″彿 if (crnProtocol.getTaskFinish() == 0) { if (resetFlag) { + log.info("{}鍙峰爢鍨涙満涓嬪彂澶嶄綅淇″彿",slave.getId()); CrnCommand crnCommand = new CrnCommand(); crnCommand.setAckFinish((short)1); if (write(crnCommand)) { + log.info("{}鍫嗗灈鏈哄浣嶄俊鍙蜂笅鍙戞垚鍔�",slave.getId()); resetFlag = false; } @@ -256,6 +256,7 @@ // crnCommand.setDestinationStaNo(command.getDestinationStaNo()); crnCommand.setCommand(command.getCommand()); if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) { + log.error("write鍐欏叆浜�9999浠诲姟鍙凤細{}",command); command.setTaskNo((short) 9999); } @@ -411,6 +412,7 @@ // crnCommand.setDestinationStaNo(command.getDestinationStaNo()); crnCommand.setCommand(command.getCommand()); if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) { + log.error("write2鍐欏叆浜�9999浠诲姟鍙凤細{}",command); command.setTaskNo((short) 9999); } -- Gitblit v1.9.1