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

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml

@@ -36,7 +36,7 @@
           </if>
         <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
             and lww.departure_warehouse_id in
-            <foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
+            <foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -90,7 +90,7 @@
         </if>
         <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
             and lww.departure_warehouse_id in
-            <foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
+            <foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -152,7 +152,7 @@
         </if>
         <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
             and lww.departure_warehouse_id in
-            <foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
+            <foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -214,7 +214,7 @@
         </if>
         <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
             and lww.departure_warehouse_id in
-            <foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
+            <foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -272,7 +272,7 @@
         </if>
         <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
             and lww.departure_warehouse_id in
-            <foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
+            <foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -337,7 +337,7 @@
         </if>
         <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
             and lww.departure_warehouse_id in
-            <foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
+            <foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>