云帆bug修复

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/prove/pdf/service/impl/CustomsDeclareServiceImpl.java

@@ -145,7 +145,8 @@ public class CustomsDeclareServiceImpl implements ICustomsDeclareService {
         company = Optional.ofNullable(company).orElse(new Company());
 
         //根据批次号获取箱子的总毛重、净重
-        Map<String, BigDecimal> packingWeightMap = iShipmentPackingService.getPackingWeightByBatchCode(tenantId, billProve.getBatchCode());
+        Map<String, BigDecimal> packingWeightMap = iShipmentPackingService
+                .getPackingWeightByBatchCode(tenantId, billProve.getBatchCode());
 
         //商品总数量
         long sumCount = 0L;
@@ -153,7 +154,8 @@ public class CustomsDeclareServiceImpl implements ICustomsDeclareService {
         Integer totalBoxes = 0;
         List<ShipmentPackingProduct> products = new ArrayList<>();
         //根据批次号查询装箱产品
-        List<ShipmentPackingProduct> shipmentPackingProducts = iShipmentPackingProductService.getByBatchCode2(billProve.getTenantId(), billProve.getBatchCode());
+        List<ShipmentPackingProduct> shipmentPackingProducts = iShipmentPackingProductService
+                .getByBatchCode2(billProve.getTenantId(), billProve.getBatchCode());
         if (CollectionUtils.isNotEmpty(shipmentPackingProducts)) {
             //按照产品id分组，一样的合在一起
             Map<String, List<ShipmentPackingProduct>> map = shipmentPackingProducts.stream().collect(Collectors.groupingBy(ShipmentPackingProduct::getContractProductId));
@@ -218,7 +220,8 @@ public class CustomsDeclareServiceImpl implements ICustomsDeclareService {
     @Override
     public BillProvePdfData dataDetails(String billProveId, boolean isLineFeed) {
         //获取单证PDF数据
-        BillProvePdfData pdfData = iBillProvePdfDataService.getByBillProveIdAndDataType(billProveId, BillProvePdfDataConstant.DataType.CUSTOMS_DECLARATION);
+        BillProvePdfData pdfData = iBillProvePdfDataService.
+                getByBillProveIdAndDataType(billProveId, BillProvePdfDataConstant.DataType.CUSTOMS_DECLARATION);
         if (Func.isEmpty(pdfData)) {
             JSONObject data = new JSONObject();
             List<JSONObject> productData = new ArrayList<>();

bladex-saas-project/saas-business-tradeerp/src/main/resources/templates/customs_declare.html

@@ -302,7 +302,7 @@
                 <span>境内货源地：</span>
             </td>
             <td colspan="3" style="background-color: #ebf1de; text-align: left; padding-left: 4px;">
-                <span th:text="${cityChinese}" />
+                <span th:text="${withinChinaSource}" />
             </td>
         </tr>
     </table>

bladex-saas-project/saas-business-tradeerp/src/main/resources/templates/customs_declare_EHSD.html

@@ -302,7 +302,7 @@
                 <span>境内货源地：</span>
             </td>
             <td colspan="3" style="background-color: #ebf1de; text-align: left; padding-left: 4px;">
-                <span th:text="${cityChinese}" />
+                <span th:text="${withinChinaSource}" />
             </td>
         </tr>
     </table>