#

TQS

2024-08-19 d2b19008230941c105b57b8f7b49b291560f2cfb

#

 src/main/java/com/zy/asrs/controller/SteController.java

@@ -120,11 +120,13 @@
            if (!Cools.isEmpty(steProtocol.getChargeStatus())) {
                vo.setChargeStatus(steProtocol.getChargeStatus()==1?"✔":"×");
            }
            if(steProtocol.getAlarm() > 0){
            if(Cools.isEmpty(steProtocol.getAlarm())){
                vo.setAlarm1("未知异常");
            } else if(!Cools.isEmpty(steProtocol.getAlarm()) && steProtocol.getAlarm() > 0){
                BasSteErr steErr = basSteErrMapper.selectById(steProtocol.getAlarm());
                vo.setAlarm1(steErr==null?"未知异常":steErr.getErrName());
            }
            vo.setAlarm2(steProtocol.getAlarm0().toString());
            vo.setAlarm2(Cools.isEmpty(steProtocol.getAlarm0())? "未知":steProtocol.getAlarm0().toString());
        }
        return R.ok().add(list);
    }

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

@@ -3578,6 +3578,7 @@
            SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
            SteProtocol steProtocol = steThread.getSteProtocol();
            if (steProtocol == null) { continue; }
            if (Cools.isEmpty(steProtocol.loca)) continue;
            if (steProtocol.loca==0) continue;
            if (steProtocol.getWaiting() && steProtocol.getTaskNo() == 0){
                News.info("ste[id={}] 收到等待WCS确认信号，但是任务号(地址V824)为0", steProtocol.getSteNo());
@@ -4883,6 +4884,7 @@
                            staNos = new int[]{112,113,114};
                            for (int staNo : staNos){
                                StaProtocol staProtocol = devpThread.getStation().get(staNo);
                                if (Cools.isEmpty(staProtocol)) continue;
                                if (!staProtocol.isAutoing() || staProtocol.isLoading() || staProtocol.getWorkNo()>0){
                                    sign = false;
                                }
@@ -4912,6 +4914,7 @@
                            staNos = new int[]{212,213,214};
                            for (int staNo : staNos){
                                StaProtocol staProtocol = devpThread.getStation().get(staNo);
                                if (Cools.isEmpty(staProtocol)) continue;
                                if (!staProtocol.isAutoing() || staProtocol.isLoading()){
                                    sign = false;
                                }