一键导出报关要素增加复选框：型号+料号、型号+用户填写

src/main/java/com/xujie/sys/modules/ecss/entity/EcssDeclarationHeaderData.java

@@ -71,4 +71,5 @@ public class EcssDeclarationHeaderData extends EcssDeclarationHeader{
     private Boolean showWeight;
     private BigDecimal allWeight;
     private Boolean mexicoShippingMarkFlag;
+    private String modelContentStr;
 }

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java

@@ -2527,7 +2527,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
             Map fMap = list.get(i);
             String key = fMap.get("hsCode")+"&"+fMap.get("hsCodeDesc");
             List<String> skuList = hsCodeSkuListMap.get(key);
-            String formattedSku = formatSkuList(skuList);
+            String formattedSku = StringUtils.isNotBlank(data.getModelContentStr()) ? formatModelContent(data.getModelContentStr()) : formatSkuList(skuList);
             fMap.put("sku", formattedSku);
             fMap.put("content", "HS Code：     "+fMap.get("hsCode")+
                     "\n品名：     "+(data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N")?fMap.get("hsCodeDescEn"):fMap.get("hsCodeDesc"))+
@@ -2537,6 +2537,18 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
         template.addListVarAll(list);
     }
 
+    /**
+     * 格式化自定义型号内容，换行后添加17个空格
+     *
+     * @param modelContentStr 自定义型号内容
+     * @return 格式化后的型号内容
+     */
+    private String formatModelContent(String modelContentStr) {
+        return modelContentStr.replace("\r\n", "\n")
+                .replace("\r", "\n")
+                .replace("\n", "\n                 ");
+    }
+
     /**
      * 格式化SKU列表，每3个一行，从第2行开始前面加17个空格
      *