From 0b75c0d2ab4e32f89c45d0ea06857c347cf83620 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 1 Apr 2024 21:13:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=AD=BE=E6=94=B6BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistrilbutionBillLadingServiceImpl.java | 224 +++++++++--------- 1 file changed, 118 insertions(+), 106 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 95f26f4d0..4910e59a9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -1350,6 +1350,18 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl num = baseMapper.getCompleteNum(billLadingId); + if (Func.isNotEmpty(num)){ + int size = num.stream().filter(f -> f.equals(true)).collect(Collectors.toList()).size(); + mainVO.setCompleteNum(size); + } DistrilbutionBillLadingAppVO main = baseMapper.selectDataByBillLadingId(billLadingId); if (Objects.isNull(main)) { return null; @@ -1358,122 +1370,122 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl listZero = distributionZeroPackageService.list(Wrappers.query().lambda() - .eq(DistributionReservationZeroPackageEntity::getReservationId, main.getBillLadingId()) - .eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0) - .in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "3") - ); - if (!listZero.isEmpty()) { - int sum = listZero.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum(); - planNum += sum; - } +// //查询零担数据 +// List listZero = distributionZeroPackageService.list(Wrappers.query().lambda() +// .eq(DistributionReservationZeroPackageEntity::getReservationId, main.getBillLadingId()) +// .eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0) +// .in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "3") +// ); +// if (!listZero.isEmpty()) { +// int sum = listZero.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum(); +// planNum += sum; +// } String[] split = stockArticleId.split(","); List l = new ArrayList<>(); - for (String s : split) { - if (StringUtil.isBlank(s)) { - continue; - } - DistrilbutionAppBillLadingOrderVO vo = new DistrilbutionAppBillLadingOrderVO(); - vo.setStockArticleId(Long.parseLong(s)); - - - orderNum++; - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("stock_article_id", Long.parseLong(s)) - .eq("is_deleted", 0) - .isNotNull("order_package_code"); - if (!StringUtil.isBlank(orderSelfNumbering)) { - queryWrapper.ne("order_self_numbering", orderSelfNumbering); - } - List list = distributionParcelListService.list(queryWrapper); - int pn = 0; - if (!list.isEmpty() && ObjectUtils.isNotNull(list.get(0))) { - vo.setOrderSelfNumbering(list.get(0).getOrderCode()); - pn = list.size(); - vo.setPlanNum(pn); - planNum = planNum + pn; - } - //通过订单id查询扫描表中有多少数据 - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("stock_article_id", Long.parseLong(s)) - .eq("is_deleted", 0); - qw.eq("bill_lading_id", main.getBillLadingId()); - List ls = distributionBillLadingScanService.list(qw); - int sn = ls.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum(); - vo.setSignedNum(sn); - signedNum = signedNum + sn; - - if (pn == sn) { - conpleteNum++; - } - if (pn == sn) { - vo.setOrderStatusStr("齐套"); - } else if (sn < pn && sn > 0) { - vo.setOrderStatusStr("部分扫"); - } else if (sn == 0) { - vo.setOrderStatusStr("未扫"); - } - //不添加订单数 - if (list.isEmpty() || !list.isEmpty() && ObjectUtils.isNull(list.get(0))) { - continue; - } - //0 全部 1 齐套 2部分扫 3未扫 - if (orderStatus == 0) { - l.add(vo); - } else if (orderStatus == 1) { - if (pn == sn) { - l.add(vo); - } - } else if (orderStatus == 2) { - if (sn < pn && sn > 0) { - l.add(vo); - } - } else if (orderStatus == 3) { - if (sn == 0) { - l.add(vo); - } - } - } +// for (String s : split) { +// if (StringUtil.isBlank(s)) { +// continue; +// } +// DistrilbutionAppBillLadingOrderVO vo = new DistrilbutionAppBillLadingOrderVO(); +// vo.setStockArticleId(Long.parseLong(s)); +// +// +// orderNum++; +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.eq("stock_article_id", Long.parseLong(s)) +// .eq("is_deleted", 0) +// .isNotNull("order_package_code"); +// if (!StringUtil.isBlank(orderSelfNumbering)) { +// queryWrapper.ne("order_self_numbering", orderSelfNumbering); +// } +// List list = distributionParcelListService.list(queryWrapper); +// int pn = 0; +// if (!list.isEmpty() && ObjectUtils.isNotNull(list.get(0))) { +// vo.setOrderSelfNumbering(list.get(0).getOrderCode()); +// pn = list.size(); +// vo.setPlanNum(pn); +// planNum = planNum + pn; +// } +// //通过订单id查询扫描表中有多少数据 +// QueryWrapper qw = new QueryWrapper<>(); +// qw.eq("stock_article_id", Long.parseLong(s)) +// .eq("is_deleted", 0); +// qw.eq("bill_lading_id", main.getBillLadingId()); +// List ls = distributionBillLadingScanService.list(qw); +// int sn = ls.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum(); +// vo.setSignedNum(sn); +// signedNum = signedNum + sn; +// +// if (pn == sn) { +// conpleteNum++; +// } +// if (pn == sn) { +// vo.setOrderStatusStr("齐套"); +// } else if (sn < pn && sn > 0) { +// vo.setOrderStatusStr("部分扫"); +// } else if (sn == 0) { +// vo.setOrderStatusStr("未扫"); +// } +// //不添加订单数 +// if (list.isEmpty() || !list.isEmpty() && ObjectUtils.isNull(list.get(0))) { +// continue; +// } +// //0 全部 1 齐套 2部分扫 3未扫 +// if (orderStatus == 0) { +// l.add(vo); +// } else if (orderStatus == 1) { +// if (pn == sn) { +// l.add(vo); +// } +// } else if (orderStatus == 2) { +// if (sn < pn && sn > 0) { +// l.add(vo); +// } +// } else if (orderStatus == 3) { +// if (sn == 0) { +// l.add(vo); +// } +// } +// } //查询库存品 - List list = distributionDeliveryDetailsService.list(Wrappers.query().lambda() - .eq(DistributionDeliveryDetailsEntity::getBillLadingId, billLadingId) - ); +// List list = distributionDeliveryDetailsService.list(Wrappers.query().lambda() +// .eq(DistributionDeliveryDetailsEntity::getBillLadingId, billLadingId) +// ); //查询是否签收完成 - List list1 = distributionDeliveryDetailsService.list(Wrappers.query().lambda() - .eq(DistributionDeliveryDetailsEntity::getBillLadingId, billLadingId) - ); - if (!list1.isEmpty()) { - long count = list1.stream().filter(i -> i.getConditions().equals("2")).count(); - signedNum += (int) count; - } +// List list1 = distributionDeliveryDetailsService.list(Wrappers.query().lambda() +// .eq(DistributionDeliveryDetailsEntity::getBillLadingId, billLadingId) +// ); +// if (!list1.isEmpty()) { +// long count = list1.stream().filter(i -> i.getConditions().equals("2")).count(); +// signedNum += (int) count; +// } //查询签收件数 - List list2 = distributionBillLadingScanService.list(Wrappers.query().lambda() - .eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId) - .eq(DistributionBillLadingScanEntity::getMaterialType, "1") - ); - if (!list2.isEmpty()) { - signedNum += list2.size(); - } +// List list2 = distributionBillLadingScanService.list(Wrappers.query().lambda() +// .eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId) +// .eq(DistributionBillLadingScanEntity::getMaterialType, "1") +// ); +// if (!list2.isEmpty()) { +// signedNum += list2.size(); +// } // planNum += list.stream().mapToInt(DistributionDeliveryDetailsEntity::getQuantity).sum(); - DistrilbutionAppBillLadingOrderMainVO mainVO = new DistrilbutionAppBillLadingOrderMainVO(); - mainVO.setOrderNum(orderNum); - if (!list.isEmpty()) { - mainVO.setInventoryNub(list.stream().mapToInt(DistributionDeliveryDetailsEntity::getQuantity).sum()); - } else { - mainVO.setInventoryNub(0); - } - mainVO.setPlanNum(planNum);//自提件数 - mainVO.setSignedNum(signedNum);//签收总数 - mainVO.setCompleteNum(conpleteNum);//订单总数 +// DistrilbutionAppBillLadingOrderMainVO mainVO = new DistrilbutionAppBillLadingOrderMainVO(); +// mainVO.setOrderNum(orderNum); +// if (!list.isEmpty()) { +// mainVO.setInventoryNub(list.stream().mapToInt(DistributionDeliveryDetailsEntity::getQuantity).sum()); +// } else { +// mainVO.setInventoryNub(0); +// } +// mainVO.setPlanNum(planNum);//自提件数 +// mainVO.setSignedNum(signedNum);//签收总数 +// mainVO.setCompleteNum(conpleteNum);//订单总数 // mainVO.setAssembleNum(list.stream().mapToInt( DistributionDeliveryDetailsEntity::getQuantity ).sum()); mainVO.setList(l); return mainVO;