zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhangzhiguo:c87bbc2a35e5768173a8a9348edf0f1d95de3ca3
Branches Tags
zhangzhiguo:main
zhangzhiguo:dev
..
compare: zhangzhiguo:1531ccff953003c24e9f1a5cc5dc2546dbefad36
Branches Tags
zhangzhiguo:dev
zhangzhiguo:main

No commits in common. "c87bbc2a35e5768173a8a9348edf0f1d95de3ca3" and "1531ccff953003c24e9f1a5cc5dc2546dbefad36" have entirely different histories.
c87bbc2a35 ... 1531ccff95

3 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

4
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/ReimbursementInvoiceTaxAmtCkOp.java
View File

@ -78,11 +78,9 @@ public class ReimbursementInvoiceTaxAmtCkOp extends AbstractOperationServicePlug
} }
BigDecimal differAmount = allTaxamount.subtract(allTaxamountInvoice).abs(); BigDecimal differAmount = allTaxamount.subtract(allTaxamountInvoice).abs();
//差额大于0且小于0.05 if (differAmount.compareTo(TOLERANCE) > 0) {
if (differAmount.compareTo(BigDecimal.ZERO) !=0 && differAmount.compareTo(TOLERANCE) < 0) {
this.addFatalErrorMessage(extendedDataEntity, String.format("报销税额超出发票税额：%s",differAmount.setScale(2, RoundingMode.HALF_EVEN))); this.addFatalErrorMessage(extendedDataEntity, String.format("报销税额超出发票税额：%s",differAmount.setScale(2, RoundingMode.HALF_EVEN)));
} }
} }
} }
} }

2
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TripreimbursebillInvoiceTaxAmtCkOp.java
View File

@ -81,7 +81,7 @@ public class TripreimbursebillInvoiceTaxAmtCkOp extends AbstractOperationService
} }
BigDecimal differAmount = allTaxamount.subtract(allTaxamountInvoice).abs(); BigDecimal differAmount = allTaxamount.subtract(allTaxamountInvoice).abs();
if (differAmount.compareTo(BigDecimal.ZERO) !=0 &&differAmount.compareTo(TOLERANCE) < 0) { if (differAmount.compareTo(TOLERANCE) > 0) {
this.addFatalErrorMessage(extendedDataEntity, String.format("报销税额超出发票税额：%s",differAmount.setScale(2, RoundingMode.HALF_EVEN))); this.addFatalErrorMessage(extendedDataEntity, String.format("报销税额超出发票税额：%s",differAmount.setScale(2, RoundingMode.HALF_EVEN)));
} }
} }

6
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TripreimbursebillIsInvoiceUserCheckOp.java
View File

@ -65,14 +65,14 @@ public class TripreimbursebillIsInvoiceUserCheckOp extends AbstractOperationServ
int i=1; int i=1;
for (DynamicObject dynamicObject : tripentry) { for (DynamicObject dynamicObject : tripentry) {
String invoicetype = dynamicObject.getString("invoicetype"); String invoicetype = dynamicObject.getString("invoicetype");
//if("9".equals(invoicetype) || "10".equals(invoicetype)){ if("9".equals(invoicetype) || "10".equals(invoicetype)){
String passengername = dynamicObject.getString("passengername"); String passengername = dynamicObject.getString("passengername");
if(!StringUtils.isEmpty(passengername) && !applierName.equals(passengername)){ if(!applierName.equals(passengername)){
String message = String.format("发票信息第%d行，旅客和申请人不一致!",i); String message = String.format("发票信息第%d行，旅客和申请人不一致!",i);
this.addFatalErrorMessage(extendedDataEntity, message); this.addFatalErrorMessage(extendedDataEntity, message);
break; break;
} }
//} }
i++; i++;
} }
} }