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

异常审核推送广播

dev
汤建军 2 days ago
parent
a78fa8fa10
commit
3852bbcf28
3 changed files with 14 additions and 21 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. 4
      blade-biz-common/src/main/java/org/springblade/common/model/AbnormalPackageData.java
  2. 6
      blade-biz-common/src/main/java/org/springblade/common/model/ReservationVO.java
  3. 25
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

4
blade-biz-common/src/main/java/org/springblade/common/model/workNode/AbnormalPackageData.java → blade-biz-common/src/main/java/org/springblade/common/model/AbnormalPackageData.java
Unescape View File

@ -1,4 +1,4 @@
package org.springblade.common.model.workNode;
package org.springblade.common.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
@ -51,5 +51,7 @@ public class AbnormalPackageData implements Serializable {
*/
private String auditingUser;
private ReservationVO reservationVO;
}

6
blade-biz-common/src/main/java/org/springblade/common/model/ReservationVO.java
Unescape View File

@ -2,7 +2,6 @@ package org.springblade.common.model;
import lombok.Data;
import org.springblade.common.model.workNode.AbnormalPackageData;
import java.util.Date;
import java.util.List;
@ -83,11 +82,6 @@ public class ReservationVO {
*/
private List<PackageData> packageDataList;
/**
* 预约异常包件列表
*
*/
private List<AbnormalPackageData> abnormalPackageDataList;

25
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -187,7 +187,7 @@ import org.springblade.common.enums.BizOperationEnums;
import org.springblade.common.enums.PackageTypeEnums;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.model.*;
import org.springblade.common.model.workNode.AbnormalPackageData;
import org.springblade.common.model.AbnormalPackageData;
import org.springblade.common.node.BillLadingNode;
import org.springblade.common.node.DeliveryNode;
import org.springblade.common.node.ReservationNode;
@ -6903,8 +6903,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
trunklinePackageTrackLogClient.addPackageTrackLog(logList);
}
private NodeFanoutMsg<ReservationVO> buildNodeFanoutMsgByAbnormalPackage(DistributionReservationEntity reservationEntity, Map<String, List> map,DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity) {
NodeFanoutMsg<ReservationVO> nodeFanoutMsg = new NodeFanoutMsg();
private NodeFanoutMsg<AbnormalPackageData> buildNodeFanoutMsgByAbnormalPackage(DistributionReservationEntity reservationEntity, Map<String, List> map,DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity) {
NodeFanoutMsg<AbnormalPackageData> nodeFanoutMsg = new NodeFanoutMsg();
if (LoadingAbnormalTypeConstant.jihuayichang.getValue().equals(distributionLoadscanAbnormalEntity.getAbnormalType())){
nodeFanoutMsg.setNode(WorkNodeEnums.DISTRIBUTION_ABNORMAL_LOADING);
}else if (LoadingAbnormalTypeConstant.qianshouyichang.getValue().equals(distributionLoadscanAbnormalEntity.getAbnormalType())){
@ -6919,6 +6919,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
nodeFanoutMsg.setWarehouse(reservationEntity.getWarehouseName());
nodeFanoutMsg.setWarehouseId(reservationEntity.getWarehouseId());
nodeFanoutMsg.setTenantId(AuthUtil.getTenantId());
AbnormalPackageData abnormalPackageData = new AbnormalPackageData();
abnormalPackageData.setAbnormalType(distributionLoadscanAbnormalEntity.getAbnormalType());
abnormalPackageData.setPackageCode(distributionLoadscanAbnormalEntity.getPackageCode());
abnormalPackageData.setTrainNumber(distributionLoadscanAbnormalEntity.getTrainNumber());
abnormalPackageData.setAuditingTime(distributionLoadscanAbnormalEntity.getAuditingTime());
abnormalPackageData.setAuditingStatus(distributionLoadscanAbnormalEntity.getAuditingStatus());
ReservationVO reservationVO = distributionReservationService.getReservationVO(reservationEntity);
List<PackageData> packageDataList = new ArrayList<>();
List<DistributionReservationPackageEntity> list = map.get("1");
@ -6929,18 +6935,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
packageData.setNumber(1);
packageDataList.add(packageData);
}
List<AbnormalPackageData> abnormalPackageDataList = new ArrayList<>();
AbnormalPackageData abnormalPackageData = new AbnormalPackageData();
abnormalPackageData.setAbnormalType(distributionLoadscanAbnormalEntity.getAbnormalType());
abnormalPackageData.setPackageCode(distributionLoadscanAbnormalEntity.getPackageCode());
abnormalPackageData.setTrainNumber(distributionLoadscanAbnormalEntity.getTrainNumber());
abnormalPackageData.setAuditingTime(distributionLoadscanAbnormalEntity.getAuditingTime());
abnormalPackageData.setAuditingStatus(distributionLoadscanAbnormalEntity.getAuditingStatus());
if (!abnormalPackageDataList.isEmpty()) {
reservationVO.setAbnormalPackageDataList(abnormalPackageDataList);
}
abnormalPackageData.setReservationVO(reservationVO);
reservationVO.setPackageDataList(packageDataList);
nodeFanoutMsg.setMain(reservationVO);
nodeFanoutMsg.setMain(abnormalPackageData);
return nodeFanoutMsg;
}

Write Preview
Loading…
Cancel
Save