Commit 100c0bb6 authored by lanbaoming's avatar lanbaoming

2024-04-29 修补单位为空的BUG

parent 080dfd51
...@@ -444,11 +444,17 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin ...@@ -444,11 +444,17 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
// } // }
paramMap.put("seaFreight", item.getOneSeaFreight() + currencyMap.get(item.getSeaFreightCurrency()) + "/m³"); paramMap.put("seaFreight", item.getOneSeaFreight() + currencyMap.get(item.getSeaFreightCurrency()) + "/m³");
if (item.getOneClearanceFreight().compareTo(BigDecimal.ZERO) == 0) { if (item.getOneClearanceFreight().compareTo(BigDecimal.ZERO) == 0) {
paramMap.put("clearanceFreight", "0" + currencyMap.get(item.getClearanceFreightCurrency()) + "/m³"); if (item.getClearanceFreightCurrency() == null) {
paramMap.put("clearanceFreight", "0");
} else {
paramMap.put("clearanceFreight",
"0" + currencyMap.get(item.getClearanceFreightCurrency()) + "/m³");
//paramMap.put("clearanceFreight", ""); //paramMap.put("clearanceFreight", "");
//lanbm 2024-04-25 update 提单制作,清关价为0问题修改 //lanbm 2024-04-25 update 提单制作,清关价为0问题修改
}
} else { } else {
paramMap.put("clearanceFreight", item.getOneClearanceFreight() + currencyMap.get(item.getClearanceFreightCurrency()) + "/m³"); paramMap.put("clearanceFreight",
item.getOneClearanceFreight() + currencyMap.get(item.getClearanceFreightCurrency()) + "/m³");
} }
return paramMap; return paramMap;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
...@@ -750,7 +756,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin ...@@ -750,7 +756,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
} }
if (makeBillOfLadingListBackVO.getDraweeCode() == 1) { if (makeBillOfLadingListBackVO.getDraweeCode() == 1) {
makeBillOfLadingListBackVO.setDrawee("付款人=发货人"); makeBillOfLadingListBackVO.setDrawee("付款人=发货人");
} else if(makeBillOfLadingListBackVO.getDraweeCode() == 3) { } else if (makeBillOfLadingListBackVO.getDraweeCode() == 3) {
makeBillOfLadingListBackVO.setDrawee("付款人=自定义"); makeBillOfLadingListBackVO.setDrawee("付款人=自定义");
} }
// List typeList = new ArrayList(); // List typeList = new ArrayList();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment