Merge branch 'dev' into pre-production

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}

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())

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>