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 6a7c6b6b1..64aa8d9a0 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 @@ -1289,16 +1289,16 @@ and DATE(k.earliestWarehouseEntryTime) < #{param.warehouseEntryTimeEnd} - and DATE(m.signing_time) > + and DATE(m.signing_time) >= #{param.signingTimeStart} - and DATE(m.signing_time) < + and DATE(m.signing_time) <= #{param.signingTimeEnd} - and DATE(j.scanSigningTime) > + and DATE(j.scanSigningTime) >= #{param.scanSigningTimeStart} - and DATE(j.scanSigningTime) < + and DATE(j.scanSigningTime) <= #{param.scanSigningTimeEnd} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index ec26e6dee..31e0defe8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -1992,6 +1992,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl myWarehouseList = warehouseClient.getMyWarehouseList(); + BasicdataWarehouseEntity currentWarehouse = warehouseClient.getMyCurrentWarehouse(); List collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); if (collect.size() > 1) { @@ -1999,6 +2000,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl distributionStockArticleEntityIPage = baseMapper.pageSignforListOwe(page, stockArticleEntity); //处理创建人 distributionStockArticleEntityIPage.getRecords().forEach(a -> {