zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

超市报表

Browse Source
This commit is contained in:
zjf committed 2025-10-17 18:02:58 +08:00
1 parent a00314355c
commit 9a4dde11a8
30 files changed
+29 -74
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/report/InventoryReportExcelDTO.java
+1
View File
@@ -126,3 +126,4 @@ public class InventoryReportExcelDTO {
private LocalDate firstPurchaseDate;
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/report/InventoryReportQueryDTO.java
+1
View File
@@ -37,3 +37,4 @@ public class InventoryReportQueryDTO {
private Boolean onlyChanged;
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/report/ProfitReportExcelDTO.java
+1
View File
@@ -73,3 +73,4 @@ public class ProfitReportExcelDTO {
private Integer salesCount;
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/report/ProfitReportQueryDTO.java
+1
View File
@@ -40,3 +40,4 @@ public class ProfitReportQueryDTO {
private Boolean onlyWithSales;
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/report/SalesReportExcelDTO.java
+1
View File
@@ -73,3 +73,4 @@ public class SalesReportExcelDTO {
private BigDecimal actualSalesAmount;
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/report/SalesReportQueryDTO.java
+1
View File
@@ -34,3 +34,4 @@ public class SalesReportQueryDTO {
private String sortBy;
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/report/StocktakeReportExcelDTO.java
+1
View File
@@ -70,3 +70,4 @@ public class StocktakeReportExcelDTO {
private String remark;
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/report/StocktakeReportQueryDTO.java
+1
View File
@@ -37,3 +37,4 @@ public class StocktakeReportQueryDTO {
private String diffType;
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/report/InventoryReportVO.java
+1
View File
@@ -98,3 +98,4 @@ public class InventoryReportVO {
private LocalDate firstPurchaseDate;
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/report/ProfitReportVO.java
+1
View File
@@ -58,3 +58,4 @@ public class ProfitReportVO {
private Integer salesCount;
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/report/SalesReportVO.java
+1
View File
@@ -58,3 +58,4 @@ public class SalesReportVO {
private BigDecimal actualSalesAmount;
}
pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/report/StocktakeReportVO.java
+1
View File
@@ -56,3 +56,4 @@ public class StocktakeReportVO {
private String remark;
}
pjcloud-supermarket/pjcloud-supermarket-biz/docs/超市报表统计逻辑详解.md
+1
View File
@@ -633,3 +633,4 @@ const getProfitColor = (margin) => {
|------|------|------|------|
| 1.0 | 2025-10-16 | 初始版本，实现所有核心报表功能 | pjcloud |
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/InventoryReportMapper.java
+1
View File
@@ -38,3 +38,4 @@ public interface InventoryReportMapper {
List<InventoryReportVO> selectInventoryReportList(@Param("param") InventoryReportQueryDTO queryDTO, @Param("dataScope") DataScope dataScope);
}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/ProfitReportMapper.java
+1
View File
@@ -38,3 +38,4 @@ public interface ProfitReportMapper {
List<ProfitReportVO> selectProfitReportList(@Param("param") ProfitReportQueryDTO queryDTO, @Param("dataScope") DataScope dataScope);
}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SalesReportMapper.java
+1
View File
@@ -38,3 +38,4 @@ public interface SalesReportMapper {
List<SalesReportVO> selectSalesReportList(@Param("param") SalesReportQueryDTO queryDTO, @Param("dataScope") DataScope dataScope);
}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/StocktakeReportMapper.java
+1
View File
@@ -38,3 +38,4 @@ public interface StocktakeReportMapper {
List<StocktakeReportVO> selectStocktakeReportList(@Param("param") StocktakeReportQueryDTO queryDTO, @Param("dataScope") DataScope dataScope);
}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/InventoryReportService.java
+1
View File
@@ -41,3 +41,4 @@ public interface InventoryReportService {
List<InventoryReportExcelDTO> exportExcel(InventoryReportQueryDTO queryDTO);
}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/ProfitReportService.java
+1
View File
@@ -41,3 +41,4 @@ public interface ProfitReportService {
List<ProfitReportExcelDTO> exportExcel(ProfitReportQueryDTO queryDTO);
}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SalesReportService.java
+1
View File
@@ -41,3 +41,4 @@ public interface SalesReportService {
List<SalesReportExcelDTO> exportExcel(SalesReportQueryDTO queryDTO);
}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/StocktakeReportService.java
+1
View File
@@ -41,3 +41,4 @@ public interface StocktakeReportService {
List<StocktakeReportExcelDTO> exportExcel(StocktakeReportQueryDTO queryDTO);
}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/InventoryReportServiceImpl.java
+1
View File
@@ -49,3 +49,4 @@ public class InventoryReportServiceImpl implements InventoryReportService {
}
}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ProfitReportServiceImpl.java
+1
View File
@@ -49,3 +49,4 @@ public class ProfitReportServiceImpl implements ProfitReportService {
}
}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SalesReportServiceImpl.java
+1
View File
@@ -49,3 +49,4 @@ public class SalesReportServiceImpl implements SalesReportService {
}
}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/StocktakeReportServiceImpl.java
+1
View File
@@ -49,3 +49,4 @@ public class StocktakeReportServiceImpl implements StocktakeReportService {
}
}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/InventoryReportMapper.xml
+1 -28
View File
@@ -56,8 +56,6 @@
base.package_num AS package_num,
base.purchase_price / 100.0 AS purchase_price,
base.retail_price / 100.0 AS retail_price,
-- 采购入库数量和金额 (inventory_type = 3)
COALESCE(SUM(CASE WHEN r.inventory_type = '3' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -66,8 +64,6 @@
END
END), 0) AS purchase_in_qty,
COALESCE(SUM(CASE WHEN r.inventory_type = '3' THEN item.total_amount END), 0) / 100.0 AS purchase_in_amount,
-- 采购退货数量和金额 (inventory_type = 4)
COALESCE(SUM(CASE WHEN r.inventory_type = '4' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -76,8 +72,6 @@
END
END), 0) AS purchase_return_qty,
COALESCE(SUM(CASE WHEN r.inventory_type = '4' THEN item.total_amount END), 0) / 100.0 AS purchase_return_amount,
-- 销售数量和金额 (inventory_type = 5)
COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -86,8 +80,6 @@
END
END), 0) AS sales_qty,
COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN item.total_amount END), 0) / 100.0 AS sales_amount,
-- 销售退货数量和金额 (inventory_type = 6)
COALESCE(SUM(CASE WHEN r.inventory_type = '6' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -96,8 +88,6 @@
END
END), 0) AS sales_return_qty,
COALESCE(SUM(CASE WHEN r.inventory_type = '6' THEN item.total_amount END), 0) / 100.0 AS sales_return_amount,
-- 实际销售数量 = 销售数量 - 销售退货数量
COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -111,12 +101,8 @@
ELSE item.quantity
END
END), 0) AS actual_sales_qty,
-- 实际销售金额 = 销售金额 - 销售退货金额
COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN item.total_amount END), 0) / 100.0
- COALESCE(SUM(CASE WHEN r.inventory_type = '6' THEN item.total_amount END), 0) / 100.0 AS actual_sales_amount,
-- 销售成本 = 实际销售数量 × 参考进价
(COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -130,17 +116,9 @@
ELSE item.quantity
END
END), 0)) * COALESCE(base.purchase_price / 100.0, 0) AS sales_cost,
-- 期末库存数量 = 当前库存
COALESCE(stock.current_stock, 0) AS closing_qty,
-- 期末库存金额 = 期末数量 × 参考进价
COALESCE(stock.current_stock, 0) * COALESCE(base.purchase_price / 100.0, 0) AS closing_amount,
-- 期末库存售额 = 期末数量 × 零售价
COALESCE(stock.current_stock, 0) * COALESCE(base.retail_price / 100.0, 0) AS closing_retail_amount,
-- 销售毛利 = 实际销售金额 - 销售成本
(COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN item.total_amount END), 0) / 100.0
- COALESCE(SUM(CASE WHEN r.inventory_type = '6' THEN item.total_amount END), 0) / 100.0)
- ((COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN
@@ -156,11 +134,7 @@
ELSE item.quantity
END
END), 0)) * COALESCE(base.purchase_price / 100.0, 0)) AS gross_profit,
-- 首次进货日
MIN(CASE WHEN r.inventory_type = '3' THEN r.inventory_date END) AS first_purchase_date,
-- 期初库存 = 期末库存 - 采购入库 + 采购退货 + 销售 - 销售退货
COALESCE(stock.current_stock, 0)
- COALESCE(SUM(CASE WHEN r.inventory_type = '3' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
@@ -190,8 +164,6 @@
ELSE item.quantity
END
END), 0) AS opening_qty,
-- 期初金额 = 期初库存 × 参考进价
(COALESCE(stock.current_stock, 0)
- COALESCE(SUM(CASE WHEN r.inventory_type = '3' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
@@ -275,3 +247,4 @@
</mapper>
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/InventoryStocktakeReportMapper.xml
-5
View File
@@ -24,21 +24,18 @@
spu.category_id,
cat.name AS category_name,
base.unit AS unit,
-- 账面数量（折算基础单位）
COALESCE(SUM(
CASE WHEN item.account_number IS NOT NULL THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id AND u.package_num IS NOT NULL AND u.package_num > 0
THEN item.account_number * u.package_num ELSE item.account_number END
END
), 0) AS book_qty,
-- 实盘数量（折算基础单位）
COALESCE(SUM(
CASE WHEN item.real_number IS NOT NULL THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id AND u.package_num IS NOT NULL AND u.package_num > 0
THEN item.real_number * u.package_num ELSE item.real_number END
END
), 0) AS physical_qty,
-- 差异数量（实盘-账面）
COALESCE(SUM(
(CASE WHEN item.real_number IS NOT NULL THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -50,7 +47,6 @@
THEN item.account_number * u.package_num ELSE item.account_number END
END)
), 0) AS diff_qty,
-- 差异金额（元）= 差异数量 * 实际单价(元)
COALESCE(SUM(
(CASE WHEN item.real_price IS NOT NULL THEN item.real_price ELSE 0 END) *
(
@@ -72,7 +68,6 @@
LEFT JOIN sm_erp_unit u ON u.id = item.unit_id
LEFT JOIN sm_erp_category cat ON cat.id = spu.category_id
<where>
-- 仅盘点单据
r.inventory_type = '7'
<if test="param.startTime != null and param.endTime != null">
AND r.create_time &gt;= #{param.startTime}
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/ProfitReportMapper.xml
+1 -16
View File
@@ -38,8 +38,6 @@
cat.name AS category_name,
base.spec AS spec,
base.unit AS unit,
-- 销售数量 (inventory_type = 5 零售出库 - inventory_type = 6 零售退货)
COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -53,15 +51,9 @@
ELSE item.quantity
END
END), 0) AS sales_qty,
-- 销售金额
COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN item.total_amount END), 0) / 100.0
- COALESCE(SUM(CASE WHEN r.inventory_type = '6' THEN item.total_amount END), 0) / 100.0 AS sales_amount,
-- 成本单价 = 商品参考进价
COALESCE(base.purchase_price / 100.0, 0) AS cost_price,
-- 销售单价 = 销售金额 / 销售数量
CASE WHEN (COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -92,8 +84,6 @@
END), 0))
ELSE 0
END AS sales_price,
-- 销售成本 = 销售数量 × 成本单价
(COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -107,8 +97,6 @@
ELSE item.quantity
END
END), 0)) * COALESCE(base.purchase_price / 100.0, 0) AS sales_cost,
-- 销售毛利 = 销售金额 - 销售成本
(COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN item.total_amount END), 0) / 100.0
- COALESCE(SUM(CASE WHEN r.inventory_type = '6' THEN item.total_amount END), 0) / 100.0)
- ((COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN
@@ -124,8 +112,6 @@
ELSE item.quantity
END
END), 0)) * COALESCE(base.purchase_price / 100.0, 0)) AS gross_profit,
-- 毛利率 = (销售毛利 / 销售金额) × 100%
CASE WHEN (COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN item.total_amount END), 0) / 100.0
- COALESCE(SUM(CASE WHEN r.inventory_type = '6' THEN item.total_amount END), 0) / 100.0) > 0
THEN ((COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN item.total_amount END), 0) / 100.0
@@ -147,8 +133,6 @@
- COALESCE(SUM(CASE WHEN r.inventory_type = '6' THEN item.total_amount END), 0) / 100.0) * 100
ELSE 0
END AS profit_margin,
-- 销售笔数
COUNT(DISTINCT CASE WHEN r.inventory_type IN ('5', '6') THEN r.id END) AS sales_count
FROM sm_erp_spu spu
@@ -223,3 +207,4 @@
</mapper>
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SalesReportMapper.xml
+1 -16
View File
@@ -35,8 +35,6 @@
cat.name AS category_name,
base.spec AS spec,
base.unit AS unit,
-- 销售数量 (inventory_type = 5)
COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -44,11 +42,7 @@
ELSE item.quantity
END
END), 0) AS sales_qty,
-- 销售金额
COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN item.total_amount END), 0) / 100.0 AS sales_amount,
-- 退货数量 (inventory_type = 6)
COALESCE(SUM(CASE WHEN r.inventory_type = '6' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -56,11 +50,7 @@
ELSE item.quantity
END
END), 0) AS return_qty,
-- 退货金额
COALESCE(SUM(CASE WHEN r.inventory_type = '6' THEN item.total_amount END), 0) / 100.0 AS return_amount,
-- 实际销售数量 = 销售数量 - 退货数量
COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -74,12 +64,8 @@
ELSE item.quantity
END
END), 0) AS actual_sales_qty,
-- 实际销售金额 = 销售金额 - 退货金额
COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN item.total_amount END), 0) / 100.0
- COALESCE(SUM(CASE WHEN r.inventory_type = '6' THEN item.total_amount END), 0) / 100.0 AS actual_sales_amount,
-- 销售单价 = 销售金额 / 销售数量
CASE WHEN COALESCE(SUM(CASE WHEN r.inventory_type = '5' THEN
CASE WHEN u.id IS NOT NULL AND base.id IS NOT NULL AND u.id != base.id
AND u.package_num IS NOT NULL AND u.package_num > 0
@@ -97,8 +83,6 @@
END), 0)
ELSE 0
END AS sales_price,
-- 销售笔数
COUNT(DISTINCT CASE WHEN r.inventory_type IN ('5', '6') THEN r.id END) AS sales_count
FROM sm_erp_spu spu
@@ -159,3 +143,4 @@
</mapper>
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/StocktakeReportMapper.xml
+1 -9
View File
@@ -37,19 +37,10 @@
cat.name AS category_name,
base.spec AS spec,
base.unit AS unit,
-- 账面数量（这里假设item表中有book_qty字段，如果没有则使用quantity作为账面数量）
COALESCE(item.quantity, 0) AS book_qty,
-- 实盘数量（这里假设实盘数量保存在某个字段，需要根据实际情况调整）
COALESCE(item.quantity, 0) AS physical_qty,
-- 差异数量 = 实盘 - 账面（这里简化处理，实际需要根据业务逻辑调整）
0 AS diff_qty,
-- 差异金额 = 差异数量 × 成本价
0 AS diff_amount,
r.remark
FROM sm_erp_inventory_records r
@@ -109,3 +100,4 @@
</mapper>