From 53cc4a78b5cfa522ee70b58909203f83b560cfc3 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 22 Mar 2024 11:32:28 +0800
Subject: [PATCH] =?UTF-8?q?2024-3-22=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?-=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=88=AB=E9=80=89=E6=8B=A9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/wms/controller/BaseEquipmentController.java   | 9 +++++++++
 .../main/java/com/op/wms/mapper/BaseEquipmentMapper.java | 3 +++
 .../java/com/op/wms/service/IBaseEquipmentService.java   | 2 ++
 .../op/wms/service/impl/BaseEquipmentServiceImpl.java    | 9 +++++++++
 .../main/resources/mapper/wms/BaseEquipmentMapper.xml    | 9 +++++++++
 5 files changed, 32 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 b15c51b8..e39cbc74 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
@@ -277,4 +277,13 @@ public class BaseEquipmentController extends BaseController {
         List<BaseEquipment> list = baseEquipmentService.selectBYRecordsList(baseEquipment);
         return getDataTable(list);
     }
+
+    /**
+     * 查询设备类型(字典中的)
+     */
+    @GetMapping("/getEquipmentTypeDeptList")
+    public TableDataInfo getEquipmentTypeDeptList(BaseEquipment baseEquipment) {
+        List<BaseEquipment> list = baseEquipmentService.getEquipmentTypeDeptList(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 05753314..4c1aae93 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
@@ -135,4 +135,7 @@ public interface BaseEquipmentMapper {
 
     //查询辅助设备
     List<BaseEquipment> selectEquipmentListByCategory(BaseEquipment baseEquipment);
+
+    //查询设备类型（维护在字典中的）
+    List<BaseEquipment> getEquipmentTypeDeptList(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 d4ed29d5..fec24879 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
@@ -93,4 +93,6 @@ public interface IBaseEquipmentService {
 
     //辅助设备列表
     List<BaseEquipment> selectEquipmentListByCategory(BaseEquipment baseEquipment);
+
+    List<BaseEquipment> getEquipmentTypeDeptList(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 330a7668..6204554c 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
@@ -616,4 +616,13 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
     public List<BaseEquipment> selectBYRecordsList(BaseEquipment baseEquipment) {
         return baseEquipmentMapper.selectBYRecordsList(baseEquipment);
     }
+
+    /**
+     * 查询设备类型
+     */
+    @Override
+    @DS("master")
+    public List<BaseEquipment> getEquipmentTypeDeptList(BaseEquipment baseEquipment) {
+        return baseEquipmentMapper.getEquipmentTypeDeptList(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 cf87e858..73f685fc 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
@@ -710,4 +710,13 @@
 		and plan_type = 'maintenance'
 	</select>
 
+    <select id="getEquipmentTypeDeptList" parameterType="BaseEquipment" resultType="com.op.wms.domain.BaseEquipment">
+        select
+            dict_label as equipmentTypeName,
+            dict_value as equipmentTypeCode
+        from sys_dict_data
+        where dict_type = 'equ_type'
+        and status ='0'
+    </select>
+
 </mapper>