From bf01fc5b2309ab952f13602bb0a9fce75234bdc6 Mon Sep 17 00:00:00 2001 From: JaxCen <1694546944@qq.com> Date: Thu, 24 Oct 2024 02:46:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90admin=E3=80=91=E4=BC=98=E5=8C=96#=201.?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E8=B4=A7=E5=8D=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RepairOrderShippingServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java index fb37a8d..89278c2 100644 --- a/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java @@ -490,9 +490,7 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi .eq(ParentRepairOrder::getId, item.getParentRepairOrderId())); //查询同型号和规格的模块数量 Integer count = repairOrderMapper.selectCount(new LambdaQueryWrapper() - .eq(RepairOrder::getParentRepairOrderId,parentRepairOrder.getId()) - .eq(RepairOrder::getModuleNumber, item.getModuleNumber()) - .eq(RepairOrder::getModulePower, item.getModulePower())); + .eq(RepairOrder::getParentRepairOrderId,parentRepairOrder.getId())); //订单数量 releaseRecordListExcel.setOrderAmount(count); //单次送货批次有多少同型号和同规格的数量 @@ -543,8 +541,15 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi releaseRecordListExcelMap.put(key,releaseRecordListExcel); index++; // 序号累计 }else{ - releaseRecordListExcel.setOrderAmount(releaseRecordListExcel.getOrderAmount() + 1); - releaseRecordListExcel.setTheQuantityShipped(releaseRecordListExcel.getTheQuantityShipped() + 1); + //累计交货数量 + Integer accumulativeQuantity = cdqMap.get(key); + if(accumulativeQuantity != null){ + int num = accumulativeQuantity + 1; + releaseRecordListExcel.setAccumulativeQuantityShipped(num); + cdqMap.put(key,num); + //未交数量 + releaseRecordListExcel.setUndeliveredQuantity(releaseRecordListExcel.getOrderAmount() - num); + } if(item.getMaintenanceResult() != null){ String result; if(item.getMaintenanceResult() == 0){