From 87c1e76403b09b137ad07abd75350a4b4cc23694 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 28 九月 2025 16:22:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TErpClinicWarehousingService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpClinicWarehousingService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpClinicWarehousingService.java
index 6df47c1..e1b62e3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpClinicWarehousingService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpClinicWarehousingService.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.dto.ClinicOutboundGoodsDto;
+import com.ruoyi.system.dto.WarehouseGoodsDto;
import com.ruoyi.system.dto.clinicWarehouseGoodsDto;
import com.ruoyi.system.model.TErpClinicWarehousing;
import com.ruoyi.system.model.TErpGoods;
@@ -38,9 +39,12 @@
PageInfo<TErpClinicOutboundPageListVO> outboundPageList(TClinicOutboundQuery query, SysUser user, String supplierClinicId);
- void warehouseGoods(@Valid List<clinicWarehouseGoodsDto> dtos, SysUser user, String supplierClinicId);
+ void warehouseGoods(@Valid WarehouseGoodsDto dto, SysUser user, String supplierClinicId);
void outboundGoods(@Valid ClinicOutboundGoodsDto dto, SysUser user, String supplierClinicId);
+ List<TErpGoodsVO> pageList1(TErpGoodsQuery query, SysUser user);
+
+
}
--
Gitblit v1.7.1