no message
parent
889db214d8
commit
b841d010d1
|
|
@ -16,6 +16,8 @@ public class RQTaskModel implements Serializable{
|
|||
private String liaohao;
|
||||
// 工作站
|
||||
private String gzz;
|
||||
// 原工作站
|
||||
private String oldGzz;
|
||||
// 容器
|
||||
private String rqh;
|
||||
// 物料
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ public class RongQiController {
|
|||
/* 基础sql数据查询*/
|
||||
String sql=" SELECT "
|
||||
+" MAX(t.id) as id, "
|
||||
+" max(t.OLD_GZZ) old_gzz, "
|
||||
+" count(t.id) as ts, "
|
||||
+" MAX(t.agvTask_ID) as agv_id, "
|
||||
+" item.code AS liaohao, "
|
||||
|
|
@ -140,124 +141,132 @@ public class RongQiController {
|
|||
/* 按容器分组*/
|
||||
Map<String, List<RQTaskModel>> groupedByRqh = listAll.stream()
|
||||
.collect(Collectors.groupingBy(RQTaskModel::getRqh));
|
||||
|
||||
for (String rqh : groupedByRqh.keySet()) {
|
||||
RongQi rongQi=new RongQi();
|
||||
rongQi.setRqh(rqh);
|
||||
List<RQTaskModel> listRqh=groupedByRqh.get(rqh);
|
||||
rongQi.setId(listRqh.get(0).getId());
|
||||
/* 按工作站分组*/
|
||||
Map<String, List<RQTaskModel>> groupedByGzz = listRqh.stream()
|
||||
.collect(Collectors.groupingBy(RQTaskModel::getGzz));
|
||||
for (String gzz : groupedByGzz.keySet()) {
|
||||
List<RQTaskModel> listGzz=groupedByGzz.get(gzz);
|
||||
/* 按AgvId任务分组,获取分组后的集合长度,算出当前料箱到当前工作站的次数*/
|
||||
Map<String, List<RQTaskModel>> groupedByAgvId = listGzz.stream()
|
||||
.collect(Collectors.groupingBy(RQTaskModel::getAgvId));
|
||||
/* 工作站搬运任务数*/
|
||||
int gzzCount=groupedByAgvId.size();
|
||||
/* 工作站拣货任务总行数*/
|
||||
int taskCount=0;
|
||||
for (RQTaskModel rqTaskModel : listGzz){
|
||||
taskCount=taskCount+rqTaskModel.getTs();
|
||||
Map<String, List<RQTaskModel>> groupedByGzz;
|
||||
//i=1 新逻辑 i=0 原逻辑
|
||||
for (int i = 0; i < 2; i++) {
|
||||
if (i==0){
|
||||
groupedByGzz = listRqh.stream()
|
||||
.collect(Collectors.groupingBy(RQTaskModel::getOldGzz));
|
||||
}else {
|
||||
/* 按工作站分组*/
|
||||
groupedByGzz = listRqh.stream()
|
||||
.collect(Collectors.groupingBy(RQTaskModel::getGzz));
|
||||
}
|
||||
int i=1;//1 新逻辑 0 原逻辑
|
||||
RongQiMz rongQiMz=rqMzList.get(i);
|
||||
switch (gzz){
|
||||
case "201":
|
||||
rongQi.setG201(taskCount);
|
||||
rqLtList.get(i).setG201(rqLtList.get(i).getG201()+gzzCount);
|
||||
rongQiMz.getG201().setTaskCount(rongQiMz.getG201().getTaskCount()+taskCount);
|
||||
rongQiMz.getG201().setLxCount(rongQiMz.getG201().getLxCount()+1);
|
||||
break;
|
||||
case "202":
|
||||
rongQi.setG202(taskCount);
|
||||
rqLtList.get(i).setG202(rqLtList.get(i).getG202()+gzzCount);
|
||||
rongQiMz.getG202().setTaskCount(rongQiMz.getG202().getTaskCount()+taskCount);
|
||||
rongQiMz.getG202().setLxCount(rongQiMz.getG202().getLxCount()+1);
|
||||
break;
|
||||
case "203":
|
||||
rongQi.setG203(taskCount);
|
||||
rqLtList.get(i).setG203(rqLtList.get(i).getG203()+gzzCount);
|
||||
rongQiMz.getG203().setTaskCount(rongQiMz.getG203().getTaskCount()+taskCount);
|
||||
rongQiMz.getG203().setLxCount(rongQiMz.getG203().getLxCount()+1);
|
||||
break;
|
||||
case "204":
|
||||
rongQi.setG204(taskCount);
|
||||
rqLtList.get(i).setG204(rqLtList.get(i).getG204()+gzzCount);
|
||||
rongQiMz.getG204().setTaskCount(rongQiMz.getG204().getTaskCount()+taskCount);
|
||||
rongQiMz.getG204().setLxCount(rongQiMz.getG204().getLxCount()+1);
|
||||
break;
|
||||
case "205":
|
||||
rongQi.setG205(taskCount);
|
||||
rqLtList.get(i).setG205(rqLtList.get(i).getG205()+gzzCount);
|
||||
rongQiMz.getG205().setTaskCount(rongQiMz.getG205().getTaskCount()+taskCount);
|
||||
rongQiMz.getG205().setLxCount(rongQiMz.getG205().getLxCount()+1);
|
||||
break;
|
||||
case "206":
|
||||
rongQi.setG206(taskCount);
|
||||
rqLtList.get(i).setG206(rqLtList.get(i).getG206()+gzzCount);
|
||||
rongQiMz.getG206().setTaskCount(rongQiMz.getG206().getTaskCount()+taskCount);
|
||||
rongQiMz.getG206().setLxCount(rongQiMz.getG206().getLxCount()+1);
|
||||
break;
|
||||
case "207":
|
||||
rongQi.setG207(taskCount);
|
||||
rqLtList.get(i).setG207(rqLtList.get(i).getG207()+gzzCount);
|
||||
rongQiMz.getG207().setTaskCount(rongQiMz.getG207().getTaskCount()+taskCount);
|
||||
rongQiMz.getG207().setLxCount(rongQiMz.getG207().getLxCount()+1);
|
||||
break;
|
||||
case "208":
|
||||
rongQi.setG208(taskCount);
|
||||
rqLtList.get(i).setG208(rqLtList.get(i).getG208()+gzzCount);
|
||||
rongQiMz.getG208().setTaskCount(rongQiMz.getG208().getTaskCount()+taskCount);
|
||||
rongQiMz.getG208().setLxCount(rongQiMz.getG208().getLxCount()+1);
|
||||
break;
|
||||
case "209":
|
||||
rongQi.setG209(taskCount);
|
||||
rqLtList.get(i).setG209(rqLtList.get(i).getG209()+gzzCount);
|
||||
rongQiMz.getG209().setTaskCount(rongQiMz.getG209().getTaskCount()+taskCount);
|
||||
rongQiMz.getG209().setLxCount(rongQiMz.getG209().getLxCount()+1);
|
||||
break;
|
||||
case "210":
|
||||
rongQi.setG210(taskCount);
|
||||
rqLtList.get(i).setG210(rqLtList.get(i).getG210()+gzzCount);
|
||||
rongQiMz.getG210().setTaskCount(rongQiMz.getG210().getTaskCount()+taskCount);
|
||||
rongQiMz.getG210().setLxCount(rongQiMz.getG210().getLxCount()+1);
|
||||
break;
|
||||
case "211":
|
||||
rongQi.setG211(taskCount);
|
||||
rqLtList.get(i).setG211(rqLtList.get(i).getG211()+gzzCount);
|
||||
rongQiMz.getG211().setTaskCount(rongQiMz.getG211().getTaskCount()+taskCount);
|
||||
rongQiMz.getG211().setLxCount(rongQiMz.getG211().getLxCount()+1);
|
||||
break;
|
||||
case "212":
|
||||
rongQi.setG212(taskCount);
|
||||
rqLtList.get(i).setG212(rqLtList.get(i).getG212()+gzzCount);
|
||||
rongQiMz.getG212().setTaskCount(rongQiMz.getG212().getTaskCount()+taskCount);
|
||||
rongQiMz.getG212().setLxCount(rongQiMz.getG212().getLxCount()+1);
|
||||
break;
|
||||
case "213":
|
||||
rongQi.setG213(taskCount);
|
||||
rqLtList.get(i).setG213(rqLtList.get(i).getG213()+gzzCount);
|
||||
rongQiMz.getG213().setTaskCount(rongQiMz.getG213().getTaskCount()+taskCount);
|
||||
rongQiMz.getG213().setLxCount(rongQiMz.getG213().getLxCount()+1);
|
||||
break;
|
||||
case "214":
|
||||
rongQi.setG214(taskCount);
|
||||
rqLtList.get(i).setG214(rqLtList.get(i).getG214()+gzzCount);
|
||||
rongQiMz.getG214().setTaskCount(rongQiMz.getG214().getTaskCount()+taskCount);
|
||||
rongQiMz.getG214().setLxCount(rongQiMz.getG214().getLxCount()+1);
|
||||
break;
|
||||
case "215":
|
||||
rongQi.setG215(taskCount);
|
||||
rqLtList.get(i).setG215(rqLtList.get(i).getG215()+gzzCount);
|
||||
rongQiMz.getG215().setTaskCount(rongQiMz.getG215().getTaskCount()+taskCount);
|
||||
rongQiMz.getG215().setLxCount(rongQiMz.getG215().getLxCount()+1);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
for (String gzz : groupedByGzz.keySet()) {
|
||||
List<RQTaskModel> listGzz=groupedByGzz.get(gzz);
|
||||
/* 按AgvId任务分组,获取分组后的集合长度,算出当前料箱到当前工作站的次数*/
|
||||
Map<String, List<RQTaskModel>> groupedByAgvId = listGzz.stream()
|
||||
.collect(Collectors.groupingBy(RQTaskModel::getAgvId));
|
||||
/* 工作站搬运任务数*/
|
||||
int gzzCount=groupedByAgvId.size();
|
||||
/* 工作站拣货任务总行数*/
|
||||
int taskCount=0;
|
||||
for (RQTaskModel rqTaskModel : listGzz){
|
||||
taskCount=taskCount+rqTaskModel.getTs();
|
||||
}
|
||||
RongQiMz rongQiMz=rqMzList.get(i);
|
||||
switch (gzz){
|
||||
case "201":
|
||||
rongQi.setG201(taskCount);
|
||||
rqLtList.get(i).setG201(rqLtList.get(i).getG201()+gzzCount);
|
||||
rongQiMz.getG201().setTaskCount(rongQiMz.getG201().getTaskCount()+taskCount);
|
||||
rongQiMz.getG201().setLxCount(rongQiMz.getG201().getLxCount()+1);
|
||||
break;
|
||||
case "202":
|
||||
rongQi.setG202(taskCount);
|
||||
rqLtList.get(i).setG202(rqLtList.get(i).getG202()+gzzCount);
|
||||
rongQiMz.getG202().setTaskCount(rongQiMz.getG202().getTaskCount()+taskCount);
|
||||
rongQiMz.getG202().setLxCount(rongQiMz.getG202().getLxCount()+1);
|
||||
break;
|
||||
case "203":
|
||||
rongQi.setG203(taskCount);
|
||||
rqLtList.get(i).setG203(rqLtList.get(i).getG203()+gzzCount);
|
||||
rongQiMz.getG203().setTaskCount(rongQiMz.getG203().getTaskCount()+taskCount);
|
||||
rongQiMz.getG203().setLxCount(rongQiMz.getG203().getLxCount()+1);
|
||||
break;
|
||||
case "204":
|
||||
rongQi.setG204(taskCount);
|
||||
rqLtList.get(i).setG204(rqLtList.get(i).getG204()+gzzCount);
|
||||
rongQiMz.getG204().setTaskCount(rongQiMz.getG204().getTaskCount()+taskCount);
|
||||
rongQiMz.getG204().setLxCount(rongQiMz.getG204().getLxCount()+1);
|
||||
break;
|
||||
case "205":
|
||||
rongQi.setG205(taskCount);
|
||||
rqLtList.get(i).setG205(rqLtList.get(i).getG205()+gzzCount);
|
||||
rongQiMz.getG205().setTaskCount(rongQiMz.getG205().getTaskCount()+taskCount);
|
||||
rongQiMz.getG205().setLxCount(rongQiMz.getG205().getLxCount()+1);
|
||||
break;
|
||||
case "206":
|
||||
rongQi.setG206(taskCount);
|
||||
rqLtList.get(i).setG206(rqLtList.get(i).getG206()+gzzCount);
|
||||
rongQiMz.getG206().setTaskCount(rongQiMz.getG206().getTaskCount()+taskCount);
|
||||
rongQiMz.getG206().setLxCount(rongQiMz.getG206().getLxCount()+1);
|
||||
break;
|
||||
case "207":
|
||||
rongQi.setG207(taskCount);
|
||||
rqLtList.get(i).setG207(rqLtList.get(i).getG207()+gzzCount);
|
||||
rongQiMz.getG207().setTaskCount(rongQiMz.getG207().getTaskCount()+taskCount);
|
||||
rongQiMz.getG207().setLxCount(rongQiMz.getG207().getLxCount()+1);
|
||||
break;
|
||||
case "208":
|
||||
rongQi.setG208(taskCount);
|
||||
rqLtList.get(i).setG208(rqLtList.get(i).getG208()+gzzCount);
|
||||
rongQiMz.getG208().setTaskCount(rongQiMz.getG208().getTaskCount()+taskCount);
|
||||
rongQiMz.getG208().setLxCount(rongQiMz.getG208().getLxCount()+1);
|
||||
break;
|
||||
case "209":
|
||||
rongQi.setG209(taskCount);
|
||||
rqLtList.get(i).setG209(rqLtList.get(i).getG209()+gzzCount);
|
||||
rongQiMz.getG209().setTaskCount(rongQiMz.getG209().getTaskCount()+taskCount);
|
||||
rongQiMz.getG209().setLxCount(rongQiMz.getG209().getLxCount()+1);
|
||||
break;
|
||||
case "210":
|
||||
rongQi.setG210(taskCount);
|
||||
rqLtList.get(i).setG210(rqLtList.get(i).getG210()+gzzCount);
|
||||
rongQiMz.getG210().setTaskCount(rongQiMz.getG210().getTaskCount()+taskCount);
|
||||
rongQiMz.getG210().setLxCount(rongQiMz.getG210().getLxCount()+1);
|
||||
break;
|
||||
case "211":
|
||||
rongQi.setG211(taskCount);
|
||||
rqLtList.get(i).setG211(rqLtList.get(i).getG211()+gzzCount);
|
||||
rongQiMz.getG211().setTaskCount(rongQiMz.getG211().getTaskCount()+taskCount);
|
||||
rongQiMz.getG211().setLxCount(rongQiMz.getG211().getLxCount()+1);
|
||||
break;
|
||||
case "212":
|
||||
rongQi.setG212(taskCount);
|
||||
rqLtList.get(i).setG212(rqLtList.get(i).getG212()+gzzCount);
|
||||
rongQiMz.getG212().setTaskCount(rongQiMz.getG212().getTaskCount()+taskCount);
|
||||
rongQiMz.getG212().setLxCount(rongQiMz.getG212().getLxCount()+1);
|
||||
break;
|
||||
case "213":
|
||||
rongQi.setG213(taskCount);
|
||||
rqLtList.get(i).setG213(rqLtList.get(i).getG213()+gzzCount);
|
||||
rongQiMz.getG213().setTaskCount(rongQiMz.getG213().getTaskCount()+taskCount);
|
||||
rongQiMz.getG213().setLxCount(rongQiMz.getG213().getLxCount()+1);
|
||||
break;
|
||||
case "214":
|
||||
rongQi.setG214(taskCount);
|
||||
rqLtList.get(i).setG214(rqLtList.get(i).getG214()+gzzCount);
|
||||
rongQiMz.getG214().setTaskCount(rongQiMz.getG214().getTaskCount()+taskCount);
|
||||
rongQiMz.getG214().setLxCount(rongQiMz.getG214().getLxCount()+1);
|
||||
break;
|
||||
case "215":
|
||||
rongQi.setG215(taskCount);
|
||||
rqLtList.get(i).setG215(rqLtList.get(i).getG215()+gzzCount);
|
||||
rongQiMz.getG215().setTaskCount(rongQiMz.getG215().getTaskCount()+taskCount);
|
||||
rongQiMz.getG215().setLxCount(rongQiMz.getG215().getLxCount()+1);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount);
|
||||
}
|
||||
rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount);
|
||||
|
||||
}
|
||||
rqList.add(rongQi);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue