diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml index 073c0cd4e..852cc5b05 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml @@ -245,15 +245,19 @@ and warehouse_id =#{param.warehouseId } and allocation_id =#{param.allocationId } and tray_id =#{param.trayId } - and order_code like concat('%',#{param.orderCode },'%') - and category_name like concat('%',#{param.categoryName },'%') - and material_code like concat('%',#{param.materialCode },'%') - and tray_code like concat('%',#{param.trayCode },'%') - and tray_name like concat('%',#{param.trayName },'%') - and brand_name like concat('%',#{param.brandName },'%') + and order_code like concat(#{param.orderCode },'%') + and category_name like concat(#{param.categoryName },'%') + and material_code like concat(#{param.materialCode },'%') + and tray_code like concat(#{param.trayCode },'%') + and tray_name like concat(#{param.trayName },'%') + and brand_name like concat(#{param.brandName },'%') and market_name like concat('%',#{param.marketName},'%') and material_name like concat('%',#{param.materialName},'%') - and position_code like concat('%',#{param.positionCode},'%') + + + and (position_code like concat('%',#{param.positionCode},'%') or grounding_position_code like concat('%',#{param.positionCode},'%')) + + and order_package_code =#{param.orderPackageCode } and inventory_user like concat('%',#{param.inventoryUser },'%') and inventory_time BETWEEN #{param.startTime } and #{param.endTime}