From 00957f0c836b80d9052a6ccf673d3b454b646081 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 29 九月 2025 18:17:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 519ed8f..69a61ff 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
@@ -8,6 +8,7 @@
import com.ruoyi.system.dto.InventoryGoodsDto;
import com.ruoyi.system.model.TErpGoods;
import com.ruoyi.system.query.TClinicGoodsWarehouseQuery;
+import com.ruoyi.system.query.TErpGoodsAdminQuery;
import com.ruoyi.system.query.TErpGoodsInventoryQuery;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.vo.OutboundGoodsDetailVo;
@@ -44,7 +45,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);
@@ -72,4 +73,10 @@
OutboundGoodsDetailVo outboundGoodsDetail(String id);
+ PageInfo<TErpGoodsVO> pageList1(TErpGoodsQuery query, SysUser user);
+
+
+ PageInfo<TErpGoodsVO> pageAdminList(TErpGoodsAdminQuery query);
+
+
}
--
Gitblit v1.7.1