Merge remote-tracking branch 'origin/master'

Lius

昨天 f3a7d211a4a616d8ed2a08b103d8d162f06d389e

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

@@ -22,4 +22,20 @@
        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>