From 092a98a583c4fe822a3eb4c4dac086f84b16189c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:58:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 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 82d1bc0..e4436ef 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,13 +1,23 @@
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.TClinicGoodsWarehouseQuery;
+import com.ruoyi.system.query.TErpGoodsInventoryQuery;
import com.ruoyi.system.query.TErpGoodsQuery;
+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;
+import java.util.List;
/**
* <p>
@@ -26,7 +36,40 @@
*/
PageInfo<TErpGoodsVO> pageList(TErpGoodsQuery query, SysUser user);
- boolean isExit(String goodsIdCode);
+
+ /**
+ * 导出
+ * @param query
+ * @return
+ */
+ List<TErpGoodsVO> listExport(TErpGoodsQuery query, SysUser user);
+
+ boolean isExit(String goodsIdCode,String quasiNumber,String id);
+
+
+ PageInfo<TErpGoodsInventoryVO> pageInventoryGoodsPageList(@Valid TErpGoodsInventoryQuery query, SysUser user);
+
+
+ void inventoryGoods(InventoryDto dto, SysUser user);
+
+
+ List<TErpGoodsInventoryVO> pageInventoryGoodsList(@Valid String warehouseId, SysUser user);
+
+
+ PageInfo<TErpGoodsInventoryVO> pageInventoryGoodsPageList1(@Valid TErpGoodsInventoryQuery query, SysUser user);
+
+ void inventoryGoods1(@Valid InventoryDto dto, SysUser user);
+
+ List<TErpGoodsInventoryVO> pageInventoryGoodsList1(String warehouseId, SysUser user);
+
+
+ Page<TErpGoods> warehouseGoodsPageList(TClinicGoodsWarehouseQuery query, SysUser user, String supplierClinicId);
+
+
+ WarehouseGoodsDetailVo warehouseGoodsDetail(String id);
+
+
+ OutboundGoodsDetailVo outboundGoodsDetail(String id);
}
--
Gitblit v1.7.1