diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index b4cbda914..8f61157ee 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -199,9 +199,9 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS } // 未收款 已开票 票是探路供应链 - if ( "0".equals(emisSettleBill.getPaymentStatus()) && "1".equals(emisSettleBill.getOpenBillStatus()) ) { + if ( "0".equals(oldBill.getPaymentStatus()) && "1".equals(oldBill.getOpenBillStatus()) ) { EmisSettleInvoiceChRecord invoiceQuery=new EmisSettleInvoiceChRecord(); - invoiceQuery.getParams().put("settleBillNo",emisSettleBill.getSettleBillNo()); + invoiceQuery.getParams().put("settleBillNo",oldBill.getSettleBillNo()); List invoiceChList = emisSettleInvoiceChRecordMapper.selectEmisSettleInvoiceChRecordList(invoiceQuery); if(!CollectionUtils.isEmpty(invoiceChList)){ for (EmisSettleInvoiceChRecord item:invoiceChList) { @@ -216,12 +216,12 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS } // 未收款、未开票 - if ( "0".equals(emisSettleBill.getPaymentStatus()) && "0".equals(emisSettleBill.getOpenBillStatus()) ) { + if ( "0".equals(oldBill.getPaymentStatus()) && "0".equals(oldBill.getOpenBillStatus()) ) { return 1; } // 未收款、不开票 - if ( "0".equals(emisSettleBill.getPaymentStatus()) && "3".equals(emisSettleBill.getOpenBillStatus()) ) { + if ( "0".equals(oldBill.getPaymentStatus()) && "3".equals(oldBill.getOpenBillStatus()) ) { return 1; }