huojin
/
ZW_MultiSelect
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
暴炳林 2025-01-13 11:43:17 +08:00
parent 889db214d8
commit b841d010d1
2 changed files with 122 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wms/src/main/java/com/yc/wms/controller/RQTaskModel.java
View File

@ -16,6 +16,8 @@ public class RQTaskModel implements Serializable{
private String liaohao; private String liaohao;
// 工作站 // 工作站
private String gzz; private String gzz;
// 原工作站
private String oldGzz;
// 容器 // 容器
private String rqh; private String rqh;
// 物料 // 物料

231
wms/src/main/java/com/yc/wms/controller/RongQiController.java
View File

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