| | |
|---|
| | | return map; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Map<String, Object> workInProgressSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report) { |
|---|
| | | public Map<String, Object> workInProgressSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, String optionVal, Report report) { |
|---|
| | | |
|---|
| | | if ("null".equals(orderId)) { |
|---|
| | | orderId = ""; |
|---|
| | |
|---|
| | | if ("null".equals(inputProject)) { |
|---|
| | | inputProject = ""; |
|---|
| | | } |
|---|
| | | if ("null".equals(optionVal)) { |
|---|
| | | optionVal = (""); |
|---|
| | | } |
|---|
| | | |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | map.put("data", reportMapper.workInProgressMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report)); |
|---|
| | | if (optionVal.equals("1")){ |
|---|
| | | /* 根据销售单号汇总*/ |
|---|
| | | map.put("data", reportMapper.workInProgressOrderMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report)); |
|---|
| | | |
|---|
| | | }else if(optionVal.equals("2")){ |
|---|
| | | /* 根流程卡号汇总*/ |
|---|
| | | map.put("data", reportMapper.workInProgressProcessMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report)); |
|---|
| | | } else if (optionVal.equals("3")) { |
|---|
| | | |
|---|
| | | } else { |
|---|
| | | |
|---|
| | | map.put("data", reportMapper.workInProgressMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report)); |
|---|
| | | } |
|---|
| | | map.put("process", productionSchedulingMapper.selectProcess()); |
|---|
| | | return map; |
|---|
| | | } |
|---|
