diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index f13e89a01..71c22f905 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -531,9 +531,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                         EmisTmsPack emisTmsPack=emisTmsPackMapper.selectEmisTmsPackByPackNo(scanBillCode);
                         if(emisTmsPack!=null) {
                             try {
-
-
-
                                 // 合包发件扫描
                                 if( scanType.equals(ScanType.DEPARTURE.opCode)
                                         ||  scanType.equals(ScanType.CLEARANCE.opCode)
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index bb9e8da09..5f273a70f 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1801,6 +1801,7 @@
             <if test="sendCompany != null  and sendCompany != ''"> and a.send_company like concat('%', #{sendCompany}, '%')</if>
             <if test="takePieceEmployeeCode != null  and takePieceEmployeeCode != ''"> and a.take_piece_employee_code=#{takePieceEmployeeCode}</if>
             <if test="operateEmployeeCode != null  and operateEmployeeCode != ''"> and a.operate_employee_code=#{operateEmployeeCode}</if>
+            <if test="registerManCode != null  and registerManCode != ''"> and register_man_code= #{registerManCode}</if>
 
 
             <if test="params.beginDate != null and params.beginDate != ''">
diff --git a/emis-biz/src/main/resources/tpl/TAN-GOT-130.pdf b/emis-biz/src/main/resources/tpl/TAN-GOT-130.pdf
index 0a564acae..0fa7b358a 100644
Binary files a/emis-biz/src/main/resources/tpl/TAN-GOT-130.pdf and b/emis-biz/src/main/resources/tpl/TAN-GOT-130.pdf differ