diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java index fd4bcf68..f1a059e5 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java @@ -715,7 +715,12 @@ public class VoucherServiceImpl extends ServiceImpl page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize()); IPage voucherEntityIPage = voucherMapper.queryVoucherNotification(page,queryWrapper); return voucherPagination.setData(voucherEntityIPage.getRecords(),voucherEntityIPage.getTotal()); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java index 1cb31277..80922963 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java @@ -699,8 +699,7 @@ public class WarehousingNotificationController { QueryWrapper warehousingProductEntityQueryWrapper=new QueryWrapper<>(); warehousingProductEntityQueryWrapper.lambda().eq(WarehousingProductEntity::getWarehousingId,id); warehousingProductEntityQueryWrapper.like("organize_json_id",organize); - warehousingProductEntityQueryWrapper.like("delivery_type","1"); //取仓配的凭证 - warehousingProductEntityQueryWrapper.like("document_type",voucherPagination.getDocumentType()); +// List warehousingProductEntityList = warehousingProductService.list(warehousingProductEntityQueryWrapper); List list=new ArrayList<>();