add:

1.增加车次完结作业节点

blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java

@@ -287,6 +287,19 @@ public abstract class FanoutConstants {
 			}
 		}
 
+
+		/**
+		 * 车次完成
+		 * see @org.springblade.common.model.workNode.FinishDistributionTrainVO
+		 */
+		interface DeliveryAndFinish {
+
+			String EXCHANGE = "fanout.distribution.finish " + ModuleNameConstant.DEVAUTH;
+
+			interface QUEUE {
+			}
+		}
+
 	}
 
 
@@ -334,6 +347,21 @@ public abstract class FanoutConstants {
 			}
 		}
 
+
+		/**
+		 * 自提车次完成
+		 * see @org.springblade.common.model.workNode.FinishDistributionTrainVO
+		 */
+		interface BillAndFinish {
+
+			String EXCHANGE = "fanout.DeliveryOfPickup.finish " + ModuleNameConstant.DEVAUTH;
+
+			interface QUEUE {
+			}
+		}
+
 	}
 
+
+
 }

blade-biz-common/src/main/java/org/springblade/common/model/workNode/FinishDistributionTrainVO.java

@@ -0,0 +1,24 @@
+package org.springblade.common.model.workNode;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class FinishDistributionTrainVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * 配送车次号
+	 * 包含 自提 配送 三方中转 直发商家
+	 */
+	private String trainNumber;
+
+
+	/**
+	 *  配送类型 市配  商配 自提  三方中转  （5直发商家 【签收节点进行驱动】) 没有这个字段
+	 */
+	private String  type;
+
+}

blade-service/logpm-basic/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-basicdata/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java

@@ -5,6 +5,7 @@ import com.logpm.distribution.entity.DistributionParcelListEntity;
 import org.springblade.common.enums.BizOperationEnums;
 import org.springblade.common.model.*;
 import org.springblade.common.model.workNode.DeliveryOfPickupPlanVO;
+import org.springblade.common.model.workNode.FinishDistributionTrainVO;
 import org.springblade.common.model.workNode.PickUpByReCheckVO;
 import org.springblade.common.model.workNode.PickUpByScanVO;
 import org.springblade.core.secure.BladeUser;
@@ -113,6 +114,14 @@ public interface IDistributionNodeWorkService {
 	 */
 	void billofladingSignforCheck(NodeFanoutMsg<PickUpByReCheckVO> nodeFanoutMsg, BladeUser user);
 
+
+	/**
+	 * 车次完结
+	 * @param nodeFanoutMsg
+	 * @param user
+	 */
+	void finishDistributionTrain(NodeFanoutMsg<FinishDistributionTrainVO> nodeFanoutMsg, BladeUser user);
+
 	/**
 	 * 滞留
 	 */

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

@@ -13,6 +13,7 @@ import org.springblade.common.constant.WorkNodeEnums;
 import org.springblade.common.constant.broadcast.FanoutConstants;
 import org.springblade.common.model.*;
 import org.springblade.common.model.workNode.DeliveryOfPickupPlanVO;
+import org.springblade.common.model.workNode.FinishDistributionTrainVO;
 import org.springblade.common.model.workNode.PickUpByReCheckVO;
 import org.springblade.common.model.workNode.PickUpByScanVO;
 import org.springblade.core.secure.BladeUser;
@@ -199,6 +200,15 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
 		}
 	}
 
+	@Override
+	public void finishDistributionTrain(NodeFanoutMsg<FinishDistributionTrainVO> nodeFanoutMsg, BladeUser user) {
+		try {
+			rabbitTemplate.convertAndSend(FanoutConstants.DeliveryOfPickup.BillSign.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
+		} catch (AmqpException e) {
+			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 车次完成消息推送失败~ 请联系管理员！ ", e);
+		}
+	}
+
 	@Override
 	public void retention() {
 

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

@@ -78,6 +78,7 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 	private IDistributionStockupInfoService distributionStockupInfoService;
 
 	@Autowired
+	@Lazy
 	private IDistributionStockupService distributionStockupService;
 
 	@Autowired

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

@@ -147,6 +147,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	private IDistributionParcelListService distributionParcelListService;
 
 	@Autowired
+	@Lazy
 	private IDistributionStockService distributionStockService;
 
 	@Autowired

blade-service/logpm-distribution/src/main/resources/application-dev.yml

@@ -41,7 +41,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-trunkline/src/main/resources/application-dev.yml

@@ -39,7 +39,7 @@ spring:
 
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:

blade-service/logpm-warehouse/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ spring:
       mandatory: true
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -59,15 +59,15 @@ spring:
           url: ${blade.datasource.warehouse.master.url}
           username: ${blade.datasource.warehouse.master.username}
           password: ${blade.datasource.warehouse.master.password}
-        627683:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.warehouse.627683.url}
-          username: ${blade.datasource.warehouse.627683.username}
-          password: ${blade.datasource.warehouse.627683.password}
+#        627683:
+#          druid:
+#            #独立校验配置
+#            validation-query: select 1
+#            #oracle校验
+#            #validation-query: select 1 from dual
+#          url: ${blade.datasource.warehouse.627683.url}
+#          username: ${blade.datasource.warehouse.627683.username}
+#          password: ${blade.datasource.warehouse.627683.password}
 #        703623:
 #          druid:
 #            #独立校验配置