diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java index 5c2663c8..3411f0a2 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java @@ -1660,8 +1660,11 @@ public class CoDelServiceImpl implements CoDelService { +" "+"纯FSC纸重量:"+ fscWeight(partNoAndItemNoMap,partNo, totalQty, nodifyData.getLossratio()); } - String hsCodeDesc = "\n"+(data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N") - ?eorder.get("hsCodeDescEn") :eorder.get("hsCodeDesc")); + String hsCodeDesc = ""; + if (notifyHeader.getBuNo().equals("04-MHM") || notifyHeader.getBuNo().equals("02-Hardtag")) { + hsCodeDesc = "\n"+(data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N") + ?eorder.get("hsCodeDescEn") :eorder.get("hsCodeDesc")); + } eorder.put("artNo", eorder.get("part_description") + "\n" + "PO:" + eorder.get("customerPO") + " HS Code:" + eorder.get("hsCode")+ hsCodeDesc + lossratio + (data.getUpc()!=null && data.getUpc()?"\n" + "UPC:"+ eorder.get("upc"):"")