From 586495c717c9b6133f0f7969421517fe160ddc02 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 3 Jul 2024 18:33:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=B2=E7=AD=BE=E8=AE=A2=E5=8D=95BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockArticleMapper.xml    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 41d66f6ca..82e3242a4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -1260,10 +1260,6 @@
             and ldsa.order_status in ('70','80')
 
             <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
-<!--                and ldsa.warehouse_id in-->
-<!--                <foreach collection="collect" item="item" open="(" close=")" separator=",">-->
-<!--                    #{item}-->
-<!--                </foreach>-->
                 and ldl.warehouse_id in
                 <foreach collection="collect" item="item" open="(" close=")" separator=",">
                     #{item}

From d5e257cde0aed7453a796dc3db7fc1200bcae1c8 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 3 Jul 2024 18:46:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/service/impl/DistributionAsyncServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b4b1f6ae7..0fd611e2e 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
@@ -3038,7 +3038,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					order.setWaybill_no(distributionStockArticleEntity.getWaybillNumber());
 					order.setOrder_no(distributionStockArticleEntity.getOrderCode());
 					order.setAll_num(distributionStockArticleEntity.getTotalNumber() + "");
-					order.setAll_num("0");
+					order.setEnd_num("0");
 					//查询签收数量
 					List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda()
 						.eq(DistributionLoadscanEntity::getReservationId, reservationEntity.getId())

From 72ab8613f3230b890f74d31fa8a8bbabf9328ad0 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 3 Jul 2024 18:47:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 48782128b..5a7f5cf19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,12 +163,12 @@
                                 <goal>run</goal>
                             </goals>
                             <configuration>
-                                <target>
+                                <tasks>
                                     <!--suppress UnresolvedMavenProperty -->
                                     <copy overwrite="true"
                                           tofile="${session.executionRootDirectory}/target/${project.artifactId}.jar"
                                           file="${project.build.directory}/${project.artifactId}.jar"/>
-                                </target>
+                                </tasks>
                             </configuration>
                         </execution>
                     </executions>