Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

昨天 1ea84a23004ebcfaf86cb436d84164602ca9091d

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java

@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -10,6 +11,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.StockStatistic;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.service.StockStatisticService;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,66 @@
    }

    @PreAuthorize("hasAuthority('manager:stockStatistic:list')")
    @PostMapping("/outStatistic/page")
    public R outStatisticPage(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
        QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
        wrapper.select("id, loc_code, day_time, task_type, task_status, barcode, maktx, matnr_code, batch, SUM(anfme) AS anfme, unit, fields_index,  create_time, update_time");
        wrapper.groupBy("matnr_code, day_time");
        return R.ok().add(stockStatisticService.page(pageParam, wrapper));
    }

    @PreAuthorize("hasAuthority('manager:stockStatistic:list')")
    @PostMapping("/inStatistic/page")
    public R inStatisticPage(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
        QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
        wrapper.select("id, loc_code, day_time, task_type, task_status, barcode, maktx, matnr_code, batch, SUM(anfme) AS anfme, unit, fields_index,  create_time, update_time");
        wrapper.groupBy("matnr_code, day_time");
        return R.ok().add(stockStatisticService.page(pageParam, wrapper));
    }

    @PreAuthorize("hasAuthority('manager:stockStatistic:list')")
    @PostMapping("/inStatisticItem/page")
    public R inStockItemPage(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
        QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
        wrapper.select("id, loc_code, day_time, task_type, task_status, barcode, maktx, matnr_code, batch,  SUM(anfme) anfme, unit, fields_index, create_by, update_by,  create_time, update_time");
        wrapper.groupBy("matnr_code, day_time, task_type, task_status");
        return R.ok().add(stockStatisticService.page(pageParam, wrapper));
    }

    @PreAuthorize("hasAuthority('manager:stockStatistic:list')")
    @PostMapping("/outStatisticItem/page")
    public R outStockItemPage(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
        QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
        wrapper.select("id, loc_code, day_time, task_type, task_status, barcode, maktx, matnr_code, batch,  SUM(anfme) anfme, unit, fields_index, create_by, update_by,  create_time, update_time");
        wrapper.groupBy("matnr_code, day_time, task_type, task_status");
        return R.ok().add(stockStatisticService.page(pageParam, wrapper));
    }

    @PreAuthorize("hasAuthority('manager:stockStatistic:list')")
    @PostMapping("/statistic/num/page")
    public R statisticNumPage(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
        QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
        wrapper.select("id, day_time, COUNT( barcode ) `count`, " +
                "SUM( anfme ) anfme," +
                "COUNT(IF (task_type = 1, 0, NULL)) in_anfme_count, " +
                "COUNT(IF ( task_type = 101, 0, NULL)) out_anfme_count, " +
                "SUM( CASE WHEN task_type = 1 THEN anfme ELSE 0 END ) in_anfme," +
                "SUM( CASE WHEN task_type = 101 THEN anfme ELSE 0 END ) out_anfme");
        wrapper.in("task_type", Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type)).groupBy("day_time");
        return R.ok().add(stockStatisticService.page(pageParam, wrapper));
    }

    @PreAuthorize("hasAuthority('manager:stockStatistic:list')")
    @PostMapping("/stockStatistic/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(stockStatisticService.list());