#

lty

4 天以前 dea586adf232c722e8d2dfa833c3d7711a1019df

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

@@ -24,7 +24,7 @@
@RequestMapping("/monitor")
public class MonitorController {

    private static final String[] WEEK = {"星期日","星期一","星期二","星期三","星期四","星期五","星期六"};
    private static final String[] WEEK = {"response.sunday","response.monday","response.tuesday","response.wednesday","response.thursday","response.friday","response.saturday"};


    @Autowired
@@ -99,12 +99,12 @@
                }
            }
            AxisBean inqty = new AxisBean();
            inqty.setName("入库数量");
            inqty.setName("response.inbound_qty");
            Integer[] array1 = new Integer[data1.size()];
            inqty.setData(data1.toArray(array1));
            list.add(inqty);
            AxisBean outqty = new AxisBean();
            outqty.setName("出库数量");
            outqty.setName("response.outbound_qty");
            Integer[] array2 = new Integer[data2.size()];
            outqty.setData(data2.toArray(array2));
            list.add(outqty);
@@ -123,22 +123,22 @@
        LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
        if(locUseRate!=null) {
            Map<String, Object> map = new HashMap<>();
            map.put("name", "在库");
            map.put("name", "response.loc_in_store");
            map.put("value", locUseRate.getFqty());
            pie.add(map);

            Map<String, Object> map1 = new HashMap<>();
            map1.put("name", "空");
            map1.put("name", "response.loc_empty");
            map1.put("value", locUseRate.getOqty());
            pie.add(map1);

            Map<String, Object> map2 = new HashMap<>();
            map2.put("name", "使用");
            map2.put("name", "response.loc_used");
            map2.put("value", locUseRate.getUqty());
            pie.add(map2);

            Map<String, Object> map3 = new HashMap<>();
            map3.put("name", "禁用");
            map3.put("name", "response.loc_disabled");
            map3.put("value", locUseRate.getXqty());
            pie.add(map3);
        }
@@ -172,7 +172,7 @@
        List<MatDto> matDtoList = new ArrayList<>();
        MatDto matDto = new MatDto(
                "001",
                "原材料",
                "response.raw_material",
                100.0,
                150.0,
                100.0,
@@ -181,8 +181,8 @@
                "ZGDW890",
                "80000001",
                "DWT01",
                "中国电网",
                "中国电网",
                "response.china_grid",
                "response.china_grid",
                "ZGDW4396",
                "ZGDW-9945"

@@ -190,7 +190,7 @@
        matDtoList.add(matDto);
        if (ledId == 100){
            LedCommand command = new LedCommand(
                    "全板入库",
                    "response.full_pallet_inbound",
                    9527,
                    100,
                    100,
@@ -203,7 +203,9 @@
            );
            commandList.add(command);
        }
        return R.ok().add(commandList);
        R r = R.ok();
        r.put("data", commandList);
        return r;
    }

    /**
@@ -215,7 +217,9 @@
        if (ledId == 100){
//            errorMsg = "麦当劳VS肯德基";
        }
        return R.ok().add(errorMsg);
        R r = R.ok();
        r.put("data",errorMsg);
        return r;
    }

    @GetMapping("/getLedInfos")