#

Junjie

2024-08-31 9f6b8deae24d6aa5bc9a872a1d4e08e76a93e4a9

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

@@ -40,14 +40,16 @@
import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import net.bytebuddy.asm.Advice;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

/**
@@ -160,7 +162,9 @@
                // 退回
                if (back) {
//                        News.warn("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg);
                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
                    if(!staProtocol.isOutEnable()){
                        continue;
                    }

                    if (!staProtocol.isLoading()){
                        continue;
@@ -1895,6 +1899,8 @@
                if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
                    News.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
                    continue;
                } else {
                    News.info("{}号LED命令下发成功！！！[ip：{}] [port：{}] [port：{}]", led.getId(), led.getIp(), led.getPort(),commands);
                }
            }

@@ -1951,6 +1957,7 @@
            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
            // led显示默认内容
            if (reset) {
                //News.info("{}号LED命令重置！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
                if (ledThread == null) {
                    continue;
                }