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

【admin】修改# 1.修复送货单累计交货数量和未交数量显示问题

dev1.0
JaxCen 2024-10-29 23:18:56 +08:00
parent bf01fc5b23
commit 04602a0ffb
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -503,20 +503,21 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi
releaseRecordListExcel.setTheQuantityShipped(count1); releaseRecordListExcel.setTheQuantityShipped(count1);
//累计交货数量 //累计交货数量
Integer accumulativeQuantity = cdqMap.get(key); /*Integer accumulativeQuantity = cdqMap.get(key);
if(accumulativeQuantity != null){ if(accumulativeQuantity != null){
undeliveredQuantity++;
int num = accumulativeQuantity + 1; int num = accumulativeQuantity + 1;
releaseRecordListExcel.setAccumulativeQuantityShipped(num); releaseRecordListExcel.setAccumulativeQuantityShipped(num);
cdqMap.put(key,num); cdqMap.put(key,num);
//未交数量 //未交数量
releaseRecordListExcel.setUndeliveredQuantity(count - num); releaseRecordListExcel.setUndeliveredQuantity(count - undeliveredQuantity);
}else{ }else{
cdqMap.put(key,1); cdqMap.put(key,1);
accumulativeQuantity = 1; accumulativeQuantity = 1;
releaseRecordListExcel.setAccumulativeQuantityShipped(accumulativeQuantity); releaseRecordListExcel.setAccumulativeQuantityShipped(accumulativeQuantity);
//未交数量 //未交数量
releaseRecordListExcel.setUndeliveredQuantity(count - accumulativeQuantity); releaseRecordListExcel.setUndeliveredQuantity(count - accumulativeQuantity);
} }*/
//维修结论 //维修结论
if(item.getMaintenanceResult() != null){ if(item.getMaintenanceResult() != null){
@ -542,14 +543,15 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi
index++; // 序号累计 index++; // 序号累计
}else{ }else{
//累计交货数量 //累计交货数量
Integer accumulativeQuantity = cdqMap.get(key); // Integer accumulativeQuantity = cdqMap.get(key);
if(accumulativeQuantity != null){ // if(accumulativeQuantity != null){
int num = accumulativeQuantity + 1; // int num = accumulativeQuantity + 1;
releaseRecordListExcel.setAccumulativeQuantityShipped(num); // releaseRecordListExcel.setAccumulativeQuantityShipped(num);
cdqMap.put(key,num); // cdqMap.put(key,num);
//未交数量 // //未交数量
releaseRecordListExcel.setUndeliveredQuantity(releaseRecordListExcel.getOrderAmount() - 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){
@ -587,13 +589,22 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi
} }
List<ReleaseRecordListExcel> releaseRecordListExcelList = new LinkedList<>(); List<ReleaseRecordListExcel> releaseRecordListExcelList = new LinkedList<>();
int undeliveredQuantity = 0;
for (Long id : repairOrderShippingMap.keySet()) { for (Long id : repairOrderShippingMap.keySet()) {
List<ReleaseRecordListExcel> recordListExcels = repairOrderShippingMap.get(id);
for (ReleaseRecordListExcel recordListExcel : recordListExcels) {
undeliveredQuantity += recordListExcel.getTheQuantityShipped();
recordListExcel.setAccumulativeQuantityShipped(undeliveredQuantity);
recordListExcel.setUndeliveredQuantity(recordListExcel.getOrderAmount() - undeliveredQuantity);
}
releaseRecordListExcelList.addAll(repairOrderShippingMap.get(id)); releaseRecordListExcelList.addAll(repairOrderShippingMap.get(id));
} }
WriteSheet sheet = EasyExcel.writerSheet(0).build(); WriteSheet sheet = EasyExcel.writerSheet(0).build();
writer.fill(offerDetail, sheet); writer.fill(offerDetail, sheet);
writer.fill(releaseRecordListExcelList, fillConfig, sheet); writer.fill(releaseRecordListExcelList
, fillConfig, sheet);
writer.finish(); writer.finish();
out.close(); out.close();