Merge remote-tracking branch 'origin/dev' into pre-production

8 months ago · 8726904f5b
1 changed files with 1 additions and 0 deletions
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
@ -6,6 +6,7 @@
        select IFNULL(sum(num),0)
        from logpm_trunkline_cars_load_scan
        where load_id = #{loadId}
+        and warehouse_id is not null
    </select>

    <select id="findAbnormalNumByLoadId" resultType="int">