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

feat(all): 自提复核 

1 修改自提复核志邦我乐存在多次发送消息的情况
fix-sign
zhaoqiaobo 4 months ago
parent
0368db9dc7
commit
026f17ece1
1 changed files with 55 additions and 54 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. 105
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

105
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
Unescape View File

@ -3413,60 +3413,61 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
}
}
if ("我乐".equals(k)) {
List<DistributionStockArticleEntity> orderList3 = orderMap.get(k);
List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
.in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
);
List<Object> contents = new ArrayList<>();
if (!ladingScanEntities.isEmpty()) {
Map<String, List<DistributionStockArticleEntity>> listMap = orderList3.stream().collect(Collectors.groupingBy(DistributionStockArticleEntity::getOrderCode));
for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) {
PushData pushData = PushData.builder()
.packageCode(ladingScanEntity.getPacketBarCode())
.orderCode(ladingScanEntity.getOrderSelfNumbering())
.warehouseName(warehouse.getName())
.waybillNumber(listMap.get(ladingScanEntity.getOrderSelfNumbering()).get(0).getWaybillNumber()).build();
contents.add(pushData);
}
}
NodePushMsg msg = new NodePushMsg();
msg.setNode(WorkNodeEnums.CLERK_REVIEW);
msg.setBrand(BrandEnums.OLO);
msg.setOperator(user.getNickName());
msg.setOperatorTime(new Date());
msg.setContent(contents);
log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg));
factoryDataMessageSender.sendNodeDataByBrand(msg);
}
// if ("我乐".equals(k)) {
// List<DistributionStockArticleEntity> orderList3 = orderMap.get(k);
//
// List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
// .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
// .in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
// );
// List<Object> contents = new ArrayList<>();
// if (!ladingScanEntities.isEmpty()) {
// Map<String, List<DistributionStockArticleEntity>> listMap = orderList3.stream().collect(Collectors.groupingBy(DistributionStockArticleEntity::getOrderCode));
// for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) {
// PushData pushData = PushData.builder()
// .packageCode(ladingScanEntity.getPacketBarCode())
// .orderCode(ladingScanEntity.getOrderSelfNumbering())
// .warehouseName(warehouse.getName())
// .waybillNumber(listMap.get(ladingScanEntity.getOrderSelfNumbering()).get(0).getWaybillNumber()).build();
// contents.add(pushData);
// }
// }
// NodePushMsg msg = new NodePushMsg();
// msg.setNode(WorkNodeEnums.CLERK_REVIEW);
// msg.setBrand(BrandEnums.OLO);
// msg.setOperator(user.getNickName());
// msg.setOperatorTime(new Date());
// msg.setContent(contents);
// log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg));
// factoryDataMessageSender.sendNodeDataByBrand(msg);
// }
if ("志邦".equals(k)) {
List<DistributionStockArticleEntity> orderList3 = orderMap.get(k);
List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
.in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
);
List<Object> contents = new ArrayList<>();
if (!ladingScanEntities.isEmpty()) {
for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("packageCode", ladingScanEntity.getPacketBarCode());
contents.add(jsonObject);
}
}
NodePushMsg msg = new NodePushMsg();
msg.setNode(WorkNodeEnums.CLERK_REVIEW);
msg.setBrand(BrandEnums.ZB);
msg.setOperator(user.getNickName());
msg.setOperatorTime(new Date());
msg.setContent(contents);
log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg));
factoryDataMessageSender.sendNodeDataByBrand(msg);
}
// if ("志邦".equals(k)) {
// List<DistributionStockArticleEntity> orderList3 = orderMap.get(k);
//
// List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
// .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
// .in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
// );
// List<Object> contents = new ArrayList<>();
// if (!ladingScanEntities.isEmpty()) {
// for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) {
// JSONObject jsonObject = new JSONObject();
// jsonObject.put("packageCode", ladingScanEntity.getPacketBarCode());
// jsonObject.put("orderCode", ladingScanEntity.getOrderSelfNumbering());
// contents.add(jsonObject);
// }
// }
// NodePushMsg msg = new NodePushMsg();
// msg.setNode(WorkNodeEnums.CLERK_REVIEW);
// msg.setBrand(BrandEnums.ZB);
// msg.setOperator(user.getNickName());
// msg.setOperatorTime(new Date());
// msg.setContent(contents);
// log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg));
// factoryDataMessageSender.sendNodeDataByBrand(msg);
// }
} catch (Exception e) {

Write Preview
Loading…
Cancel
Save