From 7945edff63033932b28f25b242aa692e3958168d Mon Sep 17 00:00:00 2001
From: panxinyu-YUYwp <youremail@example.com>
Date: Wed, 19 Aug 2026 17:08:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F-=E5=B7=A5=E5=85=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=B7=A5=E5=85=B7=E6=B8=85=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=B8=80=E5=BC=A0=E5=85=B3=E8=81=94=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../production/controller/ToolController.java | 11 ++++++++
 .../production/dao/ToolTransDetailMapper.java |  5 ++++
 .../service/ToolTransQueryService.java        |  5 ++++
 .../impl/ToolTransQueryServiceImpl.java       | 18 +++++++++++++
 .../production/ToolTransDetailMapper.xml      | 27 +++++++++++++++++++
 5 files changed, 66 insertions(+)

diff --git a/src/main/java/com/heai/modules/production/controller/ToolController.java b/src/main/java/com/heai/modules/production/controller/ToolController.java
index 51f96e2..b8b8f64 100644
--- a/src/main/java/com/heai/modules/production/controller/ToolController.java
+++ b/src/main/java/com/heai/modules/production/controller/ToolController.java
@@ -73,4 +73,15 @@ public class ToolController {
         List<String> list = toolTransQueryService.searchToolTransTypeList(site);
         return R.ok().put("list", list);
     }
+
+    /**
+     * @Description 工具实例出入库记录明细分页查询（工具清单联动明细）
+     * @param query 条件
+     * @return R
+     */
+    @PostMapping("/searchToolInstanceTransDetailPage")
+    public R searchToolInstanceTransDetailPage(@RequestBody ToolTransDetailQueryParam query) {
+        PageUtils page = toolTransQueryService.searchToolInstanceTransDetailPage(query);
+        return R.ok().put("page", page);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/heai/modules/production/dao/ToolTransDetailMapper.java b/src/main/java/com/heai/modules/production/dao/ToolTransDetailMapper.java
index 3558c63..373a4f3 100644
--- a/src/main/java/com/heai/modules/production/dao/ToolTransDetailMapper.java
+++ b/src/main/java/com/heai/modules/production/dao/ToolTransDetailMapper.java
@@ -20,4 +20,9 @@ public interface ToolTransDetailMapper extends BaseMapper<ToolTransDetailEntity>
      * 出入库明细分页查询（direction 转为 入库/出库）- rqrq
      */
     IPage<Map<String, Object>> selectToolTransDetailPage(Page<Map<String, Object>> page, @Param("query") ToolTransDetailQueryParam query);
+
+    /**
+     * 工具实例出入库记录明细查询（按工具实例编码，关联单头取类型/状态/经手人，时间倒排）- rqrq
+     */
+    IPage<Map<String, Object>> selectToolInstanceTransDetailPage(Page<Map<String, Object>> page, @Param("query") ToolTransDetailQueryParam query);
 }
\ No newline at end of file
diff --git a/src/main/java/com/heai/modules/production/service/ToolTransQueryService.java b/src/main/java/com/heai/modules/production/service/ToolTransQueryService.java
index 048a46f..b5f23eb 100644
--- a/src/main/java/com/heai/modules/production/service/ToolTransQueryService.java
+++ b/src/main/java/com/heai/modules/production/service/ToolTransQueryService.java
@@ -21,6 +21,11 @@ public interface ToolTransQueryService {
      */
     PageUtils searchToolTransDetailPage(ToolTransDetailQueryParam query);
 
+    /**
+     * 工具实例出入库记录明细分页查询
+     */
+    PageUtils searchToolInstanceTransDetailPage(ToolTransDetailQueryParam query);
+
     /**
      * 出入库类型下拉列表
      */
diff --git a/src/main/java/com/heai/modules/production/service/impl/ToolTransQueryServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/ToolTransQueryServiceImpl.java
index c35c0ca..d068397 100644
--- a/src/main/java/com/heai/modules/production/service/impl/ToolTransQueryServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/ToolTransQueryServiceImpl.java
@@ -75,6 +75,24 @@ public class ToolTransQueryServiceImpl implements ToolTransQueryService {
         return new PageUtils(result);
     }
 
+    @Override
+    public PageUtils searchToolInstanceTransDetailPage(ToolTransDetailQueryParam query) {
+        if (query == null) {
+            throw new RuntimeException("查询条件不能为空");
+        }
+        int pageNum = normalizePage(query.getPage());
+        int limit = normalizeLimit(query.getLimit());
+        query.setPage(pageNum);
+        query.setLimit(limit);
+
+        log.info("工具实例出入库记录明细分页查询, site={}, toolInstanceId={}, page={}, limit={}",
+                query.getSite(), query.getToolInstanceId(), pageNum, limit);
+
+        Page<Map<String, Object>> page = new Page<>(pageNum, limit);
+        IPage<Map<String, Object>> result = toolTransDetailMapper.selectToolInstanceTransDetailPage(page, query);
+        return new PageUtils(result);
+    }
+
     @Override
     public List<String> searchToolTransTypeList(String site) {
         String siteCond = (site == null || site.trim().isEmpty()) ? null : site.trim();
diff --git a/src/main/resources/mapper/production/ToolTransDetailMapper.xml b/src/main/resources/mapper/production/ToolTransDetailMapper.xml
index 53eecd9..8ba3097 100644
--- a/src/main/resources/mapper/production/ToolTransDetailMapper.xml
+++ b/src/main/resources/mapper/production/ToolTransDetailMapper.xml
@@ -38,4 +38,31 @@
         </where>
         ORDER BY trans_no ASC, id ASC
     </select>
+
+    <!-- 工具实例出入库记录明细（按工具实例编码，关联单头取类型/状态/经手人，时间倒排） -->
+    <select id="selectToolInstanceTransDetailPage" resultType="map">
+        SELECT
+            d.trans_no AS transNo,
+            h.trans_type AS transType,
+            CONVERT(varchar(19), d.created_date, 120) AS createdDate,
+            d.remark AS remark,
+            h.status AS status,
+            h.receiver AS receiver,
+            d.ware_house_id AS wareHouseId,
+            d.location_id AS locationId,
+            d.orderRef1 AS orderRef1,
+            d.orderRef2 AS orderRef2,
+            d.orderRef3 AS orderRef3
+        FROM tool_trans_detail d WITH (NOLOCK)
+        LEFT JOIN tool_trans_header h WITH (NOLOCK) ON d.site = h.site AND d.trans_no = h.trans_no
+        <where>
+            <if test="query.site != null and query.site != ''">
+                AND d.site = #{query.site}
+            </if>
+            <if test="query.toolInstanceId != null and query.toolInstanceId != ''">
+                AND d.tool_instance_id = #{query.toolInstanceId}
+            </if>
+        </where>
+        ORDER BY d.created_date DESC, d.id DESC
+    </select>
 </mapper>
\ No newline at end of file