Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -325,6 +325,7 @@
         select ldsl.*
         from logpm_distribution_stock_list ldsl
         where ldsl.is_deleted = 0
+        and ldsl.source_type = 2
         and ldsl.cargo_number like concat('%',#{materialCode},'%')
         and ldsl.market_id = #{marketId}
         and ldsl.warehouse_id = #{warehouseId}
@@ -334,15 +335,17 @@
         select ldsl.*
         from logpm_distribution_stock_list ldsl
         where ldsl.is_deleted = 0
+          and ldsl.source_type = 2
           and ldsl.description_goods like concat('%',#{materialName},'%')
           and ldsl.market_id = #{marketId}
-            and ldsl.warehouse_id = #{warehouseId}
+          and ldsl.warehouse_id = #{warehouseId}
     </select>
 
     <select id="getListByMarketIdAndMaterialName" resultType="com.logpm.distribution.entity.DistributionStockListEntity">
         select ldsl.*
         from logpm_distribution_stock_list ldsl
         where ldsl.is_deleted = 0
+          and ldsl.source_type = 2
           and ldsl.description_goods like concat('%',#{materialName},'%')
           and ldsl.market_id = #{marketId}
           and ldsl.warehouse_id = #{warehouseId}