From b115ab5324596749707a641d3f019ad96f4fe949 Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Wed, 29 May 2024 14:05:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/scm/BusinessOrderMapper.xml   | 4 ++--
 .../src/main/java/jnpf/service/impl/VoucherServiceImpl.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
index c303481b..97b1f659 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
@@ -786,8 +786,8 @@
         SELECT
             a.id AS ID,
             c.f_en_code AS COMP_CD,
-            b.kucun_org_code AS INV_ORG_CD,
-            b.kucun_org_name AS INV_ORG_NM,
+            f.kucun_org_code AS INV_ORG_CD,
+            f.kucun_org_name AS INV_ORG_NM,
             d.f_en_code AS DEPT_CD,
             d.f_full_name AS DEPT_NM,
             e.f_real_name AS PUR_EMP_NM,
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 2b5370fe..fddb9fd5 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
@@ -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.like(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.like(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.like(ObjectUtils.isNotEmpty(voucherPagination.getKeyword()),"b.voucher_code",voucherPagination.getKeyword());
         return voucherMapper.salereturnVoucher(pountlistQueryWrapper);
     }
 }