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

zjj

昨天 11e2b6d43b6c1664f74963649dad9507db34c6ae

 src/main/java/com/zy/asrs/timer/LedWebsocket.java

@@ -112,7 +112,7 @@
        }
        //仓库数据
        EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
        locDetlEntityWrapper.setSqlSelect("matnr,COUNT(*) as matnrCount").groupBy("matnr");
        locDetlEntityWrapper.setSqlSelect("TOP 5 matnr,SUM(anfme) as matnrCount").groupBy("matnr").orderBy("matnrCount",false);
        List<Map<String, Object>>  selectMap = locDetlService.selectMaps(locDetlEntityWrapper);

        Date now = new Date();