预开票

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -355,7 +355,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                 if (CollectionUtils.isNotEmpty(reportData)){
                     for (CwFinanceInvoiceDetailDTO cwFinanceInvoiceDetailDTO : cwFinanceInvoiceDTO.getFinanceInvoiceDetailDTOList()) {
                         for (CwProjectReportData reportDatum : reportData) {
-                            if (StringUtils.isNotBlank(reportDatum.getReportNo()) &&
+                            if (StringUtils.isNotBlank(reportDatum.getReportNo()) && StringUtils.isNotBlank(reportDatum.getInvoiceNumber()) && StringUtils.isNotBlank(cwFinanceInvoiceDetailDTO.getNumber()) &&
                                     reportDatum.getInvoiceNumber().equals(cwFinanceInvoiceDetailDTO.getNumber())) {
                                 cwFinanceInvoiceBaseDTO.setReportNo(reportDatum.getReportNo());
                                 break;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -63,7 +63,6 @@
         b.project_name as projectName,
         b.project_master_id as projectMasterId,
         b.real_header as projectMasterId2,
-        b.is_pre_invoice,
         c.name as departmentName,
         d.name as userName,
         ifnull(cw_pa.audit_money,"0") as "auditFees",