From 283ea8cfd97f225d0451d57bf915e6f3a0f2041b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 28 九月 2025 19:03:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TErpClinicWarehousingService.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 9f50c22..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
@@ -1,17 +1,18 @@
package com.ruoyi.system.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
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.query.TErpGoodsQuery;
-import com.ruoyi.system.query.TErpInventoryQuery;
-import com.ruoyi.system.query.ValidityPeriodWarningQuery;
-import com.ruoyi.system.vo.InventoryDetailVo;
-import com.ruoyi.system.vo.PageInventoryListVo;
-import com.ruoyi.system.vo.TErpGoodsVO;
-import com.ruoyi.system.vo.ValidityPeriodWarningVo;
+import com.ruoyi.system.model.TErpGoods;
+import com.ruoyi.system.query.*;
+import com.ruoyi.system.vo.*;
+import javax.validation.Valid;
import java.util.List;
/**
@@ -32,4 +33,18 @@
PageInfo<TErpGoodsVO> pageList(TErpGoodsQuery query, SysUser user);
+ PageInfo<TErpClinicWarehousePageListVO> warehousePageList(TClinicWarehouseQuery query, SysUser user, String supplierClinicId);
+
+
+ PageInfo<TErpClinicOutboundPageListVO> outboundPageList(TClinicOutboundQuery query, 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