格式

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

@@ -1789,15 +1789,6 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                     templateAdapter.clearAll();
                     extractedContract(data, templateAdapter);
                     template.render(4);
-                    // 出货通知
-                    templateAdapter.clearAll();
-                    extractedShippingNotice(templateAdapter, notifyHeader);
-                    template.render(5);
-                } else {
-                    //  出货通知
-                    templateAdapter.clearAll();
-                    extractedShippingNotice(templateAdapter, notifyHeader);
-                    template.render(4);
                 }
             } else {
                 String xlsx = "templates/ALPHA/declaration-all-template-pdf.xlsx";
@@ -2076,11 +2067,11 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
             List<String> skuList = hsCodeSkuListMap.get(key);
             String formattedSku = 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"))+
+            fMap.put("content", "HS  Code：     "+fMap.get("hsCode")+
+                    "\n品        名：     "+(data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N")?fMap.get("hsCodeDescEn"):fMap.get("hsCodeDesc"))+
                     "\n"+fMap.get("properties")+
-                    (fMap.get("brand")!=null&&StringUtils.isNotEmpty((String) fMap.get("brand"))?"\n品牌：     "+fMap.get("brand"):"")+
-                    "\n型号：     "+formattedSku);
+                    (fMap.get("brand")!=null&&StringUtils.isNotEmpty((String) fMap.get("brand"))?"\n品        牌：     "+fMap.get("brand"):"")+
+                    "\n型        号：     "+formattedSku);
         }
         template.addListVarAll(list);
     }
@@ -2102,7 +2093,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 // 每3个换行
                 if (i % 3 == 0) {
                     // 换行后添加17个空格
-                    result.append("\n                ");
+                    result.append("\n                         ");
                 } else {
                     // 否则用逗号分隔
                     result.append(",");