DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据看板更新前后端

Browse Source
This commit is contained in:
Joshi
2025-07-30 10:54:11 +08:00
parent 5c42bf666a
commit 064d1dd41b
18 changed files with 1414 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
klp-wms/src/main/java/com/klp/domain/vo/CurrentSituationAreaVO.java Normal file
View File

@@ -0,0 +1,29 @@
package com.klp.domain.vo;
import lombok.Data;
import java.util.List;
/**
* 当前情况区视图对象
*
* @author klp
* @date 2025-01-27
*/
@Data
public class CurrentSituationAreaVO {
/**
* 订单所需的产品统计
*/
private List<OrderProductStatisticsVO> orderProductStatistics;
/**
* 根据BOM计算的原料需求（产品维度）
*/
private List<ProductMaterialRequirementVO> productMaterialRequirements;
/**
* 原料库存和需求情况
*/
private List<RawMaterialInventoryVO> rawMaterialInventory;
}

17
klp-wms/src/main/java/com/klp/domain/vo/DashboardOverviewVO.java
View File

@@ -36,4 +36,21 @@ public class DashboardOverviewVO {
* 客户分布
*/
private List<CustomerRegionVO> customerRegion;
// ========== 新增业务区域 ==========
/**
* 业绩区数据
*/
private PerformanceAreaVO performanceArea;
/**
* 当前情况区数据
*/
private CurrentSituationAreaVO currentSituationArea;
/**
* 推荐区数据
*/
private RecommendationAreaVO recommendationArea;
}

53
klp-wms/src/main/java/com/klp/domain/vo/MaterialRecommendationVO.java Normal file
View File

@@ -0,0 +1,53 @@
package com.klp.domain.vo;
import lombok.Data;
/**
* 原料维度推荐视图对象
*
* @author klp
* @date 2025-01-27
*/
@Data
public class MaterialRecommendationVO {
/**
* 原料名称
*/
private String materialName;
/**
* 原料编号
*/
private String materialCode;
/**
* 推荐采购数量
*/
private Double recommendedPurchaseQuantity;
/**
* 推荐供应商
*/
private String recommendedSupplier;
/**
* 推荐原因
*/
private String recommendationReason;
/**
* 紧急程度
*/
private String urgencyLevel;
/**
* 预计到货时间
*/
private String estimatedArrivalTime;
/**
* 建议操作
*/
private String suggestedAction;
}

43
klp-wms/src/main/java/com/klp/domain/vo/OrderCountStatisticsVO.java Normal file
View File

@@ -0,0 +1,43 @@
package com.klp.domain.vo;
import lombok.Data;
/**
* 总订单数量统计视图对象
*
* @author klp
* @date 2025-01-27
*/
@Data
public class OrderCountStatisticsVO {
/**
* 总订单数量
*/
private Integer totalOrderCount;
/**
* 已完成订单数量
*/
private Integer completedOrderCount;
/**
* 进行中订单数量
*/
private Integer inProgressOrderCount;
/**
* 待处理订单数量
*/
private Integer pendingOrderCount;
/**
* 本月新增订单数量
*/
private Integer monthlyNewOrderCount;
/**
* 订单完成率
*/
private Double completionRate;
}

43
klp-wms/src/main/java/com/klp/domain/vo/OrderProductStatisticsVO.java Normal file
View File

@@ -0,0 +1,43 @@
package com.klp.domain.vo;
import lombok.Data;
/**
* 订单所需的产品统计视图对象
*
* @author klp
* @date 2025-01-27
*/
@Data
public class OrderProductStatisticsVO {
/**
* 产品名称
*/
private String productName;
/**
* 产品编号
*/
private String productCode;
/**
* 订单需求数量
*/
private Double orderDemandQuantity;
/**
* 当前库存数量
*/
private Double currentStockQuantity;
/**
* 库存缺口
*/
private Double stockGap;
/**
* 相关订单数量
*/
private Integer relatedOrderCount;
}

48
klp-wms/src/main/java/com/klp/domain/vo/OrderRecommendationVO.java Normal file
View File

@@ -0,0 +1,48 @@
package com.klp.domain.vo;
import lombok.Data;
/**
* 订单维度推荐视图对象
*
* @author klp
* @date 2025-01-27
*/
@Data
public class OrderRecommendationVO {
/**
* 订单编号
*/
private String orderCode;
/**
* 客户名称
*/
private String customerName;
/**
* 订单状态
*/
private String orderStatus;
/**
* 推荐优先级
*/
private String priority;
/**
* 推荐原因
*/
private String recommendationReason;
/**
* 建议操作
*/
private String suggestedAction;
/**
* 预计完成时间
*/
private String estimatedCompletionTime;
}

29
klp-wms/src/main/java/com/klp/domain/vo/PerformanceAreaVO.java Normal file
View File

@@ -0,0 +1,29 @@
package com.klp.domain.vo;
import lombok.Data;
import java.util.List;
/**
* 业绩区视图对象
*
* @author klp
* @date 2025-01-27
*/
@Data
public class PerformanceAreaVO {
/**
* 产品销售情况
*/
private List<ProductSalesPerformanceVO> productSalesPerformance;
/**
* 销售人员业绩
*/
private List<SalesPersonPerformanceVO> salesPersonPerformance;
/**
* 总订单数量统计
*/
private OrderCountStatisticsVO orderCountStatistics;
}

53
klp-wms/src/main/java/com/klp/domain/vo/ProductMaterialRequirementVO.java Normal file
View File

@@ -0,0 +1,53 @@
package com.klp.domain.vo;
import lombok.Data;
/**
* 根据BOM计算的原料需求视图对象
*
* @author klp
* @date 2025-01-27
*/
@Data
public class ProductMaterialRequirementVO {
/**
* 产品名称
*/
private String productName;
/**
* 产品编号
*/
private String productCode;
/**
* 原料名称
*/
private String materialName;
/**
* 原料编号
*/
private String materialCode;
/**
* 需求数量
*/
private Double requiredQuantity;
/**
* 当前库存数量
*/
private Double currentStockQuantity;
/**
* 在途数量
*/
private Double inTransitQuantity;
/**
* 库存缺口
*/
private Double stockGap;
}

43
klp-wms/src/main/java/com/klp/domain/vo/ProductSalesPerformanceVO.java Normal file
View File

@@ -0,0 +1,43 @@
package com.klp.domain.vo;
import lombok.Data;
/**
* 产品销售情况视图对象
*
* @author klp
* @date 2025-01-27
*/
@Data
public class ProductSalesPerformanceVO {
/**
* 产品名称
*/
private String productName;
/**
* 产品编号
*/
private String productCode;
/**
* 销售数量
*/
private Double salesQuantity;
/**
* 销售金额
*/
private Double salesAmount;
/**
* 销售增长率
*/
private Double growthRate;
/**
* 销售排名
*/
private Integer salesRank;
}

53
klp-wms/src/main/java/com/klp/domain/vo/RawMaterialInventoryVO.java Normal file
View File

@@ -0,0 +1,53 @@
package com.klp.domain.vo;
import lombok.Data;
/**
* 原料库存和需求情况视图对象
*
* @author klp
* @date 2025-01-27
*/
@Data
public class RawMaterialInventoryVO {
/**
* 原料名称
*/
private String materialName;
/**
* 原料编号
*/
private String materialCode;
/**
* 当前库存数量
*/
private Double currentStockQuantity;
/**
* 在途数量
*/
private Double inTransitQuantity;
/**
* 总需求数量
*/
private Double totalRequiredQuantity;
/**
* 库存缺口
*/
private Double stockGap;
/**
* 安全库存
*/
private Double safetyStock;
/**
* 库存状态（充足/不足/紧急）
*/
private String stockStatus;
}

24
klp-wms/src/main/java/com/klp/domain/vo/RecommendationAreaVO.java Normal file
View File

@@ -0,0 +1,24 @@
package com.klp.domain.vo;
import lombok.Data;
import java.util.List;
/**
* 推荐区视图对象
*
* @author klp
* @date 2025-01-27
*/
@Data
public class RecommendationAreaVO {
/**
* 订单维度推荐
*/
private List<OrderRecommendationVO> orderRecommendations;
/**
* 原料维度推荐
*/
private List<MaterialRecommendationVO> materialRecommendations;
}

38
klp-wms/src/main/java/com/klp/domain/vo/SalesPersonPerformanceVO.java Normal file
View File

@@ -0,0 +1,38 @@
package com.klp.domain.vo;
import lombok.Data;
/**
* 销售人员业绩视图对象
*
* @author klp
* @date 2025-01-27
*/
@Data
public class SalesPersonPerformanceVO {
/**
* 销售人员姓名
*/
private String salesPersonName;
/**
* 订单数量
*/
private Integer orderCount;
/**
* 销售金额
*/
private Double salesAmount;
/**
* 完成率
*/
private Double completionRate;
/**
* 业绩排名
*/
private Integer performanceRank;
}

163
klp-wms/src/main/java/com/klp/mapper/WmsProductMapper.java
View File

@@ -51,4 +51,167 @@ public interface WmsProductMapper extends BaseMapperPlus<WmsProductMapper, WmsPr
@Select("SELECT o.customer_name AS region, COUNT(*) AS customerCount " +
"FROM wms_order o WHERE o.del_flag=0 GROUP BY o.customer_name")
List<CustomerRegionVO> selectCustomerRegion();
// ========== 新增业务区域查询方法 ==========
// 业绩区 - 产品销售情况
@Select("SELECT p.product_name, p.product_code, " +
"SUM(od.quantity) AS salesQuantity, " +
"SUM(od.quantity) AS salesAmount, " +
"0 AS growthRate, " +
"RANK() OVER (ORDER BY SUM(od.quantity) DESC) AS salesRank " +
"FROM wms_order_detail od " +
"JOIN wms_product p ON od.product_id = p.product_id " +
"JOIN wms_order o ON od.order_id = o.order_id " +
"WHERE o.order_status = 2 AND o.del_flag = 0 " +
"GROUP BY p.product_id, p.product_name, p.product_code " +
"ORDER BY salesQuantity DESC LIMIT 10")
List<ProductSalesPerformanceVO> selectProductSalesPerformance();
// 业绩区 - 销售人员业绩
@Select("SELECT o.sales_manager AS salesPersonName, " +
"COUNT(DISTINCT o.order_id) AS orderCount, " +
"SUM(od.quantity) AS salesAmount, " +
"ROUND(SUM(CASE WHEN o.order_status = 2 THEN 1 ELSE 0 END) / COUNT(*), 4) AS completionRate, " +
"RANK() OVER (ORDER BY SUM(od.quantity) DESC) AS performanceRank " +
"FROM wms_order o " +
"JOIN wms_order_detail od ON o.order_id = od.order_id " +
"WHERE o.del_flag = 0 " +
"GROUP BY o.sales_manager " +
"ORDER BY salesAmount DESC")
List<SalesPersonPerformanceVO> selectSalesPersonPerformance();
// 业绩区 - 总订单数量统计
@Select("SELECT " +
"COUNT(*) AS totalOrderCount, " +
"SUM(CASE WHEN order_status = 2 THEN 1 ELSE 0 END) AS completedOrderCount, " +
"SUM(CASE WHEN order_status = 1 THEN 1 ELSE 0 END) AS inProgressOrderCount, " +
"SUM(CASE WHEN order_status = 0 THEN 1 ELSE 0 END) AS pendingOrderCount, " +
"SUM(CASE WHEN DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') THEN 1 ELSE 0 END) AS monthlyNewOrderCount, " +
"ROUND(SUM(CASE WHEN order_status = 2 THEN 1 ELSE 0 END) / COUNT(*), 4) AS completionRate " +
"FROM wms_order WHERE del_flag = 0")
OrderCountStatisticsVO selectOrderCountStatistics();
// 当前情况区 - 订单所需的产品统计
@Select("SELECT p.product_name, p.product_code, " +
"SUM(od.quantity) AS orderDemandQuantity, " +
"IFNULL(s.stockQuantity, 0) AS currentStockQuantity, " +
"SUM(od.quantity) - IFNULL(s.stockQuantity, 0) AS stockGap, " +
"COUNT(DISTINCT o.order_id) AS relatedOrderCount " +
"FROM wms_order_detail od " +
"JOIN wms_product p ON od.product_id = p.product_id " +
"JOIN wms_order o ON od.order_id = o.order_id " +
"LEFT JOIN (SELECT item_id, SUM(quantity) AS stockQuantity FROM wms_stock WHERE item_type = 'product' AND del_flag = 0 GROUP BY item_id) s ON p.product_id = s.item_id " +
"WHERE o.order_status IN (0, 1) AND o.del_flag = 0 " +
"GROUP BY p.product_id, p.product_name, p.product_code " +
"ORDER BY stockGap DESC")
List<OrderProductStatisticsVO> selectOrderProductStatistics();
// 当前情况区 - 根据BOM计算的原料需求
@Select("SELECT p.product_name, p.product_code, " +
"rm.raw_material_name AS materialName, " +
"rm.raw_material_code AS materialCode, " +
"SUM(od.quantity * pb.quantity) AS requiredQuantity, " +
"IFNULL(s.stockQuantity, 0) AS currentStockQuantity, " +
"IFNULL(it.inTransitQuantity, 0) AS inTransitQuantity, " +
"SUM(od.quantity * pb.quantity) - IFNULL(s.stockQuantity, 0) - IFNULL(it.inTransitQuantity, 0) AS stockGap " +
"FROM wms_order_detail od " +
"JOIN wms_product p ON od.product_id = p.product_id " +
"JOIN wms_product_bom pb ON p.product_id = pb.product_id " +
"JOIN wms_raw_material rm ON pb.raw_material_id = rm.raw_material_id " +
"JOIN wms_order o ON od.order_id = o.order_id " +
"LEFT JOIN (SELECT item_id, SUM(quantity) AS stockQuantity FROM wms_stock WHERE item_type = 'raw_material' AND del_flag = 0 GROUP BY item_id) s ON rm.raw_material_id = s.item_id " +
"LEFT JOIN (SELECT raw_material_id, SUM(quantity) AS inTransitQuantity FROM wms_purchase_plan_detail WHERE status = 1 GROUP BY raw_material_id) it ON rm.raw_material_id = it.raw_material_id " +
"WHERE o.order_status IN (0, 1) AND o.del_flag = 0 " +
"GROUP BY p.product_id, p.product_name, p.product_code, rm.raw_material_id, rm.raw_material_name, rm.raw_material_code " +
"ORDER BY stockGap DESC")
List<ProductMaterialRequirementVO> selectProductMaterialRequirements();
// 当前情况区 - 原料库存和需求情况
@Select("SELECT rm.raw_material_name AS materialName, " +
"rm.raw_material_code AS materialCode, " +
"IFNULL(s.stockQuantity, 0) AS currentStockQuantity, " +
"IFNULL(it.inTransitQuantity, 0) AS inTransitQuantity, " +
"IFNULL(req.requiredQuantity, 0) AS totalRequiredQuantity, " +
"IFNULL(req.requiredQuantity, 0) - IFNULL(s.stockQuantity, 0) - IFNULL(it.inTransitQuantity, 0) AS stockGap, " +
"0 AS safetyStock, " +
"CASE " +
" WHEN IFNULL(req.requiredQuantity, 0) <= IFNULL(s.stockQuantity, 0) + IFNULL(it.inTransitQuantity, 0) THEN '充足' " +
" WHEN IFNULL(req.requiredQuantity, 0) <= IFNULL(s.stockQuantity, 0) + IFNULL(it.inTransitQuantity, 0) + 0 THEN '不足' " +
" ELSE '紧急' " +
"END AS stockStatus " +
"FROM wms_raw_material rm " +
"LEFT JOIN (SELECT item_id, SUM(quantity) AS stockQuantity FROM wms_stock WHERE item_type = 'raw_material' AND del_flag = 0 GROUP BY item_id) s ON rm.raw_material_id = s.item_id " +
"LEFT JOIN (SELECT raw_material_id, SUM(quantity) AS inTransitQuantity FROM wms_purchase_plan_detail WHERE status = 1 GROUP BY raw_material_id) it ON rm.raw_material_id = it.raw_material_id " +
"LEFT JOIN (SELECT pb.raw_material_id, SUM(od.quantity * pb.quantity) AS requiredQuantity " +
" FROM wms_order_detail od " +
" JOIN wms_order o ON od.order_id = o.order_id " +
" JOIN wms_product_bom pb ON od.product_id = pb.product_id " +
" WHERE o.order_status IN (0, 1) AND o.del_flag = 0 " +
" GROUP BY pb.raw_material_id) req ON rm.raw_material_id = req.raw_material_id " +
"ORDER BY stockGap DESC")
List<RawMaterialInventoryVO> selectRawMaterialInventory();
// 推荐区 - 订单维度推荐
@Select("SELECT o.order_code, o.customer_name, " +
"CASE o.order_status " +
" WHEN 0 THEN '新建' " +
" WHEN 1 THEN '生产中' " +
" WHEN 2 THEN '已完成' " +
" WHEN 3 THEN '已取消' " +
"END AS orderStatus, " +
"CASE " +
" WHEN o.order_status = 0 THEN '高' " +
" WHEN o.order_status = 1 THEN '中' " +
" ELSE '低' " +
"END AS priority, " +
"CASE " +
" WHEN o.order_status = 0 THEN '新订单需要及时处理' " +
" WHEN o.order_status = 1 THEN '生产中的订单需要关注进度' " +
" ELSE '订单已完成或已取消' " +
"END AS recommendationReason, " +
"CASE " +
" WHEN o.order_status = 0 THEN '开始生产' " +
" WHEN o.order_status = 1 THEN '检查生产进度' " +
" ELSE '无需操作' " +
"END AS suggestedAction, " +
"DATE_ADD(o.create_time, INTERVAL 30 DAY) AS estimatedCompletionTime " +
"FROM wms_order o " +
"WHERE o.order_status IN (0, 1) AND o.del_flag = 0 " +
"ORDER BY o.create_time ASC LIMIT 10")
List<OrderRecommendationVO> selectOrderRecommendations();
// 推荐区 - 原料维度推荐
@Select("SELECT rm.raw_material_name AS materialName, " +
"rm.raw_material_code AS materialCode, " +
"GREATEST(0, IFNULL(req.requiredQuantity, 0) - IFNULL(s.stockQuantity, 0) - IFNULL(it.inTransitQuantity, 0)) AS recommendedPurchaseQuantity, " +
"'默认供应商' AS recommendedSupplier, " +
"CASE " +
" WHEN IFNULL(req.requiredQuantity, 0) > IFNULL(s.stockQuantity, 0) + IFNULL(it.inTransitQuantity, 0) + 0 THEN '库存不足，需要紧急采购' " +
" WHEN IFNULL(req.requiredQuantity, 0) > IFNULL(s.stockQuantity, 0) + IFNULL(it.inTransitQuantity, 0) THEN '库存不足，建议采购' " +
" ELSE '库存充足' " +
"END AS recommendationReason, " +
"CASE " +
" WHEN IFNULL(req.requiredQuantity, 0) > IFNULL(s.stockQuantity, 0) + IFNULL(it.inTransitQuantity, 0) + 0 THEN '紧急' " +
" WHEN IFNULL(req.requiredQuantity, 0) > IFNULL(s.stockQuantity, 0) + IFNULL(it.inTransitQuantity, 0) THEN '一般' " +
" ELSE '低' " +
"END AS urgencyLevel, " +
"DATE_ADD(NOW(), INTERVAL 7 DAY) AS estimatedArrivalTime, " +
"CASE " +
" WHEN IFNULL(req.requiredQuantity, 0) > IFNULL(s.stockQuantity, 0) + IFNULL(it.inTransitQuantity, 0) + 0 THEN '立即采购' " +
" WHEN IFNULL(req.requiredQuantity, 0) > IFNULL(s.stockQuantity, 0) + IFNULL(it.inTransitQuantity, 0) THEN '计划采购' " +
" ELSE '无需采购' " +
"END AS suggestedAction " +
"FROM wms_raw_material rm " +
"LEFT JOIN (SELECT item_id, SUM(quantity) AS stockQuantity FROM wms_stock WHERE item_type = 'raw_material' AND del_flag = 0 GROUP BY item_id) s ON rm.raw_material_id = s.item_id " +
"LEFT JOIN (SELECT raw_material_id, SUM(quantity) AS inTransitQuantity FROM wms_purchase_plan_detail WHERE status = 1 GROUP BY raw_material_id) it ON rm.raw_material_id = it.raw_material_id " +
"LEFT JOIN (SELECT pb.raw_material_id, SUM(od.quantity * pb.quantity) AS requiredQuantity " +
" FROM wms_order_detail od " +
" JOIN wms_order o ON od.order_id = o.order_id " +
" JOIN wms_product_bom pb ON od.product_id = pb.product_id " +
" WHERE o.order_status IN (0, 1) AND o.del_flag = 0 " +
" GROUP BY pb.raw_material_id) req ON rm.raw_material_id = req.raw_material_id " +
"WHERE IFNULL(req.requiredQuantity, 0) > IFNULL(s.stockQuantity, 0) + IFNULL(it.inTransitQuantity, 0) " +
"ORDER BY (IFNULL(req.requiredQuantity, 0) - IFNULL(s.stockQuantity, 0) - IFNULL(it.inTransitQuantity, 0)) DESC LIMIT 10")
List<MaterialRecommendationVO> selectMaterialRecommendations();
}

28
klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
View File

@@ -16,6 +16,9 @@ import com.klp.domain.WmsProduct;
import com.klp.mapper.WmsProductMapper;
import com.klp.service.IWmsProductService;
import com.klp.domain.vo.OrderSummaryVO;
import com.klp.domain.vo.PerformanceAreaVO;
import com.klp.domain.vo.CurrentSituationAreaVO;
import com.klp.domain.vo.RecommendationAreaVO;
import java.util.List;
import java.util.Map;
@@ -123,6 +126,8 @@ public class WmsProductServiceImpl implements IWmsProductService {
@Override
public DashboardOverviewVO getDashboardOverview() {
DashboardOverviewVO vo = new DashboardOverviewVO();
// ========== 原有业务逻辑 ==========
OrderSummaryVO summary = baseMapper.selectOrderSummary();
// 计算增长率
summary.setTotalOrderCountGrowthRate(
@@ -150,6 +155,29 @@ public class WmsProductServiceImpl implements IWmsProductService {
vo.setProductRank(baseMapper.selectProductRank());
vo.setOrderMaterial(baseMapper.selectOrderMaterial());
vo.setCustomerRegion(baseMapper.selectCustomerRegion());
// ========== 新增业务区域逻辑 ==========
// 业绩区数据
PerformanceAreaVO performanceArea = new PerformanceAreaVO();
performanceArea.setProductSalesPerformance(baseMapper.selectProductSalesPerformance());
performanceArea.setSalesPersonPerformance(baseMapper.selectSalesPersonPerformance());
performanceArea.setOrderCountStatistics(baseMapper.selectOrderCountStatistics());
vo.setPerformanceArea(performanceArea);
// 当前情况区数据
CurrentSituationAreaVO currentSituationArea = new CurrentSituationAreaVO();
currentSituationArea.setOrderProductStatistics(baseMapper.selectOrderProductStatistics());
currentSituationArea.setProductMaterialRequirements(baseMapper.selectProductMaterialRequirements());
currentSituationArea.setRawMaterialInventory(baseMapper.selectRawMaterialInventory());
vo.setCurrentSituationArea(currentSituationArea);
// 推荐区数据
RecommendationAreaVO recommendationArea = new RecommendationAreaVO();
recommendationArea.setOrderRecommendations(baseMapper.selectOrderRecommendations());
recommendationArea.setMaterialRecommendations(baseMapper.selectMaterialRecommendations());
vo.setRecommendationArea(recommendationArea);
return vo;
}
}