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') - - - - and ldl.warehouse_id in #{item} 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 loadscanEntityList = distributionLoadscanMapper.selectList(Wrappers.query().lambda() .eq(DistributionLoadscanEntity::getReservationId, reservationEntity.getId()) diff --git a/pom.xml b/pom.xml index 48782128b..5a7f5cf19 100644 --- a/pom.xml +++ b/pom.xml @@ -163,12 +163,12 @@ run - + - +