From 8cc5b850328d1cec11b71045cabc2c534ec74539 Mon Sep 17 00:00:00 2001 From: ljw Date: Wed, 6 Nov 2024 21:24:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=202.=E5=A4=96=E9=94=80=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86=203.=E8=AE=A2=E8=88=B1?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95=E6=97=A5=E6=9C=9F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wm/im/clientdemand/utils/ClientUtils.java | 20 ++++--------------- .../csrCreditLine/form/CsrCreditLineEdit.java | 2 +- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java index d1223607..ed6d7f7d 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java +++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java @@ -276,13 +276,7 @@ public class ClientUtils { models.setValue("yem_exwrmbprice", fobPriceAmount, rowInfo); } if (yem_exrate.compareTo(BigDecimal.ZERO) != 0) { - 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.HALF_UP), rowInfo); - }else { - models.setValue("yem_price", (fobPrice.add(pricefob)).divide(yem_exrate,2, RoundingMode.HALF_UP), rowInfo); - } + models.setValue("yem_price", (fobPrice.add(pricefob)).divide(yem_exrate,2, RoundingMode.HALF_UP), rowInfo); } } @@ -321,13 +315,7 @@ public class ClientUtils { models.setValue("yem_exwrmbprice", fobPriceAmount, rowInfo); } if (yem_exrate.compareTo(BigDecimal.ZERO) != 0) { - 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.HALF_UP), rowInfo); - }else { - models.setValue("yem_price", (fobPrice.add(pricefob)).divide(yem_exrate, 2,RoundingMode.HALF_UP), rowInfo); - } + models.setValue("yem_price", (fobPrice.add(pricefob)).divide(yem_exrate, 2,RoundingMode.HALF_UP), rowInfo); } } @@ -1338,7 +1326,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(0, RoundingMode.HALF_UP); + add = add.setScale(2, RoundingMode.HALF_UP); model.setValue("yem_sapricepriceclause", add, row); } @@ -1365,7 +1353,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(0, RoundingMode.HALF_UP); + add = add.setScale(2, RoundingMode.HALF_UP); model.setValue("yem_truecarprice", add, row); } diff --git a/src/main/java/com/yem/wm/im/csrCreditLine/form/CsrCreditLineEdit.java b/src/main/java/com/yem/wm/im/csrCreditLine/form/CsrCreditLineEdit.java index 15d3568a..fb62dcae 100644 --- a/src/main/java/com/yem/wm/im/csrCreditLine/form/CsrCreditLineEdit.java +++ b/src/main/java/com/yem/wm/im/csrCreditLine/form/CsrCreditLineEdit.java @@ -125,7 +125,7 @@ public class CsrCreditLineEdit extends AbstractBillPlugIn { long millisDifference = yemRecentlapse.getTime() - newdate.getTime(); long daysDifference = TimeUnit.MILLISECONDS.toDays(millisDifference); BigDecimal bigDecimalDaysDifference = BigDecimal.valueOf(daysDifference); - dynamicObject.set("yem_countdown",bigDecimalDaysDifference); + dynamicObject.set("yem_countdown",bigDecimalDaysDifference.add(BigDecimal.ONE)); // } else { // csrcreditline.set("yem_unused", yemRecentlapse); }