java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

feat(all): 配送明细报表 

1 优化配送明细广播推送
pre-production
zhaoqiaobo 2 months ago
parent
af3a6ee181
commit
7c991953cd
4 changed files with 71 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java
  2. 14
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java
  3. 34
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java
  4. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java

30
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java
Unescape View File

@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -114,6 +115,10 @@ public class BillPlanReportListener implements ReportService {
qualityDeliverEntity.setId(cmpMap.get(detail.getPackageCode()).get(0).getId());
sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
} else {
qualityDeliverEntity.setDeliveryCreateUserName(bean.getOperator());
qualityDeliverEntity.setDeliveryPlanTime(bean.getOperatorTime());
qualityDeliverEntity.setPlanReservationCreateTime(bean.getOperatorTime());
qualityDeliverEntity.setPlanReservationUser(bean.getOperator());
sendReport(qualityDeliverEntity, BizOperationEnums.ADD);
}
}
@ -126,6 +131,10 @@ public class BillPlanReportListener implements ReportService {
qualityDeliverEntity.setId(ltlMap.get(detail.getProductName() + detail.getOrderCode()).get(0).getId());
sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
} else {
qualityDeliverEntity.setDeliveryCreateUserName(bean.getOperator());
qualityDeliverEntity.setDeliveryPlanTime(bean.getOperatorTime());
qualityDeliverEntity.setPlanReservationCreateTime(bean.getOperatorTime());
qualityDeliverEntity.setPlanReservationUser(bean.getOperator());
sendReport(qualityDeliverEntity, BizOperationEnums.ADD);
}
}
@ -146,12 +155,16 @@ public class BillPlanReportListener implements ReportService {
QualityDeliverEntity entity = new QualityDeliverEntity();
BeanUtil.copyProperties(qualityDeliverEntity, entity);
entity.setPlanNum(1);
qualityDeliverEntity.setDeliveryCreateUserName(bean.getOperator());
qualityDeliverEntity.setDeliveryPlanTime(bean.getOperatorTime());
qualityDeliverEntity.setPlanReservationCreateTime(bean.getOperatorTime());
qualityDeliverEntity.setPlanReservationUser(bean.getOperator());
sendReport(entity, BizOperationEnums.ADD);
}
for (QualityDeliverEntity deliverEntity : qualityDeliverEntities) {
qualityDeliverEntity.setId(deliverEntity.getId());
qualityDeliverEntity.setPlanNum(1);
sendReport(qualityDeliverEntity, BizOperationEnums.DELETE);
sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
}
} else if (number == size) {
for (QualityDeliverEntity deliverEntity : qualityDeliverEntities) {
@ -163,16 +176,27 @@ public class BillPlanReportListener implements ReportService {
List<QualityDeliverEntity> collect = qualityDeliverEntities.stream()
.filter(item -> StrUtil.isEmpty(item.getOrderPackageCode()))
.collect(Collectors.toList());
Set<Long> delIds = new HashSet<>();
if (CollUtil.isNotEmpty(collect)) {
int i = size - number;
if (i >= collect.size()) {
for (QualityDeliverEntity entity : collect) {
sendReport(entity, BizOperationEnums.DELETE);
delIds.add(entity.getId());
}
} else {
for (int j = 0; j < i; j++) {
sendReport(collect.get(j), BizOperationEnums.DELETE);
delIds.add(collect.get(j).getId());
}
}
for (QualityDeliverEntity deliverEntity : qualityDeliverEntities) {
if(delIds.contains(deliverEntity.getId())){
continue;
}
qualityDeliverEntity.setId(deliverEntity.getId());
qualityDeliverEntity.setPlanNum(1);
sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
}
}
}
@ -181,6 +205,10 @@ public class BillPlanReportListener implements ReportService {
QualityDeliverEntity entity = new QualityDeliverEntity();
BeanUtil.copyProperties(qualityDeliverEntity, entity);
entity.setPlanNum(1);
qualityDeliverEntity.setDeliveryCreateUserName(bean.getOperator());
qualityDeliverEntity.setDeliveryPlanTime(bean.getOperatorTime());
qualityDeliverEntity.setPlanReservationCreateTime(bean.getOperatorTime());
qualityDeliverEntity.setPlanReservationUser(bean.getOperator());
sendReport(entity, BizOperationEnums.ADD);
}
}

14
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java
Unescape View File

@ -141,8 +141,6 @@ public class PlanReportListener implements ReportService {
.vehicleName(vehicleName)
.driverName(driverName)
.distributionCompany(vo.getDistributionCompany())
.deliveryPlanTime(bean.getOperatorTime())
.deliveryCreateUserName(bean.getOperator())
.bizCode(reservationVO.getReservationCode())
.ynWholeVehicle(vo.getYnWholeVehicle())
.deliveryFee(vo.getPrice())
@ -155,6 +153,10 @@ public class PlanReportListener implements ReportService {
if (BizOperationEnums.DELETE.equals(bizOperation)) {
sendReport(qualityDeliverEntity, BizOperationEnums.DELETE);
} else {
if(BizOperationEnums.ADD.equals(bizOperation)){
qualityDeliverEntity.setDeliveryPlanTime(bean.getOperatorTime());
qualityDeliverEntity.setDeliveryCreateUserName(bean.getOperator());
}
sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
}
}
@ -170,6 +172,10 @@ public class PlanReportListener implements ReportService {
if (BizOperationEnums.DELETE.equals(bizOperation)) {
sendReport(qualityDeliverEntity, BizOperationEnums.DELETE);
} else {
if(BizOperationEnums.ADD.equals(bizOperation)){
qualityDeliverEntity.setDeliveryPlanTime(bean.getOperatorTime());
qualityDeliverEntity.setDeliveryCreateUserName(bean.getOperator());
}
sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
}
}
@ -198,6 +204,10 @@ public class PlanReportListener implements ReportService {
for (QualityDeliverEntity deliverEntity : qualityDeliverEntities) {
if (!invedSet.contains(deliverEntity.getId())) {
qualityDeliverEntity.setId(deliverEntity.getId());
if(BizOperationEnums.ADD.equals(bizOperation)){
qualityDeliverEntity.setDeliveryPlanTime(bean.getOperatorTime());
qualityDeliverEntity.setDeliveryCreateUserName(bean.getOperator());
}
sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
}
invedSet.add(deliverEntity.getId());

34
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java
Unescape View File

@ -26,6 +26,7 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -117,11 +118,9 @@ public class ReservationPlanReportListener implements ReportService {
.warehouseName(bean.getWarehouse())
.warehouseId(warehouseId)
.orderPackageCode(detail.getPackageCode())
.planReservationCreateTime(bean.getOperatorTime())
.planReservationCode(vo.getReservationCode())
.bizCode(vo.getReservationCode())
.planReservationTime(vo.getReservationDate())
.planReservationUser(bean.getOperator())
.planNum(detail.getNumber())
.reservationConsignee(vo.getConsignee())
.reservationConsigneePhone(vo.getDeliveryPhone())
@ -135,6 +134,8 @@ public class ReservationPlanReportListener implements ReportService {
qualityDeliverEntity.setId(cmpMap.get(detail.getPackageCode()).get(0).getId());
sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
} else {
qualityDeliverEntity.setPlanReservationCreateTime(bean.getOperatorTime());
qualityDeliverEntity.setPlanReservationUser(bean.getOperator());
sendReport(qualityDeliverEntity, BizOperationEnums.ADD);
}
}
@ -147,6 +148,8 @@ public class ReservationPlanReportListener implements ReportService {
qualityDeliverEntity.setId(ltlMap.get(detail.getProductName() + detail.getOrderCode()).get(0).getId());
sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
} else {
qualityDeliverEntity.setPlanReservationCreateTime(bean.getOperatorTime());
qualityDeliverEntity.setPlanReservationUser(bean.getOperator());
sendReport(qualityDeliverEntity, BizOperationEnums.ADD);
}
}
@ -167,12 +170,14 @@ public class ReservationPlanReportListener implements ReportService {
QualityDeliverEntity entity = new QualityDeliverEntity();
BeanUtil.copyProperties(qualityDeliverEntity, entity);
entity.setPlanNum(1);
qualityDeliverEntity.setPlanReservationCreateTime(bean.getOperatorTime());
qualityDeliverEntity.setPlanReservationUser(bean.getOperator());
sendReport(entity, BizOperationEnums.ADD);
}
for (QualityDeliverEntity deliverEntity : qualityDeliverEntities) {
qualityDeliverEntity.setId(deliverEntity.getId());
qualityDeliverEntity.setPlanNum(1);
sendReport(qualityDeliverEntity, BizOperationEnums.DELETE);
sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
}
} else if (number == size) {
for (QualityDeliverEntity deliverEntity : qualityDeliverEntities) {
@ -184,16 +189,27 @@ public class ReservationPlanReportListener implements ReportService {
List<QualityDeliverEntity> collect = qualityDeliverEntities.stream()
.filter(item -> StrUtil.isEmpty(item.getOrderPackageCode()))
.collect(Collectors.toList());
Set<Long> delIds = new HashSet<>();
if (CollUtil.isNotEmpty(collect)) {
int i = size - number;
if (i >= collect.size()) {
for (QualityDeliverEntity entity : collect) {
sendReport(entity, BizOperationEnums.DELETE);
delIds.add(entity.getId());
}
} else {
for (int j = 0; j < i; j++) {
sendReport(collect.get(j), BizOperationEnums.DELETE);
delIds.add(collect.get(j).getId());
}
}
for (QualityDeliverEntity deliverEntity : qualityDeliverEntities) {
if(delIds.contains(deliverEntity.getId())){
continue;
}
qualityDeliverEntity.setId(deliverEntity.getId());
qualityDeliverEntity.setPlanNum(1);
sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
}
}
}
@ -202,6 +218,8 @@ public class ReservationPlanReportListener implements ReportService {
QualityDeliverEntity entity = new QualityDeliverEntity();
BeanUtil.copyProperties(qualityDeliverEntity, entity);
entity.setPlanNum(1);
qualityDeliverEntity.setPlanReservationCreateTime(bean.getOperatorTime());
qualityDeliverEntity.setPlanReservationUser(bean.getOperator());
sendReport(entity, BizOperationEnums.ADD);
}
}
@ -243,9 +261,15 @@ public class ReservationPlanReportListener implements ReportService {
.operation(operationEnums)
.node(WorkNodeEnums.PLANNED_RESERVATION.getValue())
.build();
String exchange = ReportConstants.REPORT_QUALITY_DELIVER_EXCHANGE;
String routingkey = ReportConstants.REPORT_QUALITY_DELIVER_ROUTINGKEY;
if(ObjectUtil.equals(operationEnums, BizOperationEnums.ADD)){
exchange = ReportConstants.REPORT_QUALITY_DELIVER_ADD_EXCHANGE;
routingkey = ReportConstants.REPORT_QUALITY_DELIVER_ADD_ROUTINGKEY;
}
factoryDataClient.sendMessage(SendMsg.builder()
.exchange(ReportConstants.REPORT_QUALITY_DELIVER_EXCHANGE)
.routingKey(ReportConstants.REPORT_QUALITY_DELIVER_ROUTINGKEY)
.exchange(exchange)
.routingKey(routingkey)
.message(JSONUtil.toJsonStr(dto))
.delay(3000)
.build());

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java
Unescape View File

@ -85,8 +85,8 @@ public class StockReportListener implements ReportService {
.orderPackageCode(detail.getPackageCode())
.stockupCode(vo.getStockupCode())
.stockupUserName(bean.getOperator())
.stockupFinishTime(vo.getStockupDate())
.stockupCreateTime(bean.getOperatorTime())
.stockupFinishTime(vo.getStockupDate())
.stockAllocation(vo.getStockupArea())
.bizCode(vo.getReferenceCode())
.build();

Write Preview
Loading…
Cancel
Save