From 40550a39dc11682eb60852247032066c2967c538 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 13 Jun 2024 14:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=88=97=E8=A1=A8=E6=97=A5?=
=?UTF-8?q?=E6=9C=9F=E6=9F=A5=E8=AF=A2BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/DistributionDeliveryListMapper.xml | 2 +-
.../mapper/DistrilbutionBillStockMapper.xml | 2 +-
.../service/impl/DistributionAsyncServiceImpl.java | 10 +++++-----
.../impl/DistributionDeliveryListServiceImpl.java | 6 ------
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index 30ebeae06..218def9c9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -277,7 +277,7 @@
and date_format(lddl.task_time,'%y%m%d%') = date_format(#{param.taskTime},'%y%m%d%')
- and date_format(lddl.task_time,'%y%m%d%') BETWEEN #{param.taskTimeStart} AND #{param.taskTimeEnd}
+ and date_format(lddl.task_time,'%y%m%d%') BETWEEN date_format( #{param.taskTimeStart}, '%y%m%d%' ) AND date_format( #{param.taskTimeEnd}, '%y%m%d%' )
GROUP BY lddl.id ,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
index 760172b2a..426fb1720 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
@@ -156,7 +156,7 @@
logpm_distrilbution_bill_lading AS ldbl
LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbs.bill_lading_id = ldbl.id
LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id
- LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldbl.id = ldbls.bill_lading_id
+ LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldbl.id = ldbls.bill_lading_id AND ldbs.stock_article_id = ldbls.stock_article_id
ldbs.is_deleted = 0 and ldbs.bill_lading_id = #{param.billLadingId} and ldbs.order_status in (1,3)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index 71be5320e..6d89d96f5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -3093,7 +3093,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
//查询此订单所有签收信息
List ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.query().lambda()
.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
- .eq(DistributionBillLadingScanEntity::getStockArticleId, orderList2.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
+ .in(DistributionBillLadingScanEntity::getStockArticleId, orderList2.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
);
Map> mtOrderMap = orderList2.stream().collect(Collectors.groupingBy(DistributionStockArticleEntity::getId));
//处理数据构建
@@ -3144,7 +3144,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
List ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.query().lambda()
.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
- .eq(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
+ .in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
);
if (!ladingScanEntities.isEmpty()) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss");
@@ -3167,7 +3167,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
List ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.query().lambda()
.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
- .eq(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
+ .in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
);
if (!ladingScanEntities.isEmpty()) {
for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) {
@@ -3190,7 +3190,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
List ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.query().lambda()
.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
- .eq(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
+ .in(DistributionBillLadingScanEntity::getStockArticleId, orderList3.stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList()))
);
List