yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
mzr 2025-04-18 08:41:16 +08:00
parent fa7b31cf70 ce99f9aeb1
commit 408a0d3448
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arap/src/public/nc/api/arap/resource/GatheringbillRestResource.java
View File

@ -138,7 +138,7 @@ public class GatheringbillRestResource extends ArapBaseRestResource {
Object tr = dao.executeQuery(
"select ntaxrate from so_saleorder_b where csaleorderid = '" + csaleorderid + "'",
new ColumnProcessor());
ntaxrate = new UFDouble(tr.toString());
//ntaxrate = new UFDouble(tr.toString());
// 税码
Object ctaxcodeid = hybo.findColValue("so_saleorder_b", "ctaxcodeid",
"csaleorderid = '" + csaleorderid + "' ");
@ -240,8 +240,12 @@ public class GatheringbillRestResource extends ArapBaseRestResource {
itemvo.setNotax_cr(notax_cr);
// zhangxinah增加组织本币无税金额(贷方)
itemvo.setLocal_notax_cr(notax_cr);
//
itemvo.setRate(UFDouble.ZERO_DBL);
// 汇率为空时，默认为1
if (headvo.getRate() == null) {
itemvo.setRate(UFDouble.ONE_DBL);
} else {
itemvo.setRate(headvo.getRate());
}
//
itemvo.setTaxcodeid(ctaxcode);
//
@ -249,7 +253,8 @@ public class GatheringbillRestResource extends ArapBaseRestResource {
// 收支项目
itemvo.setPk_subjcode("201");
money = money.add(itemvo.getMoney_cr());
itemvo.setLocal_money_cr(itemvo.getMoney_cr());
itemvo.setLocal_money_cr(
itemvo.getMoney_cr().multiply(itemvo.getRate()).setScale(2, UFDouble.ROUND_HALF_UP));
Object def2 = itemvo.getDef2();
if (def2 != null)
itemvo.setDef2(hybo.findColValue("bd_defdoc", "pk_defdoc", " code = '" + def2 + "' ") + "");
@ -288,8 +293,8 @@ public class GatheringbillRestResource extends ArapBaseRestResource {
headvo.setMoney(money);
headvo.setGloballocal(money);
headvo.setRate(new UFDouble(1));
headvo.setLocal_money(money);
// headvo.setRate(new UFDouble(1));
headvo.setLocal_money(money.multiply(headvo.getRate()).setScale(2, UFDouble.ROUND_HALF_UP));
AggGatheringBillVO bill = new AggGatheringBillVO();
bill.setParentVO(headvo);
bill.setChildrenVO((CircularlyAccessibleValueObject[]) itemvos.toArray(new GatheringBillItemVO[0]));