From 70e3c093a7ff7159ad3bb43bd726d99f0d5a4ad5 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Fri, 8 Nov 2024 17:13:29 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E6=AF=8F=E5=91=A8=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=95=B0=E9=87=8F=E8=B6=8B=E5=8A=BF=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=AF=8F=E5=A4=A9=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CockpitServiceImpl.java | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) 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);