md

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java

@@ -256,7 +256,11 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
             throw new EmisBizError(EmisBizErrorType.FAIL,"已驳回！");
         }
 
+        // 审核不通过
         emisSettleInvoiceRecord.setBlAudit("2");
+        // 开票失败
+        emisSettleInvoiceRecord.setInvoiceStatus("3");
+
         emisSettleInvoiceRecord.setAuditNote(inputObj.getAuditNote());
         emisSettleInvoiceRecord.setAuditManCode(getCurrentUser().getEmpCode());
         emisSettleInvoiceRecord.setAuditSiteCode(getCurrentUser().getOwnerSiteCode());

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java

@@ -132,7 +132,6 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
         return 1;
     }
 
-
     /**
      * 重算账单收款金额
      * @param settleBillNo
@@ -229,6 +228,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
             for (EmisSettleSubBill subBill:listSubBill) {
                 EmisWaybill emisWaybill = new EmisWaybill();
                 emisWaybill.setBillCode(subBill.getBillCode());
+                emisWaybill.setPaymentStatus(newBill.getPaymentStatus());
                 emisWaybillMapper.updatePayedStatus(emisWaybill);
             }
         }

emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml

@@ -2313,7 +2313,7 @@
 
     <update id="updatePayedStatus" parameterType="EmisWaybill">
         update emis_waybill
-        set payment_status='1'
+        set payment_status=#{paymentStatus}
         where bill_code=#{billCode}
     </update>