英文品名

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

@@ -2116,11 +2116,9 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
             // 构建designation内容
             String designationContent = eorder.get("part_description")  + "\n"
                     + "PO#" + eorder.get("customerPO")+ (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?"   HS CODE#" + eorder.get("hsCode"):"");
-            if ("02-Hardtag".equalsIgnoreCase(notifyHeader.getBuNo())){
+            if ("02-Hardtag".equalsIgnoreCase(notifyHeader.getBuNo()) || "05-Alpha".equalsIgnoreCase(notifyHeader.getBuNo())){
                 designationContent = eorder.get("part_description")  + "\n"
                         + "PO:" + eorder.get("customerPO")+ (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?"   HS CODE:" + eorder.get("hsCode"):"");
-            } else if ("05-Alpha".equalsIgnoreCase(notifyHeader.getBuNo())){
-                designationContent = eorder.get("part_description")+"";
             }
             eorder.put("designation", designationContent);
 
@@ -2933,7 +2931,8 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
         BigDecimal totalQty = palletDetailList.stream()
                 .map(o -> new BigDecimal(o.get("total_qty").toString()))
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
-        template.addVar("hs_code_desc", sb.toString());
+        template.addVar("hs_code_desc", data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N")?
+                sbEn.toString():sb.toString());
         String hsCodes = nodifyDetailList.stream()
                 .map(m -> Objects.toString(m.get("hsCode"), ""))
                 .filter(s -> !s.isEmpty())   // 去掉空值
@@ -2956,7 +2955,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
         if (isShowOrderNoBu(buNo)) {
             poNoDisplayText = showOrderNoFlag ? formatPoNoForHwDesc(poNoSet) : "";
         }
-        template.addVar("hw_desc", sb + "\n" +poNoDisplayText);
+        template.addVar("hw_desc", (data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N")?sbEn:sb) + "\n" +poNoDisplayText);
         template.addVar("shipping_port", stringInput(notifyHeader.getCnative()));
         template.addVar("cmc_invoice", stringInput(notifyHeader.getCmcInvoice()));
         // 导出时默认，可编辑的栏目