2024-3-22 基础信息管理模块设备-设备类别选择bug

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);
+    }
 }

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);
 }

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);
 }

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);
+    }
 }

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>