From df3abf6be3a2572586ca9d952dcd8e1cfcded789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Tue, 5 Sep 2023 10:40:24 +0800
Subject: [PATCH] =?UTF-8?q?2023-09-05=20=E5=B7=A5=E5=85=B7=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/pda/ToolTransDetailMapper.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/pda/ToolTransDetailMapper.xml b/src/main/resources/mapper/pda/ToolTransDetailMapper.xml
index bfc103c..e824534 100644
--- a/src/main/resources/mapper/pda/ToolTransDetailMapper.xml
+++ b/src/main/resources/mapper/pda/ToolTransDetailMapper.xml
@@ -232,18 +232,18 @@
 
     <!-- 获取工具实例维修记录 -->
     <select id="getToolInstanceIdUseHist" resultMap="BaseResultMap">
-        SELECT
-            C.SupplierName as supplier_name,
+        select
+            C.supplier_name,
             A.created_date as deliveryDate,
             B.created_date as returnDate,
+            B.supplier_id,
             CONVERT(varchar(100), A.created_date, 23) as strDeliveryDate,
             CONVERT(varchar(100), B.created_date, 23) as strReturnDate,
             B.created_by
-        FROM tool_trans_detail B
-        LEFT JOIN tool_trans_detail A on A.tool_instance_id = B.tool_instance_id and A.trans_no like 'TW%'
-        and A.tool_instance_id = #{toolInstanceId,jdbcType=VARCHAR}
-        LEFT JOIN Supplier C on C.supplierID = A.supplier_id
-        WHERE B.orderRef2 = A.trans_no
+        from tool_trans_detail B
+        left join tool_trans_detail A on A.tool_instance_id = B.tool_instance_id  and B.orderRef2 = A.trans_no
+        LEFT JOIN supplier C on C.supplier_id = B.supplier_id
+        where b.trans_no like 'TW%' and b.tool_instance_id = #{toolInstanceId,jdbcType=VARCHAR} and b.direction = '-'
     </select>
 
     <select id="getLocationCount" resultType="java.lang.Integer">