From bb79260cbeeac88cfbadc9606eea57002e8945bc Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期四, 17 四月 2025 09:43:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/main' --- eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsSpareMapper.xml | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsSpareMapper.xml b/eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsSpareMapper.xml index 8384ab3..f41d665 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsSpareMapper.xml +++ b/eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsSpareMapper.xml @@ -3,5 +3,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.dromara.eims.mapper.EimsSpareMapper"> - + <resultMap type="org.dromara.eims.domain.vo.EimsSpareInoutdtVo" id="SpareInoutdtVoResult"> + </resultMap> + <select id="selectSpareInoutList" resultMap="SpareInoutdtVoResult"> + SELECT io.*, dt.quantity, dt.actual_stock, dt.unit_price, dt.amount + FROM eims_spare_inout io + JOIN eims_spare_inoutdt dt on io.id = dt.inout_id + JOIN eims_spare sp on dt.spare_id = sp.id + ${ew.getCustomSqlSegment} + </select> </mapper> -- Gitblit v1.9.3