订货单：打印模板增加目的地

@@ -459,6 +459,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                     dataMap.put("performanceance", data.getPerformance());
                     dataMap.put("performanceance", data.getPerformance());
                     dataMap.put("packaging", data.getPackaging());
                     dataMap.put("packaging", data.getPackaging());
                     dataMap.put("shippingCost", data.getShippingCost());
                     dataMap.put("shippingCost", data.getShippingCost());
+                    dataMap.put("destination", ExcelUtil.buildPrintDestination(data.getContractType(), data.getDestination(), data.getForeignDestination()));
                     dataMap.put("remarks", data.getRemarks());
                     dataMap.put("remarks", data.getRemarks());
                     dataMap.put("createUser", data.getCreateBy());
                     dataMap.put("createUser", data.getCreateBy());
                     dataMap.put("element", data.getElement());
                     dataMap.put("element", data.getElement());

@@ -258,6 +258,7 @@ public class BusinessDataExportHandler implements ExportHandler {
                     dataMap.put("performanceance", orderInfo.getPerformance());
                     dataMap.put("performanceance", orderInfo.getPerformance());
                     dataMap.put("packaging", orderInfo.getPackaging());
                     dataMap.put("packaging", orderInfo.getPackaging());
                     dataMap.put("shippingCost", orderInfo.getShippingCost());
                     dataMap.put("shippingCost", orderInfo.getShippingCost());
+                    dataMap.put("destination", ExcelUtil.buildPrintDestination(orderInfo.getContractType(), orderInfo.getDestination(), orderInfo.getForeignDestination()));
                     dataMap.put("remarks", orderInfo.getRemarks());
                     dataMap.put("remarks", orderInfo.getRemarks());
                     dataMap.put("createUser", orderInfo.getCreateBy());
                     dataMap.put("createUser", orderInfo.getCreateBy());
                     dataMap.put("element", orderInfo.getElement());
                     dataMap.put("element", orderInfo.getElement());

@@ -131,8 +131,12 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
 
 
     @Override
     @Override
     public PurchaseOrderInfo findById(String id) {
     public PurchaseOrderInfo findById(String id) {
-
-        return getBaseMapper().findById(id);
+        PurchaseOrderInfo data = getBaseMapper().findById(id);
+        if (data == null) {
+            return null;
+        }
+        fillContractDestination(data);
+        return data;
     }
     }
 
 
     @Override
     @Override
@@ -763,17 +767,46 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         }
         }
         Map<String, ContractDistributorStandard> contractMap = contractList.stream().collect(Collectors.toMap(ContractDistributorStandard::getId, Function.identity()));
         Map<String, ContractDistributorStandard> contractMap = contractList.stream().collect(Collectors.toMap(ContractDistributorStandard::getId, Function.identity()));
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
-            String contractId = orderInfo.getContractId();
-            ContractDistributorStandard contract = contractMap.get(contractId);
-            if (contract == null) {
-                continue;
-            }
-            orderInfo.setDestination(contract.getDestination());
-            orderInfo.setForeignDestination(contract.getForeignDestination());
+            fillContractDestination(orderInfo, contractMap);
         }
         }
         return orderInfoList;
         return orderInfoList;
     }
     }
 
 
+    /**
+     * 回填订货单上的合同目的地字段，供打印等场景使用。
+     *
+     * @param orderInfo 订货单
+     */
+    private void fillContractDestination(PurchaseOrderInfo orderInfo) {
+        if (orderInfo == null || StringUtils.isBlank(orderInfo.getContractId())) {
+            return;
+        }
+        ContractDistributorStandard contract = contractDistributorStandardService.findById(orderInfo.getContractId());
+        if (contract == null) {
+            return;
+        }
+        orderInfo.setDestination(contract.getDestination());
+        orderInfo.setForeignDestination(contract.getForeignDestination());
+    }
+
+    /**
+     * 根据合同映射批量回填订货单上的合同目的地字段。
+     *
+     * @param orderInfo    订货单
+     * @param contractMap  合同映射
+     */
+    private void fillContractDestination(PurchaseOrderInfo orderInfo, Map<String, ContractDistributorStandard> contractMap) {
+        if (orderInfo == null || contractMap == null || StringUtils.isBlank(orderInfo.getContractId())) {
+            return;
+        }
+        ContractDistributorStandard contract = contractMap.get(orderInfo.getContractId());
+        if (contract == null) {
+            return;
+        }
+        orderInfo.setDestination(contract.getDestination());
+        orderInfo.setForeignDestination(contract.getForeignDestination());
+    }
+
     @Override
     @Override
     public List<PurchaseOrderInfo> listByCustomerIds(List<String> customerIds) {
     public List<PurchaseOrderInfo> listByCustomerIds(List<String> customerIds) {
         if (CollectionUtils.isEmpty(customerIds)) {
         if (CollectionUtils.isEmpty(customerIds)) {

 package com.lframework.xingyun.sc.utils;
 package com.lframework.xingyun.sc.utils;
 
 
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.starter.web.inner.dto.dic.city.DicCityDto;
+import com.lframework.starter.web.inner.service.DicCityService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddress;
 
 
@@ -41,6 +45,76 @@ public class ExcelUtil {
         }
         }
     }
     }
 
 
+    /**
+     * 构建打印使用的目的地文本。
+     * 外贸合同直接展示外贸目的地，其他合同将层级地址中的斜杠替换为中文逗号。
+     *
+     * @param contractType        合同类型
+     * @param destination         普通目的地
+     * @param foreignDestination  外贸目的地
+     * @return                    打印使用的目的地文本
+     */
+    public static String buildPrintDestination(String contractType, String destination, String foreignDestination) {
+        if (isForeignContractType(contractType)) {
+            return StringUtils.defaultString(foreignDestination).trim();
+        }
+
+        String domesticDestination = buildDomesticDestination(destination);
+        if (StringUtils.isNotBlank(domesticDestination)) {
+            return domesticDestination;
+        } else {
+            return "";
+        }
+    }
+
+    /**
+     * 将国内目的地城市ID转换为中文地址路径。
+     *
+     * @param destination 目的地ID
+     * @return            中文地址路径
+     */
+    private static String buildDomesticDestination(String destination) {
+        if (StringUtils.isBlank(destination)) {
+            return "";
+        }
+
+        try {
+            DicCityService dicCityService = ApplicationUtil.getBean(DicCityService.class);
+            List<DicCityDto> allCity = dicCityService.getAll();
+            List<DicCityDto> fullPath = dicCityService.getFullPath(destination, allCity);
+            if (fullPath == null || fullPath.isEmpty()) {
+                return "";
+            }
+
+            StringBuilder builder = new StringBuilder();
+            for (DicCityDto cityDto : fullPath) {
+                if (cityDto == null || StringUtils.isBlank(cityDto.getName())) {
+                    continue;
+                }
+                if (builder.length() > 0) {
+                    builder.append("，");
+                }
+                builder.append(cityDto.getName());
+            }
+            return builder.toString();
+        } catch (Exception e) {
+            log.warn("转换国内目的地失败, destination={}", destination, e);
+            return "";
+        }
+    }
+
+    /**
+     * 判断是否为外贸合同类型。
+     *
+     * @param contractType 合同类型
+     * @return             true=外贸合同
+     */
+    private static boolean isForeignContractType(String contractType) {
+        return "INTL_STD_CONTRACT".equals(contractType)
+                || "INTL_INVENTORY_AGMT".equals(contractType)
+                || "INTL_OPEN_SPEC_AGMT".equals(contractType);
+    }
+
 
 
     /**
     /**
      * 解析占位符
      * 解析占位符