入库通知获取凭证修改

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<VoucherMapper, VoucherEntity
         queryWrapper.isNull("a.f_delete_mark");
         queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
         queryWrapper.like("a.organize_json_id",organize);
-//        queryWrapper.orderByDesc("a.f_creator_time"); // 排序
+
+        queryWrapper.eq("a.delivery_type","1"); //取仓配的凭证
+        queryWrapper.eq("a.document_type",voucherPagination.getDocumentType());
+
+
+
         Page<VoucherEntity> page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize());
         IPage<VoucherEntity> voucherEntityIPage = voucherMapper.queryVoucherNotification(page,queryWrapper);
         return voucherPagination.setData(voucherEntityIPage.getRecords(),voucherEntityIPage.getTotal());

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java

@@ -699,8 +699,7 @@ public class WarehousingNotificationController {
             QueryWrapper<WarehousingProductEntity> 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<WarehousingProductEntity> warehousingProductEntityList = warehousingProductService.list(warehousingProductEntityQueryWrapper);
             List<VoucherEntity> list=new ArrayList<>();