diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java
index 9fb4a939e..e50cb3694 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java
@@ -100,4 +100,15 @@ public class BaseEquipmentController extends BaseController {
 	public AjaxResult remove(@PathVariable Long[] equipmentIds) {
 		return toAjax(baseEquipmentService.deleteBaseEquipmentByEquipmentIds(equipmentIds));
 	}
+
+	/**
+	 * 查询设备类型
+	 */
+	@RequiresPermissions("wms:equipment:getEquipmentTypeList")
+	@GetMapping("/getEquipmentTypeList")
+	public TableDataInfo getEquipmentTypeList(BaseEquipment baseEquipment) {
+		List<BaseEquipment> list = baseEquipmentService.getEquipmentTypeList(baseEquipment);
+		return getDataTable(list);
+	}
+
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java
index d42e19074..4165f6926 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java
@@ -70,4 +70,7 @@ public interface BaseEquipmentMapper {
 
 	//查询机器编码关联附属信息
     List<BaseEquipment> getEquipmentAttachedList(String equipmentCode);
+
+    //查询设备类型
+    List<BaseEquipment> getEquipmentTypeList(BaseEquipment baseEquipment);
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java
index adfc4d4aa..532f156bb 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java
@@ -60,4 +60,7 @@ public interface IBaseEquipmentService {
 
     boolean checkEquipmentCodeUnique(BaseEquipment baseEquipment);
 	boolean checkEquipmentNameUnique(BaseEquipment baseEquipment);
+
+	//查询设备类型
+    List<BaseEquipment> getEquipmentTypeList(BaseEquipment baseEquipment);
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java
index e53706892..18b9b81a8 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java
@@ -168,4 +168,13 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
 			return true;
 		}
 	}
+
+	/**
+	 * 查询设备类型
+	 */
+	@Override
+	@DS("#header.poolName")
+	public List<BaseEquipment> getEquipmentTypeList(BaseEquipment baseEquipment) {
+		return baseEquipmentMapper.getEquipmentTypeList(baseEquipment);
+	}
 }
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
index 90d8f7744..800e37b90 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
@@ -216,4 +216,11 @@
 		and base_equipment.del_flag = '0'
 	</select>
 
+	<select id="getEquipmentTypeList" parameterType="BaseEquipment" resultMap="BaseEquipmentResult">
+		select  equipment_type_code,equipment_type_name
+		from base_equipment
+		where del_flag = '0'
+		group by equipment_type_code,equipment_type_name
+	</select>
+
 </mapper>
\ No newline at end of file