aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-11-13 14:22:43 +08:00
parent 42e2731161
commit 52a345db94
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
View File

@ -501,17 +501,15 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
updEmisSettleSubBill.setBillCode(subBill.getBillCode()); updEmisSettleSubBill.setBillCode(subBill.getBillCode());
updEmisSettleSubBill.setInvoicedMoney(sumMoney); updEmisSettleSubBill.setInvoicedMoney(sumMoney);
if(sumMoney.compareTo(BigDecimal.ZERO)>0) { if( sumMoney.compareTo(BigDecimal.ZERO) == 0 ){
updEmisSettleSubBill.setOpenBillStatus("0");
}else{
if (sumMoney.compareTo(subBill.getBillFee()) >= 0) { if (sumMoney.compareTo(subBill.getBillFee()) >= 0) {
updEmisSettleSubBill.setOpenBillStatus("1"); updEmisSettleSubBill.setOpenBillStatus("1");
}else { }else {
updEmisSettleSubBill.setOpenBillStatus("2"); updEmisSettleSubBill.setOpenBillStatus("2");
} }
} }
else{
updEmisSettleSubBill.setOpenBillStatus("0");
}
// 更新每一单的开票状态 // 更新每一单的开票状态
emisSettleSubBillMapper.updateOpenBillStatus(updEmisSettleSubBill); emisSettleSubBillMapper.updateOpenBillStatus(updEmisSettleSubBill);
@ -525,17 +523,16 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
newBill.setId(oldBill.getId()); newBill.setId(oldBill.getId());
newBill.setInvoicedMoney(totalMoney); newBill.setInvoicedMoney(totalMoney);
if(totalMoney.compareTo(BigDecimal.ZERO)>0) { if( totalMoney.compareTo(BigDecimal.ZERO) == 0 ){
newBill.setOpenBillStatus("0");
}
else{
if (oldBill.getRecMoney().compareTo(totalMoney) > 0) { if (oldBill.getRecMoney().compareTo(totalMoney) > 0) {
newBill.setOpenBillStatus("2"); newBill.setOpenBillStatus("2");
} else { } else {
newBill.setOpenBillStatus("1"); newBill.setOpenBillStatus("1");
} }
}else{
newBill.setOpenBillStatus("0");
} }
// 更新账单开票状态 // 更新账单开票状态
emisSettleBillMapper.updateEmisSettleBill(newBill); emisSettleBillMapper.updateEmisSettleBill(newBill);
@ -648,17 +645,18 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
EmisWaybill emisWaybill = new EmisWaybill(); EmisWaybill emisWaybill = new EmisWaybill();
emisWaybill.setBillCode(subBill.getBillCode()); emisWaybill.setBillCode(subBill.getBillCode());
if(sumMoney.compareTo(subBill.getBillFee())>0) {
if (totalMoney.compareTo(subBill.getBillFee()) >= 0) { if( sumMoney.compareTo(BigDecimal.ZERO) == 0 ){
emisWaybill.setPaymentStatus("0");
}else{
if (sumMoney.compareTo(subBill.getBillFee()) >= 0) {
emisWaybill.setPaymentStatus("1"); emisWaybill.setPaymentStatus("1");
} else { } else {
emisWaybill.setPaymentStatus("2"); emisWaybill.setPaymentStatus("2");
} }
}else{
emisWaybill.setPaymentStatus("0");
} }
emisWaybillMapper.updatePayedStatus(emisWaybill);
emisWaybillMapper.updatePayedStatus(emisWaybill);
EmisSettleSubBill updEmisSettleSubBill=new EmisSettleSubBill(); EmisSettleSubBill updEmisSettleSubBill=new EmisSettleSubBill();
updEmisSettleSubBill.setPaymentStatus(emisWaybill.getPaymentStatus()); updEmisSettleSubBill.setPaymentStatus(emisWaybill.getPaymentStatus());