From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/mapper/MwStagingRoomMapper.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwStagingRoomMapper.java b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwStagingRoomMapper.java
index 030015e..87e0db0 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwStagingRoomMapper.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwStagingRoomMapper.java
@@ -27,11 +27,11 @@
/**
* 暂存间分页列表
*
- * @param objectPage
+ * @param mwStagingRoomVOPage
* @param treeCode
* @return
*/
- Page<MwStagingRoomVO> pageList(Page<Object> objectPage, @Param("treeCode") String treeCode);
+ Page<MwStagingRoomVO> pageList(Page<MwStagingRoomVO> mwStagingRoomVOPage, @Param("treeCode") String treeCode);
/**
* 暂存间入库记录
@@ -68,4 +68,27 @@
* @return
*/
List<MwCheckoutRecordVO> checkoutRecordList(@Param("query") CheckoutRecordQuery query, @Param("treeCode") String treeCode);
+
+ /**
+ * 暂存间列表
+ *
+ * @return
+ */
+ List<MwStagingRoomVO> queryStagingRoomList();
+
+ /**
+ * 暂存间待处理医废分页列表
+ *
+ * @param query
+ * @return
+ */
+ Page<MwStorageRecordVO> temporarilyStoredMedicalWaste(StorageRecordQuery query);
+
+ /**
+ * 根据医废查询使用列表
+ *
+ * @param id
+ * @return
+ */
+ List<MwStorageRecordVO> queryMedicalWasteList(Long id);
}
--
Gitblit v1.7.1