Browse Source

fix:修改配置,修改报错代码

dist.1.3.0
pref_mail@163.com 5 months ago
parent
commit
05eb5ff5ea
  1. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
  2. 2
      blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-test.yml
  3. 2
      blade-service/logpm-old-project/src/main/resources/application-test.yml
  4. 2
      blade-service/logpm-report/src/main/resources/application-test.yml
  5. 2
      blade-service/logpm-statisticsdata/src/main/resources/application-dev.yml
  6. 2
      blade-service/logpm-statisticsdata/src/main/resources/application-test.yml

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

@ -683,6 +683,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
zeroPackageMap = zeroPackageList.stream().collect(Collectors.groupingBy(DistributionParcelListDTO::getStockArticleId)); zeroPackageMap = zeroPackageList.stream().collect(Collectors.groupingBy(DistributionParcelListDTO::getStockArticleId));
} }
this.saveDistrilbutionBillLading(distrilbutionBillLading); this.saveDistrilbutionBillLading(distrilbutionBillLading);
// List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>();
if (StringUtils.isNotBlank(distrilbutionBillLading.getStockArticleId())) { if (StringUtils.isNotBlank(distrilbutionBillLading.getStockArticleId())) {
String[] split = distrilbutionBillLading.getStockArticleId().split(","); String[] split = distrilbutionBillLading.getStockArticleId().split(",");
for (String s : split) { for (String s : split) {

2
blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-test.yml

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

2
blade-service/logpm-old-project/src/main/resources/application-test.yml

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

2
blade-service/logpm-report/src/main/resources/application-test.yml

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

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

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

2
blade-service/logpm-statisticsdata/src/main/resources/application-test.yml

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

Loading…
Cancel
Save