fix:
1.外销合同【销售单价价格条款向上取整】
This commit is contained in:
parent
8cc5b85032
commit
4227fdc87d
@ -276,7 +276,13 @@ public class ClientUtils {
|
||||
models.setValue("yem_exwrmbprice", fobPriceAmount, rowInfo);
|
||||
}
|
||||
if (yem_exrate.compareTo(BigDecimal.ZERO) != 0) {
|
||||
models.setValue("yem_price", (fobPrice.add(pricefob)).divide(yem_exrate,2, RoundingMode.HALF_UP), rowInfo);
|
||||
DynamicObjectCollection yemEsMaterialinfo = models.getEntryEntity("yem_es_materialinfo");
|
||||
String yemBusinesssort = yemEsMaterialinfo.get(rowInfo).getString("yem_businesssort");
|
||||
if (yemBusinesssort.equals("Z")) {
|
||||
models.setValue("yem_price", (fobPrice.add(pricefob)).divide(yem_exrate, RoundingMode.UP), rowInfo);
|
||||
} else {
|
||||
models.setValue("yem_price", (fobPrice.add(pricefob)).divide(yem_exrate, 2, RoundingMode.HALF_UP), rowInfo);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -315,7 +321,13 @@ public class ClientUtils {
|
||||
models.setValue("yem_exwrmbprice", fobPriceAmount, rowInfo);
|
||||
}
|
||||
if (yem_exrate.compareTo(BigDecimal.ZERO) != 0) {
|
||||
models.setValue("yem_price", (fobPrice.add(pricefob)).divide(yem_exrate, 2,RoundingMode.HALF_UP), rowInfo);
|
||||
DynamicObjectCollection yemEsMaterialinfo = models.getEntryEntity("yem_es_materialinfo");
|
||||
String yemBusinesssort = yemEsMaterialinfo.get(rowInfo).getString("yem_businesssort");
|
||||
if (yemBusinesssort.equals("Z")) {
|
||||
models.setValue("yem_price", (fobPrice.add(pricefob)).divide(yem_exrate, RoundingMode.UP), rowInfo);
|
||||
} else {
|
||||
models.setValue("yem_price", (fobPrice.add(pricefob)).divide(yem_exrate, 2, RoundingMode.HALF_UP), rowInfo);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -396,7 +408,7 @@ public class ClientUtils {
|
||||
if (yem_exrate.compareTo(BigDecimal.ZERO) != 0) {
|
||||
DynamicObjectCollection coll = getTypeColl(models);
|
||||
// if (!isFCAPriceItem(coll, rowInfo)) {
|
||||
models.setValue("yem_safobprice", dm.getBigDecimal("yem_standsalesprice").divide(yem_exrate,2, RoundingMode.HALF_UP), rowInfo);
|
||||
models.setValue("yem_safobprice", dm.getBigDecimal("yem_standsalesprice").divide(yem_exrate, 2, RoundingMode.HALF_UP), rowInfo);
|
||||
// }
|
||||
}
|
||||
} else {
|
||||
@ -550,9 +562,9 @@ public class ClientUtils {
|
||||
BigDecimal truecaramt = (BigDecimal) model.getValue("yem_truecaramt", rowNow); // 实际整车金额
|
||||
BigDecimal qty = (BigDecimal) model.getValue("yem_qty", rowNow);
|
||||
// model.setValue("yem_truecarprice", BigDecimalUtils.div(truecaramt, qty, 2), rowNow);
|
||||
if (qty.compareTo(BigDecimal.ZERO)>0){
|
||||
model.setValue("yem_truecarprice", truecaramt.divide(qty,2, RoundingMode.HALF_UP), rowNow);
|
||||
}else {
|
||||
if (qty.compareTo(BigDecimal.ZERO) > 0) {
|
||||
model.setValue("yem_truecarprice", truecaramt.divide(qty, 2, RoundingMode.HALF_UP), rowNow);
|
||||
} else {
|
||||
model.setValue("yem_truecarprice", 0, rowNow);
|
||||
}
|
||||
} else {
|
||||
@ -733,7 +745,7 @@ public class ClientUtils {
|
||||
model.setValue("yem_safobpricebase", exrate.multiply(safobprice), i);
|
||||
BigDecimal safobamount = (BigDecimal) model.getValue("yem_safobamount", i);
|
||||
model.setValue("yem_safobamountbase", safobamount.multiply(exrate), i);
|
||||
BigDecimal sapricepriceclause = (BigDecimal) model.getValue("yem_sapricepriceclause", i);
|
||||
// BigDecimal sapricepriceclause = (BigDecimal) model.getValue("yem_sapricepriceclause", i);
|
||||
// model.setValue("yem_sapriceclausebase", exrate.multiply(sapricepriceclause), i);
|
||||
|
||||
|
||||
@ -776,7 +788,7 @@ public class ClientUtils {
|
||||
public static void countPjSaFobPrice(IDataModel model, int row) {
|
||||
BigDecimal exrate = (BigDecimal) model.getValue("yem_exrate");
|
||||
BigDecimal fobPrice = (BigDecimal) model.getValue("yem_fobprice", row);
|
||||
model.setValue("yem_safobprice", fobPrice.divide(exrate,2, RoundingMode.HALF_UP), row);
|
||||
model.setValue("yem_safobprice", fobPrice.divide(exrate, 2, RoundingMode.HALF_UP), row);
|
||||
}
|
||||
|
||||
|
||||
@ -792,7 +804,7 @@ public class ClientUtils {
|
||||
BigDecimal exrate = (BigDecimal) model.getValue("yem_exrate");
|
||||
int entryRowCount = model.getEntryRowCount(entryKey);
|
||||
for (int i = 0; i < entryRowCount; i++) {
|
||||
BigDecimal saPricePriceClause = (BigDecimal) model.getValue("yem_sapricepriceclause", i);
|
||||
// BigDecimal saPricePriceClause = (BigDecimal) model.getValue("yem_sapricepriceclause", i);
|
||||
// model.setValue("yem_sapriceclausebase",saPricePriceClause.multiply(exrate),i);//赋值 销售单价（价格条款人民币）
|
||||
|
||||
BigDecimal saBobAmount = (BigDecimal) model.getValue("yem_safobamount", i);
|
||||
@ -809,7 +821,7 @@ public class ClientUtils {
|
||||
fobPrice = (BigDecimal) model.getValue("yem_fobprice", i);
|
||||
}
|
||||
if (exrate.compareTo(BigDecimal.ZERO) != 0) {
|
||||
model.setValue("yem_safobprice", fobPrice.divide(exrate, 2,RoundingMode.HALF_UP), i);
|
||||
model.setValue("yem_safobprice", fobPrice.divide(exrate, 2, RoundingMode.HALF_UP), i);
|
||||
} else {
|
||||
model.setValue("yem_safobprice", BigDecimal.ZERO, i);
|
||||
}
|
||||
@ -1239,10 +1251,10 @@ public class ClientUtils {
|
||||
BigDecimal priceFieldAccBa = (BigDecimal) model.getValue("yem_pricefieldaccba", row);//资源配置单价
|
||||
BigDecimal oneCarSum = (BigDecimal) model.getValue("yem_onecarsum", row);//单车总费用
|
||||
BigDecimal saamtpriceclause = (BigDecimal) model.getValue("yem_saamtpriceclause", row);// 销售金额（价格条款）
|
||||
if (qty.compareTo(BigDecimal.ZERO)>0){
|
||||
model.setValue("yem_sapricepriceclause", saamtpriceclause.divide(qty,2, RoundingMode.HALF_UP), row);
|
||||
}else {
|
||||
model.setValue("yem_sapricepriceclause",0,row);
|
||||
if (qty.compareTo(BigDecimal.ZERO) > 0) {
|
||||
model.setValue("yem_sapricepriceclause", saamtpriceclause.divide(qty, 2, RoundingMode.HALF_UP), row);
|
||||
} else {
|
||||
model.setValue("yem_sapricepriceclause", 0, row);
|
||||
}
|
||||
|
||||
// if (afterFrontDisPrice.compareTo(BigDecimal.ZERO) > 0) {
|
||||
@ -1326,7 +1338,7 @@ public class ClientUtils {
|
||||
BigDecimal onecarsum = (BigDecimal) model.getValue("yem_onecarsum", row);//单车总费用
|
||||
BigDecimal pricefieldaccba = (BigDecimal) model.getValue("yem_pricefieldaccba", row);//资源配件单价
|
||||
BigDecimal add = afterfrontdisprice.add(onecarsum).add(pricefieldaccba);
|
||||
add = add.setScale(2, RoundingMode.HALF_UP);
|
||||
add = add.setScale(0, RoundingMode.UP);
|
||||
model.setValue("yem_sapricepriceclause", add, row);
|
||||
}
|
||||
|
||||
@ -1353,7 +1365,7 @@ public class ClientUtils {
|
||||
BigDecimal afterfrontdisprice = (BigDecimal) model.getValue("yem_afterfrontdisprice", row);
|
||||
BigDecimal onecarsum = (BigDecimal) model.getValue("yem_onecarsum", row);
|
||||
BigDecimal add = afterfrontdisprice.add(onecarsum);
|
||||
add = add.setScale(2, RoundingMode.HALF_UP);
|
||||
add = add.setScale(0, RoundingMode.HALF_UP);
|
||||
model.setValue("yem_truecarprice", add, row);
|
||||
}
|
||||
|
||||
@ -1617,7 +1629,7 @@ public class ClientUtils {
|
||||
if (!ifGift) {
|
||||
BigDecimal saFobAmount = (BigDecimal) model.getValue("yem_safobamount", i);
|
||||
//20/40*10
|
||||
BigDecimal diaAmt = saFobAmount.divide(amount,RoundingMode.HALF_UP).multiply(fundPoolAmt).setScale(2, RoundingMode.HALF_UP);
|
||||
BigDecimal diaAmt = saFobAmount.divide(amount, RoundingMode.HALF_UP).multiply(fundPoolAmt).setScale(2, RoundingMode.HALF_UP);
|
||||
if (i == seq) {
|
||||
model.beginInit();
|
||||
view.updateView("yem_disamt", i);
|
||||
@ -1726,7 +1738,7 @@ public class ClientUtils {
|
||||
BigDecimal afterFrontDisAmt = (BigDecimal) model.getValue("yem_afterfrontdisamt", row);
|
||||
BigDecimal qty = (BigDecimal) model.getValue("yem_qty", row);
|
||||
if (qty.compareTo(BigDecimal.ZERO) > 0) {
|
||||
model.setValue("yem_afterfrontdisprice", afterFrontDisAmt.divide(qty, 2 ,RoundingMode.HALF_UP), row);
|
||||
model.setValue("yem_afterfrontdisprice", afterFrontDisAmt.divide(qty, 2, RoundingMode.HALF_UP), row);
|
||||
} else {
|
||||
model.setValue("yem_afterfrontdisprice", null, row);
|
||||
}
|
||||
@ -1910,9 +1922,11 @@ public class ClientUtils {
|
||||
BigDecimal standardprice = (BigDecimal) model.getValue("yem_standardprice", idx);//标配FOB（青岛）价
|
||||
BigDecimal exrate = (BigDecimal) model.getValue("yem_exrate");//汇率
|
||||
// BigDecimal calc = BigDecimalUtils.div(standardprice, exrate, 10);
|
||||
BigDecimal calc = standardprice.divide(exrate,10,RoundingMode.HALF_UP);
|
||||
calc = calc.setScale(0, RoundingMode.UP);
|
||||
model.setValue("yem_sastandardfcaprice", calc, idx);
|
||||
if (standardprice.compareTo(BigDecimal.ZERO) != 0 && exrate.compareTo(BigDecimal.ZERO) != 0) {
|
||||
BigDecimal calc = standardprice.divide(exrate, 10, RoundingMode.HALF_UP);
|
||||
calc = calc.setScale(0, RoundingMode.UP);
|
||||
model.setValue("yem_sastandardfcaprice", calc, idx);
|
||||
}
|
||||
}
|
||||
|
||||
// }
|
||||
@ -2161,7 +2175,7 @@ public class ClientUtils {
|
||||
}
|
||||
|
||||
/**
|
||||
* 选择基础机型、携带基础机型中产品机型的吨数、方数
|
||||
* 选择基础机型、携带基础机型中产品机型的吨数
|
||||
*
|
||||
* @param model 外销合同
|
||||
* @param idx 明细行
|
||||
@ -2173,9 +2187,7 @@ public class ClientUtils {
|
||||
if (YEM.isNotEmpty(products)) {
|
||||
products = BusinessDataServiceHelper.loadSingle(products.getPkValue(), products.getDynamicObjectType().getName());
|
||||
BigDecimal tons = products.getBigDecimal("yem_tons");
|
||||
BigDecimal numbersquares = products.getBigDecimal("yem_numbersquares");
|
||||
model.setValue("yem_tonsqty", tons, idx);
|
||||
model.setValue("yem_squareqty", numbersquares, idx);
|
||||
}
|
||||
} else {
|
||||
model.setValue("yem_tonsqty", BigDecimal.ZERO, idx);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user