diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/tanex/ItemHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/tanex/ItemHelper.java index 903bf0ad8..0a30ec8da 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/tanex/ItemHelper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/tanex/ItemHelper.java @@ -47,7 +47,7 @@ public class ItemHelper { printItems.add(new ItemCell("printInfo",printInfo,7,true, Element.ALIGN_LEFT,"Text")); - String parcelInfo=MapUtils.getString(orderMap,"subSeqNum","") + String parcelQty=MapUtils.getString(orderMap,"subSeqNum","") +"/"+MapUtils.getString(orderMap,"parcelQty","") +"|"+MapUtils.getString(orderMap,"billWeight","")+"kg" +"|"+MapUtils.getString(orderMap,"totalVolume","")+"方" @@ -55,7 +55,7 @@ public class ItemHelper { // subSeqNum/parcelQty|billWeightkg|totalVolume方 - printItems.add(new ItemCell("parcelInfo",parcelInfo,12,true, Element.ALIGN_CENTER,"Text")); + printItems.add(new ItemCell("parcelQty",parcelQty,12,true, Element.ALIGN_CENTER,"Text")); printItems.add(new ItemCell("packType","【"+MapUtils.getString(orderMap,"packType","")+"】",8,true, Element.ALIGN_CENTER,"Text")); printItems.add(new ItemCell("paymentType","【"+MapUtils.getString(orderMap,"paymentType","")+"】",8,true, Element.ALIGN_CENTER,"Text")); printItems.add(new ItemCell("dispatchType","【"+MapUtils.getString(orderMap,"dispatchType","")+"】",8,true, Element.ALIGN_CENTER,"Text")); @@ -97,13 +97,13 @@ public class ItemHelper { printItems.add(new ItemCell("sendDate",MapUtils.getString(orderMap,"sendDate",""),6,true, Element.ALIGN_LEFT,"Text")); - String parcelInfo=MapUtils.getString(orderMap,"subSeqNum","") + String parcelQty=MapUtils.getString(orderMap,"subSeqNum","") +"/"+MapUtils.getString(orderMap,"parcelQty","") +"|"+MapUtils.getString(orderMap,"billWeight","")+"kg" +"|"+MapUtils.getString(orderMap,"totalVolume","")+"m³" ; - printItems.add(new ItemCell("parcelInfo",parcelInfo,14,true, Element.ALIGN_CENTER,"Text")); + printItems.add(new ItemCell("parcelQty",parcelQty,14,true, Element.ALIGN_CENTER,"Text")); printItems.add(new ItemCell("shortLogisticNo",MapUtils.getString(orderMap,"shortLogisticNo",""),15,true, Element.ALIGN_CENTER,"Text")); printItems.add(new ItemCell("agingFlag",MapUtils.getString(orderMap,"agingFlag",""),20,true, Element.ALIGN_LEFT,"Text")); printItems.add(new ItemCell("k8",MapUtils.getString(orderMap,"k8",""),15,true, Element.ALIGN_CENTER,"Text")); diff --git a/emis-biz/src/main/resources/tpl/TAN-ENGC-130.pdf b/emis-biz/src/main/resources/tpl/TAN-ENGC-130.pdf index 7858e6b4e..1c1e35639 100644 Binary files a/emis-biz/src/main/resources/tpl/TAN-ENGC-130.pdf and b/emis-biz/src/main/resources/tpl/TAN-ENGC-130.pdf differ