Merge remote-tracking branch 'origin/master'

Houjie

2025-05-26 1ae9b57657199f46affc9083c39681f1ec934e3f

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

@@ -2,4 +2,41 @@
<!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.InStoreDetailMapper">

    <select id="queryPageList" resultType="map" parameterType="String">
        SELECT
            t.id,
            t.tool_id onlyCode,
            t.in_storehouse_type inStorehouseType,
            t.goods_shelves_id goodsShelvesId,
            t.in_number inNumber,
            t.in_storehouse_id inStorehouseId,
            t.inbound_time inboundTime,
            t.create_by createBy,
            t.create_time createTime,
            t.update_by updateBy,
            t.update_time updateTime,
            t1.tool_code toolCode,
            t1.chinese_name chineseName,
            t1.tool_model toolModel,
            t2.classify_id classifyNum,
            t3.inbound_num inboundNum,
            t3.application_reason applicationReason,
            t3.approval_date approvalDate,
            t3.approval_opinion approvalOpinion,
            t4.item_text operateType,
            t5.realname handler,
            t6.realname reviewer,
            t7.item_value inStatus,
            t8.item_value orderStatus
        FROM tms_in_store_detail t
                 LEFT JOIN tms_base_tools t1 on t.tool_code = t1.id
                 LEFT JOIN tms_tools_classify t2 on t2.id = t1.classify_id
                 LEFT JOIN tms_inbound_order t3 on t3.id = t.in_storehouse_id
                 LEFT JOIN (select * from v_sys_dict where dict_code='inbound_operate_type') t4 on t4.item_value = t.operate_type
                 LEFT JOIN sys_user t5 on t5.username = t3.handler
                 LEFT JOIN sys_user t6 on t6.username = t3.reviewer
                 LEFT JOIN (select * from v_sys_dict where dict_code='in_status') t7 on t7.item_value = t3.in_status
                 LEFT JOIN (select * from v_sys_dict where dict_code='in_bill_status') t8 on t8.item_value = t3.order_status
            ${ew.customSqlSegment}
    </select>
</mapper>