Browse Source

fix:修改签收复核按照订单分组的节点作业

pre-production
pref_mail@163.com 1 month ago
parent
commit
8b37070953
  1. 13
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

13
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@ -3633,12 +3633,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
Map<String, List<DistributionParcelListEntity>> collect = listByOrderPackageCode.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getBrandName)); Map<String, List<DistributionParcelListEntity>> collect = listByOrderPackageCode.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getBrandName));
for (Map.Entry<String, List<DistributionParcelListEntity>> entry : collect.entrySet()) { for (Map.Entry<String, List<DistributionParcelListEntity>> entry : collect.entrySet()) {
String brand = entry.getKey(); String brand = entry.getKey();
List<DistributionParcelListEntity> list = entry.getValue(); List<DistributionParcelListEntity> list2 = entry.getValue();
// 按订单分组 // 按订单分组
Map<String, List<DistributionParcelListEntity>> collect1 = list.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode)); // Map<String, List<DistributionParcelListEntity>> collect1 = list.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode));
for (Map.Entry<String, List<DistributionParcelListEntity>> stringListEntry : collect1.entrySet()) { // for (Map.Entry<String, List<DistributionParcelListEntity>> stringListEntry : collect1.entrySet()) {
String orderCode = stringListEntry.getKey(); // String orderCode = stringListEntry.getKey();
List<DistributionParcelListEntity> list2 = stringListEntry.getValue(); // List<DistributionParcelListEntity> list2 = stringListEntry.getValue();
JSONObject js = new JSONObject(); JSONObject js = new JSONObject();
js.put("boId", billLadingEntity.getId()); js.put("boId", billLadingEntity.getId());
js.put("consignee", distrilbutionBillLadingEntity.getConsignee()); js.put("consignee", distrilbutionBillLadingEntity.getConsignee());
@ -3662,7 +3662,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
factoryDataMessageSender.sendNodeDataByBrand(msg); factoryDataMessageSender.sendNodeDataByBrand(msg);
} }
} }
}
}catch (Exception e){ }catch (Exception e){
log.error("推送失败:{}", e); log.error("推送失败:{}", e);
} }
@ -3709,7 +3708,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
handletrunklineWaybillSignLog(billLadingEntity.getId()); handletrunklineWaybillSignLog(billLadingEntity.getId());
} }
// 回传工厂数据 // 回传工厂数据
sendFactory(myCurrentWarehouse, parcelListIds); // sendFactory(myCurrentWarehouse, parcelListIds);
return R.success("操作成功"); return R.success("操作成功");
} }

Loading…
Cancel
Save