Merge branch 'dev' into pre-production

7 months ago · 8ae5790162
1 changed files with 2 additions and 0 deletions
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@ -365,6 +365,8 @@
        association_value ) AS t2 ON t.cargo_number = t2.association_value
        where ldslNew.is_deleted = 0
        AND ldslNew.warehouse_id=#{warehouseId}
+        GROUP BY
+        ldslNew.cargo_number
    </select>

    <select id="selectOrderNumByReservationId" resultType="Integer">