Browse Source

fix:修改节点推送 配送完成的节点名称错误

dist.1.3.0
pref_mail@163.com 6 months ago
parent
commit
857c8464cd
  1. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java

@ -194,7 +194,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
@Override @Override
public void billofladingSignforCheck(NodeFanoutMsg<PickUpByReCheckVO> nodeFanoutMsg, BladeUser user) { public void billofladingSignforCheck(NodeFanoutMsg<PickUpByReCheckVO> nodeFanoutMsg, BladeUser user) {
try { try {
rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillSign.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillSignReview.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
} catch (AmqpException e) { } catch (AmqpException e) {
log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 自提复核消息推送失败~ 请联系管理员! ", e); log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 自提复核消息推送失败~ 请联系管理员! ", e);
} }
@ -203,7 +203,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
@Override @Override
public void finishDistributionTrain(NodeFanoutMsg<FinishDistributionTrainVO> nodeFanoutMsg, BladeUser user) { public void finishDistributionTrain(NodeFanoutMsg<FinishDistributionTrainVO> nodeFanoutMsg, BladeUser user) {
try { try {
rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillSign.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndFinish.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
} catch (AmqpException e) { } catch (AmqpException e) {
log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 车次完成消息推送失败~ 请联系管理员! ", e); log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 车次完成消息推送失败~ 请联系管理员! ", e);
} }

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@ -782,7 +782,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
PackageData packageData = new PackageData(); PackageData packageData = new PackageData();
// 不是零担 // 不是零担
if (distributionLoadscanEntity.getIsZero() == null) { if (distributionLoadscanEntity.getIsZero() == null || distributionLoadscanEntity.getIsZero() == 0) {
packageData.setPackageCode(distributionLoadscanEntity.getOrderPackageCode()); packageData.setPackageCode(distributionLoadscanEntity.getOrderPackageCode());
packageData.setPackageType(PackageTypeEnums.CMP); packageData.setPackageType(PackageTypeEnums.CMP);
packageData.setNumber(1); packageData.setNumber(1);

Loading…
Cancel
Save