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

异常审核推送广播

dev
汤建军 2 days ago
parent
81c3d70a5b
commit
ed6b9f7061
3 changed files with 6 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java
  2. 13
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java
  3. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java
Unescape View File

@ -148,6 +148,6 @@ public interface IDistributionNodeWorkService {
/** /**
* 异常签收 * 异常签收
*/ */
void abnormalDeliveryAbnormalReview(NodeFanoutMsg<ReservationVO> nodeFanoutMsg, BladeUser user); void abnormalDeliveryAbnormalReview(NodeFanoutMsg<AbnormalPackageVO> nodeFanoutMsg, BladeUser user);
} }

13
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java
Unescape View File

@ -12,16 +12,7 @@ import com.logpm.factorydata.vo.PushData;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.WorkNodeEnums; import org.springblade.common.constant.WorkNodeEnums;
import org.springblade.common.constant.broadcast.FanoutConstants; import org.springblade.common.constant.broadcast.FanoutConstants;
import org.springblade.common.model.CarStartVO; import org.springblade.common.model.*;
import org.springblade.common.model.ConsigneeArriveVO;
import org.springblade.common.model.DistributionLoadVO;
import org.springblade.common.model.DistributionReCheckSignVO;
import org.springblade.common.model.DistributionSignforVO;
import org.springblade.common.model.DistributionTaskVO;
import org.springblade.common.model.FanoutMsg;
import org.springblade.common.model.NodeFanoutMsg;
import org.springblade.common.model.ReservationVO;
import org.springblade.common.model.StockUpVO;
import org.springblade.common.model.workNode.DeliveryOfPickupPlanVO; import org.springblade.common.model.workNode.DeliveryOfPickupPlanVO;
import org.springblade.common.model.workNode.FinishDistributionTrainVO; import org.springblade.common.model.workNode.FinishDistributionTrainVO;
import org.springblade.common.model.workNode.PickUpByReCheckVO; import org.springblade.common.model.workNode.PickUpByReCheckVO;
@ -276,7 +267,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
} }
@Override @Override
public void abnormalDeliveryAbnormalReview(NodeFanoutMsg<ReservationVO> nodeFanoutMsg, BladeUser user) { public void abnormalDeliveryAbnormalReview(NodeFanoutMsg<AbnormalPackageVO> nodeFanoutMsg, BladeUser user) {
try { try {
if (distributionProperties.getSendFanoutMsg()) { if (distributionProperties.getSendFanoutMsg()) {
rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAbnormalReview.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAbnormalReview.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));

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

@ -6881,7 +6881,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionReservationPackageService.save(reservationPackageEntity); distributionReservationPackageService.save(reservationPackageEntity);
Map<String, List> map = new HashMap<>(); Map<String, List> map = new HashMap<>();
map.put("1", Collections.singletonList(reservationPackageEntity)); map.put("1", Collections.singletonList(reservationPackageEntity));
NodeFanoutMsg<ReservationVO> nodeFanoutMsg = buildNodeFanoutMsgByAbnormalPackage(reservationEntity, map,distributionLoadscanAbnormalEntity); NodeFanoutMsg<AbnormalPackageVO> nodeFanoutMsg = buildNodeFanoutMsgByAbnormalPackage(reservationEntity, map,distributionLoadscanAbnormalEntity);
distributionNodeWorkService.abnormalDeliveryAbnormalReview(nodeFanoutMsg,AuthUtil.getUser()); distributionNodeWorkService.abnormalDeliveryAbnormalReview(nodeFanoutMsg,AuthUtil.getUser());
//维护包件的预约状态 //维护包件的预约状态
DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionLoadscanAbnormalEntity.getPackageId()); DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionLoadscanAbnormalEntity.getPackageId());
@ -6902,8 +6902,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
trunklinePackageTrackLogClient.addPackageTrackLog(logList); trunklinePackageTrackLogClient.addPackageTrackLog(logList);
} }
private NodeFanoutMsg<AbnormalPackageVC> buildNodeFanoutMsgByAbnormalPackage(DistributionReservationEntity reservationEntity, Map<String, List> map,DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity) { private NodeFanoutMsg<AbnormalPackageVO> buildNodeFanoutMsgByAbnormalPackage(DistributionReservationEntity reservationEntity, Map<String, List> map,DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity) {
NodeFanoutMsg<AbnormalPackageVC> nodeFanoutMsg = new NodeFanoutMsg(); NodeFanoutMsg<AbnormalPackageVO> nodeFanoutMsg = new NodeFanoutMsg();
if (LoadingAbnormalTypeConstant.jihuayichang.getValue().equals(distributionLoadscanAbnormalEntity.getAbnormalType())){ if (LoadingAbnormalTypeConstant.jihuayichang.getValue().equals(distributionLoadscanAbnormalEntity.getAbnormalType())){
nodeFanoutMsg.setNode(WorkNodeEnums.DISTRIBUTION_ABNORMAL_LOADING); nodeFanoutMsg.setNode(WorkNodeEnums.DISTRIBUTION_ABNORMAL_LOADING);
}else if (LoadingAbnormalTypeConstant.qianshouyichang.getValue().equals(distributionLoadscanAbnormalEntity.getAbnormalType())){ }else if (LoadingAbnormalTypeConstant.qianshouyichang.getValue().equals(distributionLoadscanAbnormalEntity.getAbnormalType())){

Write Preview
Loading…
Cancel
Save