#

lsh

3 天以前 0d8fcb1505ba869290cce9099b42370e4333b708

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

@@ -77,7 +77,7 @@

                    if (!Cools.isEmpty(barcode)) {
//                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                        if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
                        if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode) || "000000".equals(barcode)) {
                            barcode = "";
                        }
                    } else {
@@ -359,9 +359,10 @@
    @GetMapping("/led/useInfo")
    public R monitorLedUseInfo(@RequestParam("ledId") Integer ledId) {
        Integer count1 = wrkDetlService.count1();
        Integer count11 = wrkDetlService.count11();
        Integer count3 = wrkDetlService.count3();
        Map<String, Object> map = new HashMap<>();
        map.put("count1", count1);
        map.put("count1", count1+count11);
        map.put("count2", count3);
        return R.ok().add(map);
    }