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 2abc36ee3..9ef1f2125 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
@@ -2777,7 +2777,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillOrigDataMapper.insertEmisWaybillOrigData(origData);
 
             // 生成寄件图片
-            String tplCode="TAN-CM-130";
+            String tplCode="TAN-GOT-130";
             Map<String, Object> order = getWaybillPrintOrder(billCode, "1,1",tplCode, "zh", tplCode,"1");
             if(order!=null) {
                 // 保存寄件底单图片
@@ -2797,7 +2797,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                 FileOutputStream os = new FileOutputStream(localFile);
                 tplPrint.genPNG(order,tplCode,"", os);
 
-                SysFileInfo sysFileInfo=sysFileInfoService.ossUploadLocalFile(localFile.getAbsolutePath(),billCode+"-cm.png","寄件底单图片");
+                SysFileInfo sysFileInfo=sysFileInfoService.ossUploadLocalFile(localFile.getAbsolutePath(),billCode+"-got.png","寄件底单图片");
                 String fileUrl = sysFileInfo.getFileRemoteUrl();
                 goodsPicAttachment.setFileUrl(fileUrl);
                 emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment);
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 e27d56877..0d8789b74 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
@@ -118,6 +118,68 @@ public class ItemHelper {
         return printItems;
     }
 
+    // TAN-GOT-130
+    public static  ArrayList<ItemCell> gen_tangot130(Map<String, Object> orderMap) {
+        ArrayList<ItemCell> printItems = new ArrayList<>();
+
+        String extData =MapUtils.getString(orderMap,"extData","");
+        if(!StringUtils.isEmpty(extData)){
+            try
+            {
+                Map mapExtData = JSON.parseObject(extData,Map.class);
+                orderMap.putAll(mapExtData);
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+
+        printItems.add(new ItemCell("logisticNo",MapUtils.getString(orderMap,"logisticNo",""),9,true, Element.ALIGN_CENTER,"Text"));
+        printItems.add(new ItemCell("consignee",MapUtils.getString(orderMap,"consignee","")+" "+MapUtils.getString(orderMap,"mobile",""),8,true, Element.ALIGN_LEFT,"Text"));
+//        printItems.add(new ItemCell("mobile",MapUtils.getString(orderMap,"mobile",""),8,true, Element.ALIGN_LEFT,"Text"));
+
+        printItems.add(new ItemCell("address",MapUtils.getString(orderMap,"address",""),8,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("company",MapUtils.getString(orderMap,"company",""),8,true, Element.ALIGN_LEFT,"Text"));
+        String remark="备注:"+MapUtils.getString(orderMap,"remark","")+""+MapUtils.getString(orderMap,"feeRemark","");
+
+        printItems.add(new ItemCell("remark",remark,6,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("k10",MapUtils.getString(orderMap,"k10",""),9,true, Element.ALIGN_CENTER,"Text"));
+        printItems.add(new ItemCell("k11",MapUtils.getString(orderMap,"k11",""),9,true, Element.ALIGN_CENTER,"Text"));
+        printItems.add(new ItemCell("custName",MapUtils.getString(orderMap,"custName",""),8,true, Element.ALIGN_LEFT,"Text"));
+
+
+        printItems.add(new ItemCell("sender",MapUtils.getString(orderMap,"sendPerson","")+ " "+MapUtils.getString(orderMap,"sendMobile",""),7,true, Element.ALIGN_LEFT,"Text"));
+//        printItems.add(new ItemCell("sendMobile",MapUtils.getString(orderMap,"sendMobile",""),7,true, Element.ALIGN_LEFT,"Text"));
+
+
+        printItems.add(new ItemCell("sendCompany",MapUtils.getString(orderMap,"sendCompany",""),8,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("sendAddress",MapUtils.getString(orderMap,"sendAddress",""),8,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("k2",MapUtils.getString(orderMap,"k2",""),10,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("k3",MapUtils.getString(orderMap,"k3",""),10,true, Element.ALIGN_RIGHT,"Text"));
+        printItems.add(new ItemCell("parcelQty","件数:"+MapUtils.getString(orderMap,"parcelQty",""),7,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("billWeight","实际重量:"+MapUtils.getString(orderMap,"billWeight","")+"kg",7,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("totalVolume","体积:"+MapUtils.getString(orderMap,"totalVolume","")+"m3",7,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("volumeWeight","体积重量:"+MapUtils.getString(orderMap,"volumeWeight","")+"kg",7,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("settlementWeight","结算重量:"+MapUtils.getString(orderMap,"settlementWeight","")+"kg",7,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("freight","运费:"+MapUtils.getString(orderMap,"freight",""),7,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("paymentType","支付方式:"+MapUtils.getString(orderMap,"paymentType",""),7,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("packType","包装类型:"+MapUtils.getString(orderMap,"packType",""),7,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("goodsInfo","货物名称:"+MapUtils.getString(orderMap,"goodsInfo",""),7,true, Element.ALIGN_LEFT,"Text"));
+
+
+        String printInfo="打印信息:"+MapUtils.getString(orderMap,"printDate","")
+                + "/" +MapUtils.getString(orderMap,"printMan","")
+                + "/" +MapUtils.getString(orderMap,"printCount","");
+
+        printItems.add(new ItemCell("printInfo",printInfo,7,true, Element.ALIGN_LEFT,"Text"));
+        printItems.add(new ItemCell("sendDate",MapUtils.getString(orderMap,"sendDate",""),8,true, Element.ALIGN_CENTER,"Text"));
+
+        printItems.add(new ItemCell("barcodeImg1", MapUtils.getString(orderMap,"ydSn",""),1,true,"BarCode"));
+
+
+        return printItems;
+    }
+
     // TAN-CM-130
     public static  ArrayList<ItemCell> gen_tancm130(Map<String, Object> orderMap) {
         ArrayList<ItemCell> printItems = new ArrayList<>();
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/tanex/TanexPdfPrinter.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/tanex/TanexPdfPrinter.java
index 134a31af6..4440528c1 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/tanex/TanexPdfPrinter.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/tanex/TanexPdfPrinter.java
@@ -36,6 +36,9 @@ public class TanexPdfPrinter extends XddBasePrint {
         if("TAN-GC-130".equals(tplCode)){
             return ItemHelper.gen_tangc130(orderMap);
         }
+        else if("TAN-GOT-130".equals(tplCode)){
+            return ItemHelper.gen_tangot130(orderMap);
+        }
         else if("TAN-CM-130".equals(tplCode)){
             return ItemHelper.gen_tancm130(orderMap);
         }
@@ -65,9 +68,6 @@ public class TanexPdfPrinter extends XddBasePrint {
         }
 
 
-
-
-
         return printItems;
     }
 
diff --git a/emis-biz/src/main/resources/tpl/TAN-GOT-130.pdf b/emis-biz/src/main/resources/tpl/TAN-GOT-130.pdf
new file mode 100644
index 000000000..0a564acae
Binary files /dev/null and b/emis-biz/src/main/resources/tpl/TAN-GOT-130.pdf differ