From 882045fad703a40e5f5aa7659d0b86fc5a145837 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 21 九月 2026 16:23:52 +0800
Subject: [PATCH] fix: 销售台账编辑限制标记实体类
---
src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
index 77faa01..625d615 100644
--- a/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
@@ -6,10 +6,13 @@
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.home.dto.IncomeExpenseAnalysisDto;
+import com.ruoyi.purchase.vo.PurchaseReportVo;
import com.ruoyi.sales.dto.SalesLedgerDto;
+import com.ruoyi.sales.dto.SalesLedgerEditFlagDto;
import com.ruoyi.sales.dto.SalesTrendDto;
import com.ruoyi.sales.dto.StatisticsTableDto;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.vo.SalesLedgerVo;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -52,7 +55,7 @@
* @param salesLedgerDto
* @return
*/
- IPage<SalesLedger> selectSalesLedgerListPage(Page page, @Param("salesLedgerDto") SalesLedgerDto salesLedgerDto);
+ IPage<SalesLedgerVo> selectSalesLedgerListPage(Page page, @Param("salesLedgerDto") SalesLedgerDto salesLedgerDto);
/**
* 鎸夋湀浠界粺璁¤鍗曟暟銆侀攢鍞锛堟敮鎸佷骇鍝佸ぇ绫汇�佸鎴峰悕绉扮瓫閫夛級
@@ -64,6 +67,7 @@
"DATE_FORMAT(sl.entry_date, '%Y-%m') AS month, " +
"COUNT(DISTINCT sl.id) AS order_count, " + // 鎬昏鍗曟暟
"SUM(slp.tax_inclusive_total_price) AS sales_amount, " + // 閿�鍞
+ "SUM(IFNULL(slp.quantity, 0)) AS product_quantity, " + // 浜у搧閿�鍞暟閲�
// 鍙戣揣鐜� = 鍙戣揣璁㈠崟鏁� * 100 / 鎬昏鍗曟暟锛堜繚鐣�2浣嶅皬鏁帮紝閬垮厤闄�0鎶ラ敊锛�
"ROUND(IF(COUNT(DISTINCT sl.id) = 0, 0, " +
"SUM(CASE WHEN slp.approve_status = 2 THEN 1 ELSE 0 END) / COUNT(DISTINCT sl.id) * 100), 2) AS ship_rate " +
@@ -83,4 +87,17 @@
"ORDER BY month" +
"</script>")
List<SalesTrendDto> statisticsTable(@Param("statisticsTableDto")StatisticsTableDto statisticsTableDto);
+
+ IPage<SalesLedgerDto> listSalesLedgerAndShipped(Page page, @Param("ew") SalesLedgerDto salesLedgerDto);
+
+ IPage<PurchaseReportVo> selectPurchaseReportVoPage(Page page, @Param("customerName") String customerName);
+
+ /**
+ * 鎵归噺鏌ヨ閿�鍞彴璐︾殑缂栬緫闄愬埗鏍囪
+ *
+ * @param ids 閿�鍞彴璐d闆嗗悎
+ * @return 姣忎釜鍙拌处鐨勯渶瑕佺敓浜�/鐢熶骇璁″垝宸蹭笅鍙�/宸插彂璐ф爣璁�
+ */
+ List<SalesLedgerEditFlagDto> selectEditFlags(@Param("ids") List<Long> ids);
+
}
--
Gitblit v1.9.3