From 76c84d95506998f546e6f3ebbf70414c0dd9da9d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 15 五月 2026 17:15:15 +0800
Subject: [PATCH] refactor(stock): 优化库存记录服务中的仓库信息处理逻辑

---
 src/main/java/com/ruoyi/basic/service/ICustomerService.java |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index 3a300ea..e30734d 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -4,10 +4,9 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.basic.dto.CustomerDto;
-import com.ruoyi.basic.dto.CustomerPrivatePoolDto;
 import com.ruoyi.basic.pojo.Customer;
 import com.ruoyi.basic.vo.CustomerVo;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -49,7 +48,7 @@
      * @param customer 瀹㈡埛妗f
      * @return 缁撴灉
      */
-    int insertCustomer(Customer customer);
+    int insertCustomer(CustomerDto customer);
 
     /**
      * 淇敼瀹㈡埛妗f
@@ -57,7 +56,7 @@
      * @param customer 瀹㈡埛妗f
      * @return 缁撴灉
      */
-    int updateCustomer(Customer customer);
+    int updateCustomer(CustomerDto customer);
 
     /**
      * 鎵归噺鍒犻櫎瀹㈡埛妗f
@@ -76,13 +75,22 @@
      */
     List<Map<String, Object>> customerList(Customer customer);
 
-    List<Customer> selectCustomerLists(Customer customer);
+    List<CustomerVo> selectCustomerLists(CustomerDto customer);
 
-    AjaxResult importData(MultipartFile file);
+    R importData(MultipartFile file, Integer type);
 
-    IPage<CustomerDto> selectCustomerList(Page<CustomerDto> page, CustomerDto customer);
+    IPage<CustomerVo> selectCustomerList(Page<CustomerDto> page, CustomerDto customer);
 
     void assignCustomer(CustomerDto customer);
 
     void recycleCustomer(CustomerDto customer);
+
+    /**
+     * 鍏变韩瀹㈡埛缁欏叾浠栫敤鎴�
+     *
+     * @param customerDto 瀹㈡埛DTO锛堝寘鍚鎴稩D鍜屽叡浜敤鎴稩D鍒楄〃锛�
+     */
+    void together(CustomerDto customerDto);
+
+    Boolean back(Long id);
 }

--
Gitblit v1.9.3