Merge remote-tracking branch 'origin/master'

zhangherong

2025-05-20 a6dd30e8bfffa5057e929cf355fbfdb860e70d2c

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolLedgerDetailMapper.xml

@@ -2,4 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.tms.mapper.ToolLedgerDetailMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.ToolLedgerDetail">
        SELECT
            t.id,
            t.tool_code toolCode,
            p.tool_code toolNum,
            t.tool_id toolId,
            p.chinese_name toolName,
            p.tool_model toolModel,
            t.quantity,
            t.warehouse_id warehouseId,
            ISNULL(q.warehouse_id, '') + '/' + ISNULL(q.warehouse_name, '') warehouseName,
            t.position_code positionCode
        FROM tms_tool_ledger_detail t
        LEFT JOIN tms_base_tools p on t.tool_code = p.id
        LEFT JOIN tms_warehouse q on t.warehouse_id = q.id
        ${ew.customSqlSegment}
    </select>
</mapper>