diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java index 3f5b10ae..ddd51c1c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java @@ -260,25 +260,23 @@ public class CockpitServiceImpl implements CockpitService { List> tp_in_default = new ArrayList<>(); List> tp_out_default = new ArrayList<>(); List result = cockpitMapper.getTaskCountsByDays(); - if (ObjectUtil.isNotEmpty(result)) { - //料箱库入库 - List stockList1 = result.stream() - .filter(r -> Integer.parseInt(r.getTask_type()) <= 14 && "FStockId".equals(r.getStor_code())) - .collect(Collectors.toList()); - //料箱库出库 - List stockList2 = result.stream() - .filter(r -> Integer.parseInt(r.getTask_type()) >= 20 && Integer.parseInt(r.getTask_type()) <= 25 && "FStockId".equals(r.getStor_code())) - .collect(Collectors.toList()); - //托盘库入库 - List stockList3 = result.stream().filter(r -> "30".equals(r.getTask_type()) && "FStockPallet".equals(r.getStor_code())).collect(Collectors.toList()); - //托盘库出库 - List stockList4 = result.stream().filter(r -> "40".equals(r.getTask_type()) && "FStockPallet".equals(r.getStor_code())).collect(Collectors.toList()); - //计算每天的数量 - getWeekWorkStatistics(stockList1, lx_in_default, 7); - getWeekWorkStatistics(stockList2, lx_out_default, 7); - getWeekWorkStatistics(stockList3, tp_in_default, 7); - getWeekWorkStatistics(stockList4, tp_out_default, 7); - } + //料箱库入库 + List stockList1 = result.stream() + .filter(r -> Integer.parseInt(r.getTask_type()) <= 14 && "FStockId".equals(r.getStor_code())) + .collect(Collectors.toList()); + //料箱库出库 + List stockList2 = result.stream() + .filter(r -> Integer.parseInt(r.getTask_type()) >= 20 && Integer.parseInt(r.getTask_type()) <= 25 && "FStockId".equals(r.getStor_code())) + .collect(Collectors.toList()); + //托盘库入库 + List stockList3 = result.stream().filter(r -> "30".equals(r.getTask_type()) && "FStockPallet".equals(r.getStor_code())).collect(Collectors.toList()); + //托盘库出库 + List stockList4 = result.stream().filter(r -> "40".equals(r.getTask_type()) && "FStockPallet".equals(r.getStor_code())).collect(Collectors.toList()); + //计算每天的数量 + getWeekWorkStatistics(stockList1, lx_in_default, 7); + getWeekWorkStatistics(stockList2, lx_out_default, 7); + getWeekWorkStatistics(stockList3, tp_in_default, 7); + getWeekWorkStatistics(stockList4, tp_out_default, 7); jsonObject.put("lx_in_week", lx_in_default); jsonObject.put("lx_out_week", lx_out_default); jsonObject.put("tp_in_week", tp_in_default);