Merge branch 'dev_lzh_wms_20260120' into wms_dev

2026-01-29 14:46:31 +08:00
parent e0d3e40847 db86df135a
commit 52779f0196
28 changed files with 1468 additions and 8 deletions
@@ -70,6 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <if test="warehouseId != null ">
            and a.warehouse_id = #{warehouseId}
        </if>
+        <if test="shipperId != null ">
+            and a.shipper_id = #{shipperId}
+        </if>
        <if test="warehouseCode != null  and warehouseCode != ''">
            and a.warehouse_code = #{warehouseCode}
        </if>