Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

2026-04-22 15:48:30 +08:00
parent 1f8b7ef0e8 7dd8e53927
commit 2864812f11
4 changed files with 34 additions and 0 deletions
@@ -125,6 +125,12 @@
          AND material_code = #{materialCode}
          AND batch_number = #{batchNumber}
          AND box_pallet_no = #{boxPalletNo}
+        <if test="topOrganizationId != null">
+            AND top_organization_id = #{topOrganizationId}
+        </if>
+        <if test="organizationId != null">
+            AND organization_id = #{organizationId}
+        </if>
        ORDER BY serial_number
    </select>