violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:

Browse Source 
2.外销合同报错处理
3.订舱通知单日期增加一天
This commit is contained in:
ljw 2024-11-06 21:24:14 +08:00
parent 39feb3744a
commit 8cc5b85032
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
View File

@ -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);
}

2
src/main/java/com/yem/wm/im/csrCreditLine/form/CsrCreditLineEdit.java
View File

@ -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);
}