From 7df0337148d9d6d6158ad93564aa2a3c827265cc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 十月 2025 15:17:15 +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/TErpGoodsService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 69a61ff..f6eb505 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
@@ -7,10 +7,7 @@
import com.ruoyi.system.dto.InventoryDto;
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.query.*;
import com.ruoyi.system.vo.OutboundGoodsDetailVo;
import com.ruoyi.system.vo.TErpGoodsInventoryVO;
import com.ruoyi.system.vo.TErpGoodsVO;
@@ -46,6 +43,7 @@
List<TErpGoodsVO> listExport(TErpGoodsQuery query, SysUser user);
boolean isExit(String goodsIdCode,String quasiNumber,String id);
+ boolean isExitOne(String goodsIdCode,String quasiNumber,String id);
PageInfo<TErpGoodsInventoryVO> pageInventoryGoodsPageList(@Valid TErpGoodsInventoryQuery query, SysUser user);
@@ -79,4 +77,6 @@
PageInfo<TErpGoodsVO> pageAdminList(TErpGoodsAdminQuery query);
+ List<TErpGoods> pageAddList(Page<TErpGoods> tErpGoodsPage, String clinicSupplierId, PageAddListQuery query);
+
}
--
Gitblit v1.7.1