Merge branch 'mdc_hyjs_master'

zhangherong

2025-06-25 23855599412c4d61b38d78f0f3abd3430a48b5b1

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

对比新文件
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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.GoodsShelvesMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.GoodsShelves">
        SELECT
            t.id,
            t.warehouse_id warehouseId,
            p.warehouse_id warehouseNum,
            p.warehouse_name warehouseName,
            t.location_code locationCode,
            t.storey storey,
            t.arrange arrange,
            t.column_number columnNumber,
            t.cells_num cellsNum,
            t.shelf_number shelfNumber,
            t.shelf_name shelfName,
            t.remark,
            t.create_by createBy,
            t.create_time createTime
        FROM tms_goods_shelves t
        LEFT JOIN tms_warehouse p on t.warehouse_id = p.id
        ${ew.customSqlSegment}
    </select>
    <select id="queryGoodsShelvesDictList" resultType="org.jeecg.modules.tms.entity.vo.DictVo">
        SELECT DISTINCT
            shelf_number value,
            ISNULL(shelf_number, '') + '/' + ISNULL(shelf_name, '') label,
            ISNULL(shelf_number, '') + '/' + ISNULL(shelf_name, '') title
        FROM tms_goods_shelves
        where warehouse_id = #{warehouseId}
    </select>
    <select id="queryGoodsShelvesStoreyDictList" resultType="org.jeecg.modules.tms.entity.vo.DictVo">
        SELECT DISTINCT
            storey value,
            storey label,
            storey title
        FROM tms_goods_shelves
        WHERE warehouse_id = #{warehouseId} AND shelf_number = #{shelfNumber}
    </select>
</mapper>