lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

已完成已作废的作业不能再次操作，主子表刷新问题，导出字典国际化

Browse Source
This commit is contained in:
猫猫guowen
2025-08-21 11:22:13 +08:00
parent a6c83092c7
commit ae9b0f3660
30 changed files with 1511 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml
View File

@@ -23,9 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasWarehouseList" parameterType="BasWarehouse" resultMap="BasWarehouseResult">
<include refid="selectBasWarehouseVo"/>
<where>
<if test="warehouseId != null and warehouseId != ''">and warehouse_id = #{warehouseId}</if>
<if test="warehouseNo != null and warehouseNo != ''">and warehouse_no = #{warehouseNo}</if>
<if test="projectNo != null and projectNo != ''">and project_no = #{projectNo}</if>
<if test="warehouseId != null and warehouseId != ''">and warehouse_id like concat('%',#{warehouseId}, '%')</if>
<if test="warehouseNo != null and warehouseNo != ''">and warehouse_no like concat('%',#{warehouseNo}, '%')</if>
<if test="projectNo != null and projectNo != ''">and project_no like concat('%',#{projectNo}, '%')</if>
<if test="warehouseName != null and warehouseName != ''">and warehouse_name like concat('%',
#{warehouseName}, '%')
</if>