From bfcc71f500625a26886b43c43a8fdf2ea1152844 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 23 六月 2026 13:47:59 +0800
Subject: [PATCH] 环境检测排序，仓库绑定物联设备

---
 src/main/java/com/ruoyi/basic/service/ICustomerService.java |   71 +++++++++++++++++++++++++++++++++--
 1 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index 989e474..53ab6d6 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -5,7 +5,13 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.basic.dto.CustomerDto;
 import com.ruoyi.basic.pojo.Customer;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.basic.vo.CustomerVo;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.sales.vo.CustomerTransactionsDetailsVo;
+import com.ruoyi.sales.vo.CustomerTransactionsVo;
+import com.ruoyi.sales.vo.CustomerTransactionsProductVo;
+import com.ruoyi.sales.vo.CustomerTransactionsShipmentVo;
+import com.ruoyi.sales.vo.CustomerTransactionsSummaryVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -32,7 +38,7 @@
      * @param id 瀹㈡埛妗ｆ涓婚敭
      * @return 瀹㈡埛璇︽儏DTO
      */
-    CustomerDto selectCustomerDetailById(Long id);
+    CustomerVo selectCustomerDetailById(Long id);
 
     /**
      * 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
@@ -40,7 +46,6 @@
      * @param customer 瀹㈡埛妗ｆ
      * @return 瀹㈡埛妗ｆ闆嗗悎
      */
-    IPage<Customer> selectCustomerList(Page<Customer> page, Customer customer);
 
     /**
      * 鏂板瀹㈡埛妗ｆ
@@ -75,7 +80,63 @@
      */
     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<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);
+
+    /**
+     * 鏌ヨ瀹㈡埛寰�鏉ュ垪琛�
+     * @param page
+     * @param customerName
+     * @return
+     */
+    IPage<CustomerTransactionsVo> customewTransactions(Page page, String customerName);
+
+    /**
+     * 鏌ヨ瀹㈡埛寰�鏉ユ槑缁嗗垪琛�
+     * @param page
+     * @param customerId
+     * @return
+     */
+    IPage<CustomerTransactionsDetailsVo> customewTransactionsDetails(Page page, Long customerId);
+
+    /**
+     * 鏌ヨ瀹㈡埛寰�鏉ョ粺璁℃眹鎬伙紙浼樺寲鐗堬級
+     * @param customerId 瀹㈡埛ID
+     * @return 缁熻姹囨�绘暟鎹�
+     */
+    CustomerTransactionsSummaryVo getCustomerTransactionsSummary(Long customerId);
+
+    /**
+     * 鏌ヨ瀹㈡埛寰�鏉ヤ骇鍝佹槑缁�
+     * @param page 鍒嗛〉鍙傛暟
+     * @param customerId 瀹㈡埛ID
+     * @param salesLedgerId 閿�鍞彴璐D锛堝彲閫夛級
+     * @return 浜у搧鏄庣粏鍒嗛〉鏁版嵁
+     */
+    IPage<CustomerTransactionsProductVo> getCustomerTransactionsProducts(Page page, Long customerId, Long salesLedgerId);
+
+    /**
+     * 鏌ヨ瀹㈡埛寰�鏉ュ彂璐ф槑缁�
+     * @param page 鍒嗛〉鍙傛暟
+     * @param customerId 瀹㈡埛ID
+     * @param salesLedgerId 閿�鍞彴璐D锛堝彲閫夛級
+     * @return 鍙戣揣鏄庣粏鍒嗛〉鏁版嵁
+     */
+    IPage<CustomerTransactionsShipmentVo> getCustomerTransactionsShipments(Page page, Long customerId, Long salesLedgerId);
 }

--
Gitblit v1.9.3