diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
new file mode 100644
index 0000000..92dcf02
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.dto.equipment;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class EquipmentOrSampleDto {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long")
+    private Long id;
+
+    /**
+     * 设备/样品编号
+     */
+    @ApiModelProperty(value = "设备/样品编号", dataType = "String")
+    private String assetNo;
+
+    /**
+     * 设备/样品名称
+     */
+    @ApiModelProperty(value = "设备/样品名称", dataType = "String")
+    private String assetName;
+
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型", dataType = "String")
+    @DictCodeField(message = "类型", cacheName = MeterDictCode.APP_AGGREGATE_QUERY_TYPE)
+    private String assetType;
+
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(value = "类型名称不合法", dataType = "String")
+    private String assetTypeName;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
new file mode 100644
index 0000000..92dcf02
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.dto.equipment;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class EquipmentOrSampleDto {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long")
+    private Long id;
+
+    /**
+     * 设备/样品编号
+     */
+    @ApiModelProperty(value = "设备/样品编号", dataType = "String")
+    private String assetNo;
+
+    /**
+     * 设备/样品名称
+     */
+    @ApiModelProperty(value = "设备/样品名称", dataType = "String")
+    private String assetName;
+
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型", dataType = "String")
+    @DictCodeField(message = "类型", cacheName = MeterDictCode.APP_AGGREGATE_QUERY_TYPE)
+    private String assetType;
+
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(value = "类型名称不合法", dataType = "String")
+    private String assetTypeName;
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 7ff9c16..c0c7c79 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
@@ -19,10 +20,7 @@
 import com.casic.missiles.mapper.equipment.EquipmentFixedAssetFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper;
-import com.casic.missiles.model.equipment.EquipmentFixedAssetFile;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
-import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
-import com.casic.missiles.model.equipment.EquipmentUseLog;
+import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.model.page.PageQuery;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
@@ -360,6 +358,15 @@
         return ReturnUtil.success(logList);
     }
 
+    @Override
+    public Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, EquipmentOrSampleDto request) throws Exception {
+        Page<EquipmentOrSampleDto> resultPage = meterFixedAssetsMapper.queryEquipment(page, request);
+        for (EquipmentOrSampleDto dto : resultPage.getRecords()) {
+            DictCodeUtils.convertDictCodeToName(dto);
+        }
+        return resultPage;
+    }
+
     /**
      * 转换字典code
      *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index a0352db..7e16043 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.controller.equipment;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -8,10 +7,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -227,5 +230,18 @@
     public ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception {
         return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId());
     }
+    /**
+     * 通过名字/编号查询设备与样品
+     */
+    @ApiOperation("通过名字/编号查询设备与样品")
+    @PostMapping("/queryEquipment")
+    @ResponseBody
+    public ReturnDTO<PageInfoBT<EquipmentOrSampleDto>> queryEquipment(@RequestBody @Valid EquipmentOrSampleDto request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<EquipmentOrSampleDto> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request)));
+    }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index caa0a79..d1760b6 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,5 @@
 
     Page<EquipmentFixedAssets> listPage(Page<EquipmentFixedAssets> page, @Param("fixedAssetRequest") FixedAssetRequest fixedAssetRequest);
 
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, @Param("request")EquipmentOrSampleDto request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 35b5827..c25f789 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -87,4 +87,38 @@
         ORDER BY mfa.create_time DESC
     </select>
 
+    <select id="queryEquipment" resultType="com.casic.missiles.dto.equipment.EquipmentOrSampleDto">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    id,
+                    equipment_no AS asset_no,
+                    equipment_name AS asset_name,
+                    1 AS asset_type
+                FROM
+                    equipment_fixed_assets
+                WHERE
+                    asset_type = '1'
+                  AND is_del = 0 UNION
+                SELECT
+                    id,
+                    sample_no AS asset_no,
+                    sample_name AS asset_name,
+                    2 AS asset_type
+                FROM
+                    customer_sample_info
+                WHERE
+                    is_del = 0
+            ) t1
+        WHERE 1=1
+        <if test="request.assetNo != null and request.assetNo !=''">
+            and t1.asset_no like concat('%', #{request.assetNo}, '%')
+        </if>
+        <if test="request.assetName != null and request.assetName !=''">
+            and t1.asset_name like concat('%', #{request.assetName}, '%')
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index a4d1002..e1b6ec7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -124,4 +124,6 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+    // APP全局查询类型
+    String APP_AGGREGATE_QUERY_TYPE= "appAggregateQueryType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
new file mode 100644
index 0000000..92dcf02
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentOrSampleDto.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.dto.equipment;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class EquipmentOrSampleDto {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long")
+    private Long id;
+
+    /**
+     * 设备/样品编号
+     */
+    @ApiModelProperty(value = "设备/样品编号", dataType = "String")
+    private String assetNo;
+
+    /**
+     * 设备/样品名称
+     */
+    @ApiModelProperty(value = "设备/样品名称", dataType = "String")
+    private String assetName;
+
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型", dataType = "String")
+    @DictCodeField(message = "类型", cacheName = MeterDictCode.APP_AGGREGATE_QUERY_TYPE)
+    private String assetType;
+
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(value = "类型名称不合法", dataType = "String")
+    private String assetTypeName;
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 7ff9c16..c0c7c79 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
@@ -19,10 +20,7 @@
 import com.casic.missiles.mapper.equipment.EquipmentFixedAssetFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper;
-import com.casic.missiles.model.equipment.EquipmentFixedAssetFile;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
-import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
-import com.casic.missiles.model.equipment.EquipmentUseLog;
+import com.casic.missiles.model.equipment.*;
 import com.casic.missiles.model.page.PageQuery;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
@@ -360,6 +358,15 @@
         return ReturnUtil.success(logList);
     }
 
+    @Override
+    public Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, EquipmentOrSampleDto request) throws Exception {
+        Page<EquipmentOrSampleDto> resultPage = meterFixedAssetsMapper.queryEquipment(page, request);
+        for (EquipmentOrSampleDto dto : resultPage.getRecords()) {
+            DictCodeUtils.convertDictCodeToName(dto);
+        }
+        return resultPage;
+    }
+
     /**
      * 转换字典code
      *
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java
index 8668cc7..24ce44f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
@@ -48,4 +49,6 @@
     ReturnDTO<EquipmentUseLog> queryUseLogList(Long id) throws Exception;
 
     ReturnDTO<EquipmentStateChangeLog> queryStateChangeLogList(Long id) throws Exception;
+
+    Page<EquipmentOrSampleDto> queryEquipment(Page<EquipmentOrSampleDto> page, EquipmentOrSampleDto request) throws Exception;
 }