From 724b32dc85201cefa85155349fa8dadbeda492ed Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 23 Jan 2024 14:54:51 +0800
Subject: [PATCH] =?UTF-8?q?2024-1-23-1=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=A8=A1=E5=9D=97-=E7=BB=91=E5=AE=9A=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E8=AE=BE=E5=A4=87=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?-=E4=B8=B4=E6=97=B6=E4=BB=BB=E5=8A=A1?=
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 +++
 .../wms/service/impl/BaseEquipmentServiceImpl.java   | 12 ++++++++++++
 .../resources/mapper/wms/BaseEquipmentMapper.xml     |  7 +++++++
 5 files changed, 35 insertions(+), 1 deletion(-)

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 ceb07217..fecad0b3 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
@@ -55,6 +55,16 @@ public class BaseEquipmentController extends BaseController {
 		return getDataTable(list);
 	}
 
+	/**
+	 * 查询辅助设备管理列表
+	 */
+	@GetMapping("/getEquipmentListByCategory")
+	public TableDataInfo selectBaseEquipmentListByCategory(BaseEquipment baseEquipment) {
+		startPage();
+		List<BaseEquipment> list = baseEquipmentService.selectEquipmentListByCategory(baseEquipment);
+		return getDataTable(list);
+	}
+
 	/**
 	 * 导出设备管理列表
 	 */
@@ -267,5 +277,4 @@ public class BaseEquipmentController extends BaseController {
 		List<BaseEquipment> list = baseEquipmentService.selectBYRecordsList(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 d58080b3..44a81a8b 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
@@ -126,4 +126,7 @@ public interface BaseEquipmentMapper {
 
     //查询保养记录
     List<BaseEquipment> selectBYRecordsList(BaseEquipment baseEquipment);
+
+    //查询辅助设备
+	List<BaseEquipment> selectEquipmentListByCategory(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 927b76cc..45009499 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
@@ -89,4 +89,7 @@ public interface IBaseEquipmentService {
 
 	//查看保养记录
 	List<BaseEquipment> selectBYRecordsList(BaseEquipment baseEquipment);
+
+	//辅助设备列表
+	List<BaseEquipment> selectEquipmentListByCategory(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 8451c6f7..b2e39a1d 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
@@ -130,6 +130,18 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
 		return baseEquipmentMapper.selectBaseEquipmentList(baseEquipment);
 	}
 
+	/**
+	 * 查询辅助设备列表
+	 *
+	 * @param baseEquipment
+	 * @return
+	 */
+	@Override
+	@DS("#header.poolName")
+	public List<BaseEquipment> selectEquipmentListByCategory(BaseEquipment baseEquipment) {
+		return baseEquipmentMapper.selectEquipmentListByCategory(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 4e90a2db..9881b929 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
@@ -228,6 +228,13 @@
 		</where>
 	</select>
 
+	<select id="selectEquipmentListByCategory" parameterType="BaseEquipment" resultMap="BaseEquipmentResult">
+		<include refid="selectBaseEquipmentVo"/>
+		where equipment_code != #{equipmentCode}
+		and equipment_category = #{equipmentCategory}
+		and del_flag ='0'
+	</select>
+
 	<select id="selectBaseEquipmentByEquipmentId" parameterType="Long" resultMap="BaseEquipmentResult">
 		<include refid="selectBaseEquipmentVo"/>
 		where equipment_id = #{equipmentId}