diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java index 58b56a61..f1fcd1da 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java @@ -1810,8 +1810,14 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { Map eorder = ndList.get(i); eorder.put("row_num", i + 1); // 构建designation内容 - String designationContent = eorder.get("pn")+" " + eorder.get("part_description") + "\n" - + " PO#" + eorder.get("customerPO")+" HS CODE#" + eorder.get("hsCode"); + 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())){ + 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); // 计算designation内容的行数,动态设置行高 @@ -1981,7 +1987,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { // 构建artNo内容 String artNoContent = eorder.get("pn")+" " + eorder.get("part_description") + "\n" - + " PO#" + eorder.get("po_no") + + + "PO#" + eorder.get("po_no") + (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?" HS CODE#" + eorder.get("hsCode"):""); eorder.put("artNo", artNoContent); // 计算artNo内容的行数,动态设置行高 @@ -2233,9 +2239,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { eorder.put("net_weight", isFirstRow ? ((BigDecimal) list.get(m).get("net_weight")).setScale(2, RoundingMode.HALF_UP) : ""); // 构建artNo内容 - 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"):""); + String artNoContent = eorder.get("pn")+" " + eorder.get("part_description") ; eorder.put("artNo", artNoContent); // 计算artNo内容的行数,动态设置行高 int lineCount = calculateLineCount(artNoContent); @@ -2484,8 +2488,8 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { // 构建artNo内容 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"):""); + + "PO:" + eorder.get("po_no") + + (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?" HS CODE:" + eorder.get("hsCode"):""); eorder.put("artNo", artNoContent); // 计算artNo内容的行数,动态设置行高 int lineCount = calculateLineCount(artNoContent); diff --git a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx index 095395f1..34736f76 100644 Binary files a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx differ diff --git a/src/main/resources/templates/ALPHA/declaration-all-template.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template.xlsx index dca58513..1a100a5f 100644 Binary files a/src/main/resources/templates/ALPHA/declaration-all-template.xlsx and b/src/main/resources/templates/ALPHA/declaration-all-template.xlsx differ diff --git a/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx b/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx index d0a547d3..70f394a3 100644 Binary files a/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx differ diff --git a/src/main/resources/templates/TX/declaration-all-template.xlsx b/src/main/resources/templates/TX/declaration-all-template.xlsx index 1f6a5302..c1571542 100644 Binary files a/src/main/resources/templates/TX/declaration-all-template.xlsx and b/src/main/resources/templates/TX/declaration-all-template.xlsx differ diff --git a/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx b/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx index fe95f169..f390d469 100644 Binary files a/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx differ diff --git a/src/main/resources/templates/YB/declaration-all-template.xlsx b/src/main/resources/templates/YB/declaration-all-template.xlsx index 709d0a20..989f2ee0 100644 Binary files a/src/main/resources/templates/YB/declaration-all-template.xlsx and b/src/main/resources/templates/YB/declaration-all-template.xlsx differ