feat(all): 增加直发商家签收和三方中转签收推送工厂

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -20,6 +20,7 @@ import com.logpm.basicdata.feign.IBasicdataCodeClient;
 import com.logpm.basicdata.feign.IBasicdataDriverArteryClient;
 import com.logpm.basicdata.feign.IBasicdataTrayClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.distribution.dto.FindParamterDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionParcelNumberEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
@@ -2153,6 +2154,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			String content = "包件在" + warehouseEntity.getName() + "被三方中转整车签收";
 			packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART.getCode(), content);
+			// 推送签收数据给工厂
+			sendFactorySignTriparite(warehouseId, orderPackageCodes, warehouseEntity);
 		} catch (Exception e) {
 			log.warn("###########存入日志失败");
 		}
@@ -4524,7 +4527,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					.build();
 				contents.add(pushData);
 				NodePushMsg msg = new NodePushMsg();
-				msg.setNode(WorkNodeEnums.CLERK_REVIEW);
+				msg.setNode(WorkNodeEnums.SIGN_DIRECT_SHIPPER);
 				msg.setBrand(BrandEnums.getByValue(parcelListEntity.getBrandName()));
 				msg.setOperator(AuthUtil.getNickName());
 				msg.setOperatorTime(new Date());
@@ -4740,7 +4743,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 							.waybillNumber(parcelListEntity.getWaybillNumber()).build();
 						contents.add(pushData);
 						NodePushMsg msg = new NodePushMsg();
-						msg.setNode(WorkNodeEnums.CLERK_REVIEW);
+						msg.setNode(WorkNodeEnums.SIGN_DIRECT_SHIPPER);
 						msg.setBrand(BrandEnums.getByValue(parcelListEntity.getBrandName()));
 						msg.setOperator(AuthUtil.getNickName());
 						msg.setOperatorTime(new Date());
@@ -5085,10 +5088,44 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		} catch (Exception e) {
 			log.warn("###########存入日志失败");
 		}
-
+		// 推送签收数据给工厂
+		sendFactorySignTriparite(warehouseId, orderPackageCodes, warehouseEntity);
 		return R.success("签收成功");
 	}
 
+	private void sendFactorySignTriparite(Long warehouseId, List<String> orderPackageCodes, BasicdataWarehouseEntity warehouseEntity) {
+		try {
+			FindParamterDTO paramterDTO = new FindParamterDTO();
+			paramterDTO.setOrderPackageCodeList(orderPackageCodes);
+			paramterDTO.setWarehouseId(warehouseId);
+			List<DistributionParcelListEntity> listByOrderPackageCodeList = distributionParcelListClient.findListByOrderPackageCodeList(paramterDTO);
+			if (CollUtil.isNotEmpty(listByOrderPackageCodeList)) {
+				// 按品牌分组
+				Map<String, List<DistributionParcelListEntity>> map = listByOrderPackageCodeList.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getBrandName));
+				for (Map.Entry<String, List<DistributionParcelListEntity>> entry : map.entrySet()) {
+					String key = entry.getKey();
+					List<DistributionParcelListEntity> value = entry.getValue();
+					NodePushMsg msg = new NodePushMsg();
+					msg.setNode(WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART);
+					msg.setBrand(BrandEnums.getByValue(key));
+					msg.setOperator(AuthUtil.getNickName());
+					msg.setOperatorTime(new Date());
+					msg.setContent(value.stream().map(item -> {
+						return PushData.builder()
+							.packageCode(item.getOrderPackageCode())
+							.orderCode(item.getOrderCode())
+							.warehouseName(warehouseEntity.getName())
+							.waybillNumber(item.getWaybillNumber()).build();
+					}).collect(Collectors.toList()));
+					log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg));
+					factoryDataMessageSender.sendNodeDataByBrand(msg);
+				}
+			}
+		} catch (Exception e) {
+			log.error("推送签收数据给工厂失败 {}", e);
+		}
+	}
+
 	@Override
 	public R findCarsLoadLogs(LoadCarsDTO loadCarsDTO) {