renfan
/
charging_pile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【admin】优化# 1.优化发货单导出数据

dev1.0
JaxCen 2024-10-24 02:46:35 +08:00
parent df3e68dba3
commit bf01fc5b23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java
View File

@ -490,9 +490,7 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi
.eq(ParentRepairOrder::getId, item.getParentRepairOrderId())); .eq(ParentRepairOrder::getId, item.getParentRepairOrderId()));
//查询同型号和规格的模块数量 //查询同型号和规格的模块数量
Integer count = repairOrderMapper.selectCount(new LambdaQueryWrapper<RepairOrder>() Integer count = repairOrderMapper.selectCount(new LambdaQueryWrapper<RepairOrder>()
.eq(RepairOrder::getParentRepairOrderId,parentRepairOrder.getId()) .eq(RepairOrder::getParentRepairOrderId,parentRepairOrder.getId()));
.eq(RepairOrder::getModuleNumber, item.getModuleNumber())
.eq(RepairOrder::getModulePower, item.getModulePower()));
//订单数量 //订单数量
releaseRecordListExcel.setOrderAmount(count); releaseRecordListExcel.setOrderAmount(count);
//单次送货批次有多少同型号和同规格的数量 //单次送货批次有多少同型号和同规格的数量
@ -543,8 +541,15 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi
releaseRecordListExcelMap.put(key,releaseRecordListExcel); releaseRecordListExcelMap.put(key,releaseRecordListExcel);
index++; // 序号累计 index++; // 序号累计
}else{ }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){ if(item.getMaintenanceResult() != null){
String result; String result;
if(item.getMaintenanceResult() == 0){ if(item.getMaintenanceResult() == 0){