#

luxiaotao1123

2020-09-02 34d8b4cc01d6956eb6e356d1f421743dc1a6d1e4

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

@@ -49,7 +49,7 @@
                vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 有物
                vo.setInEnable(staProtocol.isInEnable()?"Y":"N");   // 可入
                vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 可出
                vo.setInreq1(staProtocol.isInreq1()?"Y":"N");       // 需求1
                vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 入库标记
                vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
                vo.setStaNo(staProtocol.getStaNo());                // 目标站

@@ -68,12 +68,15 @@
            Map<Integer, StaProtocol> station = devpThread.getStation();

            for(Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
                PlcErrorTableVo vo = new PlcErrorTableVo();
                vo.setNo(entry.getKey());   //  序号

                vo.setPlcDesc("");  //  todo:luxiaotao plc错误描述
                vo.setError("");    //  todo:luxiaotao 异常信息
                list.add(vo);
                StaProtocol staProtocol = entry.getValue();
//                if (staProtocol) {
//                    PlcErrorTableVo vo = new PlcErrorTableVo();
//                    vo.setNo(entry.getKey());   //  序号
//
//                    vo.setPlcDesc("");  //  todo:luxiaotao plc错误描述
//                    vo.setError("");    //  todo:luxiaotao 异常信息
//                    list.add(vo);
//                }
            }

        }
@@ -123,7 +126,7 @@
                    vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 有物
                    vo.setInEnable(staProtocol.isInEnable()?"Y":"N");   // 可入
                    vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 可出
                    vo.setInreq1(staProtocol.isInreq1()?"Y":"N");       // 需求1
                    vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 需求1
                    vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
                    vo.setStaNo(staProtocol.getStaNo());                // 目标站
                    return R.ok().add(vo);