From 1994989c5a0fa944e77d5ea60a9c1a9269478100 Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Mon, 13 May 2024 11:11:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=87=AD=E8=AF=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/scm/VoucherMapper.xml  |  3 ++-
 .../java/jnpf/service/impl/VoucherServiceImpl.java   | 12 ++++++++++--
 .../src/views/scm/publicPopup/VoucherBox.vue         |  6 ++++--
 .../views/scm/purchaseCenter/receiptVoucher/form.vue |  2 +-
 .../scm/purchaseCenter/receiptVoucher/index.vue      | 10 +++++++++-
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
index 67c32ecc..c4da56d9 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
@@ -391,7 +391,8 @@
         d.spec,
         d.unit,
         e.vehicle_number,
-        f.name AS productName
+        f.name AS productName,
+        a.contract_no as contractNo
         FROM
         jg_voucher a
         LEFT JOIN jg_subject_basic b ON a.associate_third_suppliers = b.id
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 379ec5b4..407256b8 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
@@ -252,6 +252,11 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
                 voucherNum++;
                 voucherQueryWrapper.like("a.contract_no",voucherPagination.getContractNo());
 
+            }
+            if(ObjectUtil.isNotEmpty(voucherPagination.getProductName())){
+                voucherNum++;
+                voucherQueryWrapper.like("f.name",voucherPagination.getProductName());
+
             }
 
             if(ObjectUtil.isNotEmpty(voucherPagination.getDeliveryType())){
@@ -600,8 +605,11 @@ 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(StringUtils.isNotEmpty(voucherPagination.getContractNo()),"a.contract_no",voucherPagination.getContractNo());
-//        queryWrapper.eq(StringUtils.isNotEmpty(voucherPagination.getProductName()),"f.name",voucherPagination.getProductName());
+        if (StringUtils.isNotEmpty(voucherPagination.getKeyword())) {
+            queryWrapper.and(wrapper -> wrapper.like("a.contract_no", voucherPagination.getKeyword())
+                    .or().like("f.name", voucherPagination.getKeyword())
+                    .or().like("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");
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VoucherBox.vue b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VoucherBox.vue
index c0cd6af8..33ad4332 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VoucherBox.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VoucherBox.vue
@@ -38,8 +38,10 @@
       </el-table-column>
       <el-table-column prop="vehicleNumber" label="车牌号" align="left">
       </el-table-column>
-      <!-- <el-table-column prop="supplierName" label="供应商名字" align="left">
-      </el-table-column> -->
+      <el-table-column prop="contractNo" label="合同编号" align="left">
+      </el-table-column>
+      <el-table-column prop="productName" label="商品名称" align="left">
+      </el-table-column>
     </JNPF-table>
     <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
       @pagination="init" />
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
index 9da63839..ed21d2b4 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
@@ -63,7 +63,7 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('freight')">
-            <jnpf-form-tip-item label="合同号" v-if="judgeShow('freight')" prop="contractNo">
+            <jnpf-form-tip-item label="合同编号" v-if="judgeShow('freight')" prop="contractNo">
               <JnpfInput v-model="dataForm.contractNo" @change="changeData('freight', -1)"
                 placeholder="请输入" :disabled="judgeWrite('freight')" clearable
                 :style='{ "width": "100%" }'>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
index 3c4fa7c7..60478f1c 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
@@ -9,10 +9,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="合同号">
+            <el-form-item label="合同编号">
               <el-input v-model="query.contractNo" placeholder="请输入" clearable> </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="商品名称">
+              <el-input v-model="query.productName" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="凭证类型">
               <JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable
@@ -144,6 +149,8 @@
           </el-table-column>
           <el-table-column prop="netWeight" label="净重" align="center" width="200">
           </el-table-column>
+          <el-table-column prop="contractNo" label="合同编号" align="center" width="260">
+          </el-table-column>
           <el-table-column prop="productName" label="商品名称" align="center" width="260">
           </el-table-column>
 
@@ -299,6 +306,7 @@ export default {
       query: {
         voucherCode: undefined,
         contractNo: undefined,
+        productName: undefined,
         voucherType: undefined,
         preparationTime: undefined,
         poundCode: undefined,