From e8f27ac2e4cd5a9851ddf52e9b38e6986a23e21e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 24 Sep 2024 06:53:42 +0800
Subject: [PATCH] md

---
 .../impl/EmisTmsScanRecordServiceImpl.java    |   3 ---
 .../resources/mapper/EmisWaybillMapper.xml    |   1 +
 .../src/main/resources/tpl/TAN-GOT-130.pdf    | Bin 151314 -> 162269 bytes
 3 files changed, 1 insertion(+), 3 deletions(-)

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 0a564acae0caf66f716b9a8b842d8c7ccfd8ff51..0fa7b358a9bd199d70e7c02b1c96e5db05b48a60 100644
GIT binary patch
delta 2764
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

delta 13
UcmccnnRC)S&W0AoElfiG04#k4F8}}l