修改

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) {//附件不为空

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());

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>