2024-1-23-1 基础信息模块-绑定辅助设备逻辑优化-临时任务

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

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

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

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);
+	}
+
 	/**
 	 * 新增设备管理
 	 * 

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}