Merge remote-tracking branch 'origin/dev' into dev

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