wms-master.git - Gitblit

概况
操作记录
提交次数
目录
文档
派生
对比

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-07-18 bd1d4feea4f9522c69ef4c0fd72b1221eae5201f

 rsf-server/src/main/resources/mapper/manager/WarehouseMapper.xml

@@ -4,6 +4,6 @@

    <select id="selectByName" resultType="com.vincent.rsf.server.manager.entity.Warehouse">
        SELECT wh.id AS id FROM man_warehouse wh LEFT JOIN man_warehouse_areas wa on wh.id = wa.warehouse_id
        WHERE wh.`name` LIKE CONCAT('%',#{name},'%') OR wa.`name` LIKE CONCAT('%',#{name},'%')
        WHERE wh.`name` LIKE CONCAT('%',#{name},'%') OR wa.`name` LIKE CONCAT('%',#{name},'%') and wh.deleted = 0 and wa.deleted = 0
    </select>
</mapper>

			@@ -4,6 +4,6 @@

			<select id="selectByName" resultType="com.vincent.rsf.server.manager.entity.Warehouse">
			SELECT wh.id AS id FROM man_warehouse wh LEFT JOIN man_warehouse_areas wa on wh.id = wa.warehouse_id
			WHERE wh.`name` LIKE CONCAT('%',#{name},'%') OR wa.`name` LIKE CONCAT('%',#{name},'%')
			WHERE wh.`name` LIKE CONCAT('%',#{name},'%') OR wa.`name` LIKE CONCAT('%',#{name},'%') and wh.deleted = 0 and wa.deleted = 0
			</select>
			</mapper>