diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index b7c6e7323..c017c428f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -2242,7 +2242,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb EmisTransLine emisTransLine = getTransLineByCode(emisWaybillOld.getTransLineType()); // 快递 if("1".equals(emisTransLine.getTransType()) ){ - tplName="tpl/ws_ls_in_tpl.docx"; + tplName="tpl/ws_kd_in_tpl.docx"; } // 空运 else if("2".equals(emisTransLine.getTransType()) ){ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/WordTplUtils.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/WordTplUtils.java index 4cffec0fe..93b7a1607 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/WordTplUtils.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/WordTplUtils.java @@ -107,10 +107,10 @@ public class WordTplUtils { public static void main(String[] args) { try { - int width=350; - int height=40; + int width=400; + int height=50; - BufferedImage barcodeImageBuffer = BarcodeUtils.getBarCodeWithWord("TAN-SHJD-24072701",width,height,70); + BufferedImage barcodeImageBuffer = BarcodeUtils.getBarCodeWithWord("TAN-SHJD-24072701",width,height,75); List cargoList= new ArrayList<>(); @@ -132,7 +132,7 @@ public class WordTplUtils { - XWPFTemplate template = XWPFTemplate.compile("/Users/alan/Downloads/ws_kd_in_tpl.docx",config).render( + XWPFTemplate template = XWPFTemplate.compile("/Users/alan/Downloads/ws_air_in_tpl.docx",config).render( new HashMap(){{ put("wsInNo", "TAN-SHJD-24072701"); put("country", "越南"); diff --git a/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx index 7ee9e96b1..d8d014f99 100644 Binary files a/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx and b/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx differ diff --git a/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx index bfb7fa8a3..b33286e94 100644 Binary files a/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx and b/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx differ diff --git a/emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx index 2bc3704d3..e12a69b75 100644 Binary files a/emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx and b/emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx differ