no message

wms/src/main/java/com/yc/wms/controller/RQTaskModel.java

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

wms/src/main/java/com/yc/wms/controller/RongQiController.java

@@ -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,14 +141,23 @@ 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;
+            //i=1 新逻辑 i=0 原逻辑
+            for (int i = 0; i < 2; i++) {
+                if (i==0){
+                    groupedByGzz = listRqh.stream()
+                            .collect(Collectors.groupingBy(RQTaskModel::getOldGzz));
+                }else {
                     /* 按工作站分组*/
-            Map<String, List<RQTaskModel>> groupedByGzz = listRqh.stream()
+                    groupedByGzz = listRqh.stream()
                             .collect(Collectors.groupingBy(RQTaskModel::getGzz));
+                }
                 for (String gzz : groupedByGzz.keySet()) {
                     List<RQTaskModel> listGzz=groupedByGzz.get(gzz);
                     /* 按AgvId任务分组，获取分组后的集合长度，算出当前料箱到当前工作站的次数*/
@@ -160,7 +170,6 @@ public class RongQiController {
                     for (RQTaskModel rqTaskModel : listGzz){
                         taskCount=taskCount+rqTaskModel.getTs();
                     }
-                int i=1;//1 新逻辑 0 原逻辑
                     RongQiMz rongQiMz=rqMzList.get(i);
                     switch (gzz){
                         case "201":
@@ -257,7 +266,7 @@ public class RongQiController {
                             break;
                     }
                     rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount);
-
+                }
             }
             rqList.add(rongQi);
         }