Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs

zjj

2024-06-26 e1c01c13fc47a433cd6ec0b46d834f57a7b25c97

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

@@ -253,6 +253,13 @@

            vo.setPlcDesc("顶升电机接触器故障");
            vo.setError("顶升电机接触器故障");
            /*
             * 宜科定制  150站点异常信息：大托盘目的站错误
             * */
            if (entry.getKey()==150){
                vo.setPlcDesc("150站点大托盘目的站错误");
                vo.setError("150站点大托盘目的站错误");
            }
            list.add(vo);
        }
        if (staProtocol.isFrontErr()){