diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 1236af295..0473c48bd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -561,7 +561,7 @@ SELECT DISTINCT ldr.id id, ldr.consignee consignee, - COALESCE ( lds.loaded_number + lds.loadedin_number, 0 ) loadingNub, + COALESCE ( ldr.reservation_num + ldr.reservation_stock_list_num, 0 ) reservationNum, ( SELECT COALESCE diff --git a/blade-service/logpm-statisticsdata/Dockerfile b/blade-service/logpm-statisticsdata/Dockerfile new file mode 100644 index 000000000..d88337231 --- /dev/null +++ b/blade-service/logpm-statisticsdata/Dockerfile @@ -0,0 +1,14 @@ +FROM bladex/alpine-java:openjdk8-openj9_cn_slim + +MAINTAINER h5u@163.com + +RUN mkdir -p /logpm/statisticsdata + +WORKDIR /logpm/statisticsdata + +EXPOSE 19999 + +ADD ./target/logpm-statisticsdata.jar ./app.jar + +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "-Xms128m","-Xmx512m","app.jar"] +CMD ["--spring.profiles.active=test"] diff --git a/blade-service/logpm-statisticsdata/pom.xml b/blade-service/logpm-statisticsdata/pom.xml index 2a886908a..778ee4b68 100644 --- a/blade-service/logpm-statisticsdata/pom.xml +++ b/blade-service/logpm-statisticsdata/pom.xml @@ -12,6 +12,7 @@ org.springblade logpm-statisticsdata + ${project.artifactId} ${bladex.project.version} jar