| | |
|---|
| | | //判断夹胶和夹胶后工序 |
|---|
| | | //Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC") |
|---|
| | | if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){ |
|---|
| | | clos.put(uniqueList.get(i).get("process"), 16+i); |
|---|
| | | clos.put(uniqueList.get(i).get("process"), 14+i); |
|---|
| | | } |
|---|
| | | //判断中空和中空后工序 |
|---|
| | | //Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD") |
|---|
| | | if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){ |
|---|
| | | columns.add(16+i); |
|---|
| | | columns.add(14+i); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | return map; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Map<String, Object> yieldSv(Date selectTime1, Date selectTime2, String selectProcesses, Report report) { |
|---|
| | | public Map<String, Object> yieldSv(String selectTime1, String selectTime2, String selectProcesses, Report report) { |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | map.put("data", reportMapper.yieldMp(selectTime1, selectTime2, selectProcesses, report)); |
|---|
| | | map.put("process", productionSchedulingMapper.selectProcess()); |
|---|
