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

Revert "fix："

Browse Source 
This reverts commit 7fa44151ae.
This commit is contained in:
ljw 2025-01-21 11:33:31 +08:00
parent 5863306307
commit ac0d0122e6
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceSaveOP.java
View File

@ -81,29 +81,25 @@ public class ExportInvoiceSaveOP extends AbstractOperationServicePlugIn {
String yemLadbillnum = dataEntitie.getString("yem_ladbillnum");//提单号 String yemLadbillnum = dataEntitie.getString("yem_ladbillnum");//提单号
// queryString//合同号 // queryString//合同号
DynamicObjectCollection yem_shipports = dataEntitie.getDynamicObjectCollection("yem_shipports");//起运港 DynamicObjectCollection yem_shipports = dataEntitie.getDynamicObjectCollection("yem_shipports");//起运港
if (!YEM.isEmpty(yem_shipports) && !yem_shipports.isEmpty()) { if (!YEM.isEmpty(yem_shipports)&& !yem_shipports.isEmpty()) {
for (DynamicObject yemShipport : yem_shipports) { for (DynamicObject yemShipport : yem_shipports) {
if (yemShipport != null) {
String ssa = yemShipport.getDynamicObject("fbasedataid").getString("name");//起运港 String ssa = yemShipport.getDynamicObject("fbasedataid").getString("name");//起运港
yemShipports.append(ssa); yemShipports.append(ssa);
} }
} }
}
DynamicObjectCollection yem_Destports = dataEntitie.getDynamicObjectCollection("yem_destports");//目的港 DynamicObjectCollection yem_Destports = dataEntitie.getDynamicObjectCollection("yem_destports");//目的港
if (!YEM.isEmpty(yem_Destports) && !yem_Destports.isEmpty()) { if (!YEM.isEmpty(yem_Destports)&& !yem_Destports.isEmpty()) {
for (DynamicObject yemShipport : yem_Destports) { for (DynamicObject yemShipport : yem_Destports) {
if (yemShipport != null) {
String string = yemShipport.getDynamicObject("fbasedataid").getString("name"); String string = yemShipport.getDynamicObject("fbasedataid").getString("name");
yemDestports.append(string);//目的港 yemDestports.append(string);//目的港
} }
} }
}
BigDecimal stripTrailingZeros = new BigDecimal(totalAmount.toPlainString().replaceAll("0*$", "").replaceAll("\\.$", "")); BigDecimal stripTrailingZeros = new BigDecimal(totalAmount.toPlainString().replaceAll("0*$", "").replaceAll("\\.$", ""));
BigDecimal stripTrailingZeros1 = new BigDecimal(yemSeatransfee.toPlainString().replaceAll("0*$", "").replaceAll("\\.$", "")); BigDecimal stripTrailingZeros1 = new BigDecimal(yemSeatransfee.toPlainString().replaceAll("0*$", "").replaceAll("\\.$", ""));
BigDecimal stripTrailingZeros2 = new BigDecimal(yemInsurefee.toPlainString().replaceAll("0*$", "").replaceAll("\\.$", "")); BigDecimal stripTrailingZeros2 = new BigDecimal(yemInsurefee.toPlainString().replaceAll("0*$", "").replaceAll("\\.$", ""));
dataEntitie.set("yem_remark", yemTradeway + " 成交总额:" + yemSettlement + stripTrailingZeros + " 汇率:" + yemExrate.stripTrailingZeros() dataEntitie.set("yem_remark", yemTradeway + " 成交总额:" + yemSettlement + stripTrailingZeros + " 汇率:" + yemExrate.stripTrailingZeros()
+ "\r\n 海运费:" + yemseatransfeecurr + stripTrailingZeros1 + " 保险费:" + yeminsurefeecurr + stripTrailingZeros2 + "\r\n 海运费:"+ yemseatransfeecurr + stripTrailingZeros1 + " 保险费:" + yeminsurefeecurr + stripTrailingZeros2
+ "\r\n 提单号:" + yemLadbillnum + "\r\n 合同号:" + queryString + "\r\n 起运港:" + yemShipports + "\r\n 目的港:" + yemDestports); + "\r\n 提单号:"+ yemLadbillnum + "\r\n 合同号:"+ queryString + "\r\n 起运港:" + yemShipports + "\r\n 目的港:" + yemDestports);
} }
} }
} }