@ -777,7 +777,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
queryWrapper . eq ( "a.document_type" , voucherPagination . getDocumentType ( ) ) ;
queryWrapper . eq ( "a.delivery_type" , "2" ) ;
queryWrapper . eq ( "a.voucher_status" , "4" ) ;
queryWrapper . eq ( ObjectUtils . isNotEmpty ( voucherPagination . getKeyword ( ) ) , "a.voucher_code" , voucherPagination . getKeyword ( ) ) ;
queryWrapper . lik e( ObjectUtils . isNotEmpty ( voucherPagination . getKeyword ( ) ) , "a.voucher_code" , voucherPagination . getKeyword ( ) ) ;
queryWrapper . notIn ( ObjectUtils . isNotEmpty ( voucherPagination . getExcludeIdList ( ) ) , "a.id" , voucherPagination . getExcludeIdList ( ) ) ;
queryWrapper . in ( ObjectUtils . isNotEmpty ( voucherPagination . getProductIdList ( ) ) , "c.product_id" , voucherPagination . getProductIdList ( ) ) ;
queryWrapper . isNull ( "a.f_delete_mark" ) ;
@ -1207,7 +1207,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
pountlistQueryWrapper . eq ( "a.warehousing_storage_id" , id ) ;
pountlistQueryWrapper . notIn ( ObjectUtils . isNotEmpty ( voucherPagination . getExcludeIdList ( ) ) , "a.voucher_id" , voucherPagination . getExcludeIdList ( ) ) ;
pountlistQueryWrapper . notInSql ( "a.voucher_id" , "select voucher_id from jg_delivery_voucher_relation where business_type = '2' and document_type = '1' and f_delete_mark is null" ) ;
pountlistQueryWrapper . eq ( ObjectUtils . isNotEmpty ( voucherPagination . getKeyword ( ) ) , "b.voucher_code" , voucherPagination . getKeyword ( ) ) ;
pountlistQueryWrapper . lik e( ObjectUtils . isNotEmpty ( voucherPagination . getKeyword ( ) ) , "b.voucher_code" , voucherPagination . getKeyword ( ) ) ;
return voucherMapper . returnVoucher ( pountlistQueryWrapper ) ;
}
@ -1217,7 +1217,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
pountlistQueryWrapper . eq ( "a.warehousing_outbound_id" , id ) ;
pountlistQueryWrapper . notIn ( ObjectUtils . isNotEmpty ( voucherPagination . getExcludeIdList ( ) ) , "a.voucher_id" , voucherPagination . getExcludeIdList ( ) ) ;
pountlistQueryWrapper . notInSql ( "a.voucher_id" , "select voucher_id from jg_delivery_voucher_relation where business_type = '2' and document_type = '1' and f_delete_mark is null" ) ;
pountlistQueryWrapper . eq ( ObjectUtils . isNotEmpty ( voucherPagination . getKeyword ( ) ) , "b.voucher_code" , voucherPagination . getKeyword ( ) ) ;
pountlistQueryWrapper . lik e( ObjectUtils . isNotEmpty ( voucherPagination . getKeyword ( ) ) , "b.voucher_code" , voucherPagination . getKeyword ( ) ) ;
return voucherMapper . salereturnVoucher ( pountlistQueryWrapper ) ;
}
}