From 29c138254853bacf032381982bc9154fdbe566dd Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 11 十月 2025 17:50:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java
index 1f874a9..610d12b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java
@@ -8,6 +8,7 @@
import com.ruoyi.system.model.TErpProcurement;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.query.TErpProcurementQuery;
+import com.ruoyi.system.vo.DetailProcurementVO;
import com.ruoyi.system.vo.TErpGoodsVO;
import com.ruoyi.system.vo.TErpProcurementDetailVo;
import com.ruoyi.system.vo.TErpProcurementVo;
@@ -27,6 +28,8 @@
PageInfo<TErpProcurementVo> pageList(TErpProcurementQuery query, SysUser user);
+ PageInfo<TErpProcurementVo> pageListWarehouse(TErpProcurementQuery query, SysUser user);
+
TErpProcurementDetailVo detail(String id, SysUser user, String goodsName);
@@ -36,6 +39,7 @@
List<TErpGoodsVO> inventoryNotEnoughList(SysUser user);
- String addProcurement(String clinicSupplierId, SysUser user, @Valid List<AddProcurementDto> dtos);
+ void addProcurement(String clinicSupplierId, SysUser user, @Valid List<AddProcurementDto> dtos);
+ DetailProcurementVO detailProcurement(String clinicSupplierId, SysUser user, String id);
}
--
Gitblit v1.7.1