在制品报表不需要根据时间查询

chenlu

2024-07-17 6b7fc22801c39a9f9bafd87b122a66861e798f2a

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java

@@ -125,7 +125,7 @@
        return map;
    }

    public Map<String, Object> workInProgressSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, String optionVal, Report report) {
    public Map<String, Object> workInProgressSv( String orderId, String inputProject, String selectProcesses, String optionVal, Report report) {

        if ("null".equals(orderId)) {
            orderId = "";
@@ -140,16 +140,16 @@
        Map<String, Object> map = new HashMap<>();
        if (optionVal.equals("1")){
            /* 根据销售单号汇总*/
            map.put("data", reportMapper.workInProgressOrderMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
            map.put("data", reportMapper.workInProgressOrderMp( orderId, inputProject, selectProcesses, report));

        }else if(optionVal.equals("2")){
            /* 根流程卡号汇总*/
            map.put("data", reportMapper.workInProgressProcessMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
            map.put("data", reportMapper.workInProgressProcessMp( orderId, inputProject, selectProcesses, report));
        } else if (optionVal.equals("3")) {

        } else {

            map.put("data", reportMapper.workInProgressMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
            map.put("data", reportMapper.workInProgressMp( orderId, inputProject, selectProcesses, report));
        }
        map.put("process", productionSchedulingMapper.selectProcess());
        return map;