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

Administrator

2026-04-20 30ba88092221aa34c9a344e5c9c3891a7ed50daa

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

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

@@ -823,6 +823,7 @@
        ArrayList<Integer> data2 = new ArrayList<>();
        ArrayList<Double> data3 = new ArrayList<>();
        ArrayList<Double> data4 = new ArrayList<>();
        ArrayList<Double> data5 = new ArrayList<>();
        List<String> categories = new ArrayList<>();

        final int n = 12;
@@ -841,12 +842,14 @@
            int outV = 0;
            double inC = 0;
            double outC = 0;
            double outD = 0;
            for (WorkChartAxis w : listChart) {
                if (w.getYmd() != null && key.equals(w.getYmd().trim())) {
                    inV = w.getInqty();
                    outV = w.getOutqty();
                    inC = w.getCubeInqty();
                    outC = w.getCubeOutqty();
                    outD = w.getOutTeu();
                    break;
                }
            }
@@ -854,6 +857,7 @@
            data2.add(outV);
            data3.add(inC);
            data4.add(outC);
            data5.add(outD);
            calendar.add(Calendar.HOUR_OF_DAY, 1);
        }

@@ -872,18 +876,28 @@
        if (data3.size() >0) {
            AxisBean cubeInqty = new AxisBean();
            cubeInqty.setName("入库体积");
            Integer[] array3 = new Integer[data3.size()];
            Double [] array3 = new Double[data3.size()];
            cubeInqty.setData(data3.toArray(array3));
            list.add(cubeInqty);
        }

        if (data3.size() >0) {
        if (data4.size() >0) {
            AxisBean cubeOutqty = new AxisBean();
            cubeOutqty.setName("出库体积");
            Integer[] array4 = new Integer[data4.size()];
            Double[] array4 = new Double[data4.size()];
            cubeOutqty.setData(data4.toArray(array4));
            list.add(cubeOutqty);
        }

        if (data5.size() >0) {
            AxisBean cubeOutqty = new AxisBean();
            cubeOutqty.setName("出库TEU");
            Double[] array5 = new Double[data4.size()];
            cubeOutqty.setData(data5.toArray(array5));
            list.add(cubeOutqty);
        }


        map.put("categories", categories);
        map.put("rows", list);
        return R.ok(map);

 src/main/java/com/zy/asrs/entity/WorkChartAxis.java

@@ -14,4 +14,5 @@
    private int outqty;
    private double cubeInqty;
    private double cubeOutqty;
    private double outTeu;
}

 src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java

@@ -72,7 +72,7 @@
    /**
     * 按小时汇总（视图 v_asr_inout_hourly_stat，ymd 与接口 yyyy-MM-dd HH 对齐）
     */
    @Select("SELECT ymd, inqty, outqty,cube_inqty as cubeInqty,cube_outqty as cubeOutqty FROM v_asr_inout_hourly_stat ")
    @Select("SELECT ymd, inqty, outqty,cube_inqty as cubeInqty,cube_outqty as cubeOutqty,out_teu as outTeu FROM v_asr_inout_hourly_stat ")
    List<WorkChartAxis> getChartAxisHourly();

    /**