yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

模糊查询

Browse Source
jg-waiwang-pro
vayne 5 months ago
parent 58eac532dc
commit b115ab5324
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

4
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
Unescape View File

@ -786,8 +786,8 @@
SELECT SELECT
a.id AS ID, a.id AS ID,
c.f_en_code AS COMP_CD, c.f_en_code AS COMP_CD,
b.kucun_org_code AS INV_ORG_CD, f.kucun_org_code AS INV_ORG_CD,
b.kucun_org_name AS INV_ORG_NM, f.kucun_org_name AS INV_ORG_NM,
d.f_en_code AS DEPT_CD, d.f_en_code AS DEPT_CD,
d.f_full_name AS DEPT_NM, d.f_full_name AS DEPT_NM,
e.f_real_name AS PUR_EMP_NM, e.f_real_name AS PUR_EMP_NM,

6
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
Unescape View File

@ -777,7 +777,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
queryWrapper.eq("a.document_type",voucherPagination.getDocumentType()); queryWrapper.eq("a.document_type",voucherPagination.getDocumentType());
queryWrapper.eq("a.delivery_type","2"); queryWrapper.eq("a.delivery_type","2");
queryWrapper.eq("a.voucher_status","4"); queryWrapper.eq("a.voucher_status","4");
queryWrapper.eq(ObjectUtils.isNotEmpty(voucherPagination.getKeyword()),"a.voucher_code",voucherPagination.getKeyword()); queryWrapper.like(ObjectUtils.isNotEmpty(voucherPagination.getKeyword()),"a.voucher_code",voucherPagination.getKeyword());
queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList()); queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"c.product_id",voucherPagination.getProductIdList()); queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"c.product_id",voucherPagination.getProductIdList());
queryWrapper.isNull("a.f_delete_mark"); 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.eq("a.warehousing_storage_id",id);
pountlistQueryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.voucher_id",voucherPagination.getExcludeIdList()); 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.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.like(ObjectUtils.isNotEmpty(voucherPagination.getKeyword()),"b.voucher_code",voucherPagination.getKeyword());
return voucherMapper.returnVoucher(pountlistQueryWrapper); return voucherMapper.returnVoucher(pountlistQueryWrapper);
} }
@ -1217,7 +1217,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
pountlistQueryWrapper.eq("a.warehousing_outbound_id",id); pountlistQueryWrapper.eq("a.warehousing_outbound_id",id);
pountlistQueryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.voucher_id",voucherPagination.getExcludeIdList()); 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.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.like(ObjectUtils.isNotEmpty(voucherPagination.getKeyword()),"b.voucher_code",voucherPagination.getKeyword());
return voucherMapper.salereturnVoucher(pountlistQueryWrapper); return voucherMapper.salereturnVoucher(pountlistQueryWrapper);
} }
} }

Write Preview
Loading…
Cancel
Save