diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
index eea07c8..9c5acd9 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
@@ -104,6 +104,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasStockList" parameterType="BasStock" resultMap="BasStockResult">
         <include refid="selectBasStockVo"/>
         <where>
+            <if test="stockId != null  and stockId != ''"> and bs.stock_id = #{stockId}</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bs.cargo_space_id = #{cargoSpaceId}</if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and bs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
+            <if test="productStatus != null  and productStatus != ''"> and bs.product_status = #{productStatus}</if>
+            <if test="lotNo != null  and lotNo != ''"> and bs.lot_no = #{lotNo}</if>
+            <if test="inDate != null  and inDate != ''"> and bs.in_date like concat('%', #{inDate}, '%')</if>
+            <if test="backDate != null  and backDate != ''"> and bs.back_date = #{backDate}</if>
+            <if test="productGuid != null  and productGuid != ''"> and bs.product_guid = #{productGuid}</if>
+            <if test="productName != null  and productName != ''"> and bs.product_name like concat('%', #{productName}, '%')</if>
+            <if test="quantity != null  and quantity != ''"> and bs.quantity = #{quantity}</if>
+            <if test="jobId != null  and jobId != ''"> and bs.job_id = #{jobId}</if>
+            <if test="trayCode != null  and trayCode != ''"> and bs.tray_code = #{trayCode}</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and bs.out_quantity = #{outQuantity}</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and bs.stockin_detail_id = #{stockinDetailId}</if>
+            <if test="stockinId != null  and stockinId != ''"> and bs.stockin_id = #{stockinId}</if>
+            <if test="inType != null  and inType != ''"> and bs.in_type = #{inType}</if>
+            <if test="inClassId != null  and inClassId != ''"> and bs.in_class_id = #{inClassId}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and bs.warehouse_id = #{warehouseId}</if>
+            <if test="stackingId != null  and stackingId != ''"> and bs.stacking_id = #{stackingId}</if>
+            <if test="spare1 != null  and spare1 != ''"> and bs.spare1 = #{spare1}</if>
+            <if test="spare2 != null  and spare2 != ''"> and bs.spare2 = #{spare2}</if>
+            <if test="spare3 != null  and spare3 != ''"> and bs.spare3 = #{spare3}</if>
+            <if test="spare4 != null  and spare4 != ''"> and bs.spare4 = #{spare4}</if>
+            <if test="spare5 != null  and spare5 != ''"> and bs.spare5 = #{spare5}</if>
+            <if test="spare6 != null  and spare6 != ''"> and bs.spare6 = #{spare6}</if>
+            <if test="voltage != null  and voltage != ''"> and bs.voltage = #{voltage}</if>
+            <if test="power != null  and power != ''"> and bs.power = #{power}</if>
+            <if test="phase != null  and phase != ''"> and bs.phase = #{phase}</if>
+            <if test="netWeight != null  and netWeight != ''"> and bs.net_weight = #{netWeight}</if>
+            <if test="grossWeight != null  and grossWeight != ''"> and bs.gross_weight = #{grossWeight}</if>
+            <if test="distribution != null  and distribution != ''"> and bs.distribution = #{distribution}</if>
+            <if test="model != null  and model != ''"> and bs.model = #{model}</if>
+            <if test="orderId != null  and orderId != ''"> and bs.order_id = #{orderId}</if>
+            <if test="productId != null  and productId != ''"> and bs.product_id = #{productId}</if>
+            <if test="cargoSpaceStockStatus != null  and cargoSpaceStockStatus != ''"> and bcs.status = #{cargoSpaceStockStatus}</if>
 
             <if test="roadwayId != null  and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
             <if test="theFloor != null  and theFloor != ''"> and bcs.the_floor = #{theFloor}</if>