From 3cf06aa5577b110e89a0ee7c2d0dd151ac7b52f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B7=9D=E8=99=8E?= <h17602169347@163.com>
Date: Tue, 11 Jun 2024 09:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/service/impl/PaymentApplicationServiceImpl.java    | 6 ++++++
 .../src/main/java/jnpf/service/impl/VoucherServiceImpl.java | 1 +
 .../src/views/scm/purchaseCenter/purchaseOrder/index.vue    | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PaymentApplicationServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PaymentApplicationServiceImpl.java
index 5781821a..cf4588d9 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PaymentApplicationServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PaymentApplicationServiceImpl.java
@@ -358,6 +358,9 @@ public class PaymentApplicationServiceImpl extends ServiceImpl<PaymentApplicatio
         paymentdocMessage.setMobilePhone(userEntity.getAccount());
         paymentdocMessage.setNowTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(paymentApplicationEntity.getCreatorTime()));
         OrganizeEntity companyEntity = organizeService.getById(paymentApplicationEntity.getCompanyId());
+        if(companyEntity == null){
+            companyEntity = new OrganizeEntity();
+        }
         paymentdocMessage.setCustomerName(companyEntity.getFullName() + "请示");
         paymentdocMessage.setDocumentNo(paymentApplicationEntity.getCode());
         paymentdocMessage.setSupplierName(paymentApplicationEntity.getPayee());
@@ -369,6 +372,9 @@ public class PaymentApplicationServiceImpl extends ServiceImpl<PaymentApplicatio
         paymentdocMessage.setEnclosure(paymentApplicationEntity.getAnnex());
         paymentdocMessage.setPayType("货款");
         OrganizeEntity departmentEntity = organizeService.getById(paymentApplicationEntity.getDepartmentId());
+        if(departmentEntity == null){
+            departmentEntity = new OrganizeEntity();
+        }
         paymentdocMessage.setFullName(companyEntity.getFullName() + "/" + departmentEntity.getFullName());
         StringBuilder payEnclosureStr = new StringBuilder();
         if (paymentdocMessage.getEnclosure() != null) {//附件不为空
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 f9fa6dbe..22c0015b 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
@@ -1180,6 +1180,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
             voucherProductEntity.setTareWeight(new BigDecimal(model.getTareWeight()));
             voucherProductEntity.setBuckleWeight(new BigDecimal(model.getBuckleWeight()));
             voucherProductEntity.setNetWeight(new BigDecimal(model.getNetWeight()));
+            voucherProductEntity.setClearWeight(new BigDecimal(model.getNetWeight()));
             voucherProductEntity.setCompanyId(voucherEntity.getCompanyId());
             voucherProductEntity.setDepartmentId(voucherEntity.getDepartmentId());
             voucherProductEntity.setOrganizeJsonId(voucherEntity.getOrganizeJsonId());
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
index 78491214..291c9bf8 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
@@ -208,7 +208,7 @@
                 <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                   @click="inBoundNotice(scope.row)">下发入库通知</el-button>
               </template>
-              <el-button size="mini" type="text" :disabled="scope.row.flowState != 2"
+              <el-button size="mini" type="text"
                 @click="downLoadPDF(scope.row.code)">开票文件下载</el-button>
             </template>
           </el-table-column>