From 49dd9ee3dea22203cd1a0cc53745cffb6607122c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 十月 2025 18:28:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java
index 5bc81ed..95b7319 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java
@@ -1,15 +1,17 @@
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.InventoryDto;
import com.ruoyi.system.dto.InventoryGoodsDto;
import com.ruoyi.system.model.TErpGoods;
-import com.ruoyi.system.query.TErpGoodsInventoryQuery;
-import com.ruoyi.system.query.TErpGoodsQuery;
+import com.ruoyi.system.query.*;
+import com.ruoyi.system.vo.OutboundGoodsDetailVo;
import com.ruoyi.system.vo.TErpGoodsInventoryVO;
import com.ruoyi.system.vo.TErpGoodsVO;
+import com.ruoyi.system.vo.WarehouseGoodsDetailVo;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
@@ -40,7 +42,7 @@
*/
List<TErpGoodsVO> listExport(TErpGoodsQuery query, SysUser user);
- boolean isExit(String goodsIdCode,String quasiNumber);
+ boolean isExit(String goodsIdCode,String quasiNumber,String id);
PageInfo<TErpGoodsInventoryVO> pageInventoryGoodsPageList(@Valid TErpGoodsInventoryQuery query, SysUser user);
@@ -59,4 +61,21 @@
List<TErpGoodsInventoryVO> pageInventoryGoodsList1(String warehouseId, SysUser user);
+ Page<TErpGoods> warehouseGoodsPageList(TClinicGoodsWarehouseQuery query, SysUser user, String supplierClinicId);
+
+
+ WarehouseGoodsDetailVo warehouseGoodsDetail(String id);
+
+
+ OutboundGoodsDetailVo outboundGoodsDetail(String id);
+
+
+ PageInfo<TErpGoodsVO> pageList1(TErpGoodsQuery query, SysUser user);
+
+
+ PageInfo<TErpGoodsVO> pageAdminList(TErpGoodsAdminQuery query);
+
+
+ List<TErpGoods> pageAddList(Page<TErpGoods> tErpGoodsPage, String clinicSupplierId, PageAddListQuery query);
+
}
--
Gitblit v1.7.1