From 42ec2bd57032f6e3f8fa2351c68cc872638544ba Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 25 Sep 2023 17:30:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/wms/controller/BaseEquipmentController.java    | 11 +++++++++++
 .../java/com/op/wms/mapper/BaseEquipmentMapper.java   |  3 +++
 .../com/op/wms/service/IBaseEquipmentService.java     |  3 +++
 .../op/wms/service/impl/BaseEquipmentServiceImpl.java |  9 +++++++++
 .../main/resources/mapper/wms/BaseEquipmentMapper.xml |  7 +++++++
 5 files changed, 33 insertions(+)

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 9fb4a939..e50cb369 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 d42e1907..4165f692 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 adfc4d4a..532f156b 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 e5370689..18b9b81a 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 90d8f774..800e37b9 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