英文品名

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

@@ -2120,6 +2120,10 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 designationContent = eorder.get("part_description")  + "\n"
                         + "PO:" + eorder.get("customerPO")+ (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?"   HS CODE:" + eorder.get("hsCode"):"");
             }
+            if (notifyHeader.getBuNo().equals("04-MHM")) {
+                designationContent = designationContent + "\n"+(data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N")
+                        ?(eorder.get("hsCodeDescEn")!=null?eorder.get("hsCodeDescEn"):"") :eorder.get("hsCodeDesc"));
+            }
             eorder.put("designation", designationContent);
 
             // 计算designation内容的行数，动态设置行高
@@ -2287,6 +2291,10 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 String artNoContent = eorder.get("pn")+"    "  + eorder.get("part_description")  + "\n"
                         + "   PO#" + eorder.get("po_no") +
                         (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?"   HS CODE#" + eorder.get("hsCode"):"");
+                if (notifyHeader.getBuNo().equals("04-MHM")) {
+                    artNoContent = artNoContent + "\n"+(data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N")
+                            ?(eorder.get("hsCodeDescEn")!=null?eorder.get("hsCodeDescEn"):"") :eorder.get("hsCodeDesc"));
+                }
                 eorder.put("artNo", artNoContent);
                 // 计算artNo内容的行数，动态设置行高
                 int lineCount = calculateLineCount(artNoContent);