From 59099ec96f7a2da11df4b0b1593092b0aff38e90 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 13:45:52 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 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 e0eb8ff..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
@@ -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,8 @@
      */
     List<TErpGoodsVO> listExport(TErpGoodsQuery query, SysUser user);
 
-    boolean isExit(String goodsIdCode,String quasiNumber);
+    boolean isExit(String goodsIdCode,String quasiNumber,String id);
+    boolean isExitOne(String goodsIdCode,String quasiNumber,String id);
 
 
     PageInfo<TErpGoodsInventoryVO> pageInventoryGoodsPageList(@Valid TErpGoodsInventoryQuery query, SysUser user);
@@ -49,4 +52,31 @@
     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);
+
+
+    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