Merge branch 'dev' into dev_WMS20260401

# Conflicts: # mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
2026-04-28 13:41:57 +08:00
parent 5f56c21b84 99f086fdfa
commit 269fef04b2
20 changed files with 249 additions and 22 deletions
@@ -72,6 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <if test="goodsNumber != null  and goodsNumber != ''">
            and GOODS_NUMBER like concat('%', #{goodsNumber}, '%')
        </if>
+            <if test="businessUnit != null  and businessUnit != ''">
+                and BUSINESS_UNIT like concat('%', #{businessUnit}, '%')
+            </if>
        <if test="orgName != null  and orgName != ''">
            and ORG_NAME like concat('%', #{orgName}, '%')
        </if>