From 34a12de528ecd52e048769c337463d8a85921345 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 27 May 2024 10:04:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?PDA=E9=85=8D=E9=80=81=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=95=B0BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionDeliveryInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 0f68285f0f9d60befed75334df1fe9227837ff24 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 27 May 2024 10:16:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E7=BB=93=E7=AE=97=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service/logpm-statisticsdata/Dockerfile | 14 ++++++++++++++ blade-service/logpm-statisticsdata/pom.xml | 1 + 2 files changed, 15 insertions(+) create mode 100644 blade-service/logpm-statisticsdata/Dockerfile 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