数据看板更新前后端

This commit is contained in:
2025-07-30 10:54:11 +08:00
parent 5c42bf666a
commit 064d1dd41b
18 changed files with 1414 additions and 9 deletions

View File

@@ -0,0 +1,198 @@
<template>
<div class="current-situation-area">
<el-row :gutter="20">
<!-- 订单所需的产品统计 -->
<el-col :span="8">
<el-card shadow="hover" class="situation-card">
<div slot="header" class="card-header">
<span>订单所需的产品统计</span>
</div>
<div class="table-container">
<el-table :data="orderProductStatistics" size="small" height="320" v-loading="!orderProductStatistics.length">
<el-table-column prop="productName" label="产品名称" width="120" />
<el-table-column prop="orderDemandQuantity" label="需求数量" width="80" />
<el-table-column prop="currentStockQuantity" label="库存数量" width="80" />
<el-table-column prop="stockGap" label="库存缺口" width="80">
<template slot-scope="scope">
<span :class="getStockGapClass(scope.row.stockGap)">
{{ scope.row.stockGap }}
</span>
</template>
</el-table-column>
<el-table-column prop="relatedOrderCount" label="相关订单" width="80" />
</el-table>
<div v-if="!orderProductStatistics.length" class="empty-data">
<i class="el-icon-warning-outline"></i>
<p>暂无数据</p>
</div>
</div>
</el-card>
</el-col>
<!-- 根据BOM计算的原料需求 -->
<el-col :span="8">
<el-card shadow="hover" class="situation-card">
<div slot="header" class="card-header">
<span>BOM原料需求</span>
</div>
<div class="table-container">
<el-table :data="productMaterialRequirements" size="small" height="320" v-loading="!productMaterialRequirements.length">
<el-table-column prop="productName" label="产品" width="100" />
<el-table-column prop="materialName" label="原料" width="100" />
<el-table-column prop="requiredQuantity" label="需求数量" width="80" />
<el-table-column prop="currentStockQuantity" label="库存" width="60" />
<el-table-column prop="inTransitQuantity" label="在途" width="60" />
<el-table-column prop="stockGap" label="缺口" width="60">
<template slot-scope="scope">
<span :class="getStockGapClass(scope.row.stockGap)">
{{ scope.row.stockGap }}
</span>
</template>
</el-table-column>
</el-table>
<div v-if="!productMaterialRequirements.length" class="empty-data">
<i class="el-icon-warning-outline"></i>
<p>暂无数据</p>
</div>
</div>
</el-card>
</el-col>
<!-- 原料库存和需求情况 -->
<el-col :span="8">
<el-card shadow="hover" class="situation-card">
<div slot="header" class="card-header">
<span>原料库存情况</span>
</div>
<div class="table-container">
<el-table :data="rawMaterialInventory" size="small" height="320" v-loading="!rawMaterialInventory.length">
<el-table-column prop="materialName" label="原料名称" width="120" />
<el-table-column prop="currentStockQuantity" label="库存" width="60" />
<el-table-column prop="inTransitQuantity" label="在途" width="60" />
<el-table-column prop="totalRequiredQuantity" label="需求" width="60" />
<el-table-column prop="stockGap" label="缺口" width="60">
<template slot-scope="scope">
<span :class="getStockGapClass(scope.row.stockGap)">
{{ scope.row.stockGap }}
</span>
</template>
</el-table-column>
<el-table-column prop="stockStatus" label="状态" width="60">
<template slot-scope="scope">
<el-tag :type="getStockStatusType(scope.row.stockStatus)" size="mini">
{{ scope.row.stockStatus }}
</el-tag>
</template>
</el-table-column>
</el-table>
<div v-if="!rawMaterialInventory.length" class="empty-data">
<i class="el-icon-warning-outline"></i>
<p>暂无数据</p>
</div>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
export default {
name: 'CurrentSituationArea',
props: {
currentSituationArea: {
type: Object,
required: true,
default: () => ({})
}
},
computed: {
orderProductStatistics() {
return this.currentSituationArea.orderProductStatistics || []
},
productMaterialRequirements() {
return this.currentSituationArea.productMaterialRequirements || []
},
rawMaterialInventory() {
return this.currentSituationArea.rawMaterialInventory || []
}
},
methods: {
getStockGapClass(stockGap) {
if (stockGap > 0) {
return 'text-danger'
} else if (stockGap === 0) {
return 'text-success'
} else {
return 'text-warning'
}
},
getStockStatusType(status) {
switch (status) {
case '充足':
return 'success'
case '不足':
return 'warning'
case '紧急':
return 'danger'
default:
return 'info'
}
}
}
}
</script>
<style scoped>
.current-situation-area {
margin-bottom: 20px;
}
.situation-card {
height: 400px;
}
.card-header {
font-weight: bold;
color: #303133;
}
.table-container {
height: 320px;
overflow: hidden;
}
.text-danger {
color: #f56c6c;
font-weight: bold;
}
.text-success {
color: #67c23a;
font-weight: bold;
}
.text-warning {
color: #e6a23c;
font-weight: bold;
}
.empty-data {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
text-align: center;
color: #909399;
}
.empty-data i {
font-size: 48px;
margin-bottom: 10px;
}
.empty-data p {
margin: 0;
font-size: 14px;
}
</style>

View File

@@ -0,0 +1,298 @@
<template>
<div class="performance-area">
<el-row :gutter="20">
<!-- 产品销售情况 -->
<el-col :span="8">
<el-card shadow="hover" class="performance-card">
<div slot="header" class="card-header">
<span>产品销售情况</span>
</div>
<div class="chart-container" ref="productSalesChart"></div>
</el-card>
</el-col>
<!-- 销售人员业绩 -->
<el-col :span="8">
<el-card shadow="hover" class="performance-card">
<div slot="header" class="card-header">
<span>销售人员业绩</span>
</div>
<div class="chart-container" ref="salesPersonChart"></div>
</el-card>
</el-col>
<!-- 总订单数量统计 -->
<el-col :span="8">
<el-card shadow="hover" class="performance-card">
<div slot="header" class="card-header">
<span>总订单数量统计</span>
</div>
<div class="stats-container">
<div class="stat-item">
<div class="stat-number">{{ orderCountStatistics.totalOrderCount || 0 }}</div>
<div class="stat-label">总订单数</div>
</div>
<div class="stat-item">
<div class="stat-number">{{ orderCountStatistics.completedOrderCount || 0 }}</div>
<div class="stat-label">已完成</div>
</div>
<div class="stat-item">
<div class="stat-number">{{ orderCountStatistics.inProgressOrderCount || 0 }}</div>
<div class="stat-label">进行中</div>
</div>
<div class="stat-item">
<div class="stat-number">{{ orderCountStatistics.pendingOrderCount || 0 }}</div>
<div class="stat-label">待处理</div>
</div>
<div class="stat-item">
<div class="stat-number">{{ orderCountStatistics.monthlyNewOrderCount || 0 }}</div>
<div class="stat-label">本月新增</div>
</div>
<div class="stat-item">
<div class="stat-number">{{ ((orderCountStatistics.completionRate || 0) * 100).toFixed(1) }}%</div>
<div class="stat-label">完成率</div>
</div>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
import * as echarts from 'echarts'
export default {
name: 'PerformanceArea',
props: {
performanceArea: {
type: Object,
required: true,
default: () => ({})
}
},
data() {
return {
productSalesChart: null,
salesPersonChart: null
}
},
computed: {
productSalesPerformance() {
return this.performanceArea.productSalesPerformance || []
},
salesPersonPerformance() {
return this.performanceArea.salesPersonPerformance || []
},
orderCountStatistics() {
return this.performanceArea.orderCountStatistics || {}
}
},
watch: {
performanceArea: {
deep: true,
handler() {
this.$nextTick(() => {
this.renderCharts()
})
}
}
},
mounted() {
this.renderCharts()
window.addEventListener('resize', this.handleResize)
},
beforeDestroy() {
if (this.productSalesChart) {
this.productSalesChart.dispose()
}
if (this.salesPersonChart) {
this.salesPersonChart.dispose()
}
window.removeEventListener('resize', this.handleResize)
},
methods: {
renderCharts() {
this.renderProductSalesChart()
this.renderSalesPersonChart()
},
renderProductSalesChart() {
const chartDom = this.$refs.productSalesChart
if (!chartDom) return
if (!this.productSalesChart) {
this.productSalesChart = echarts.init(chartDom)
}
if (!this.productSalesPerformance.length) {
// 显示空数据状态
this.productSalesChart.setOption({
title: {
text: '暂无数据',
left: 'center',
top: 'center',
textStyle: {
color: '#999',
fontSize: 14
}
}
})
return
}
const option = {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
xAxis: {
type: 'category',
data: this.productSalesPerformance.map(item => item.productName),
axisLabel: {
rotate: 45,
fontSize: 10
}
},
yAxis: {
type: 'value'
},
series: [
{
name: '销售数量',
type: 'bar',
data: this.productSalesPerformance.map(item => item.salesQuantity),
itemStyle: {
color: '#409EFF'
}
}
]
}
this.productSalesChart.setOption(option)
},
renderSalesPersonChart() {
const chartDom = this.$refs.salesPersonChart
if (!chartDom) return
if (!this.salesPersonChart) {
this.salesPersonChart = echarts.init(chartDom)
}
if (!this.salesPersonPerformance.length) {
// 显示空数据状态
this.salesPersonChart.setOption({
title: {
text: '暂无数据',
left: 'center',
top: 'center',
textStyle: {
color: '#999',
fontSize: 14
}
}
})
return
}
const option = {
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b}: {c} ({d}%)'
},
series: [
{
name: '销售业绩',
type: 'pie',
radius: ['40%', '70%'],
avoidLabelOverlap: false,
label: {
show: false,
position: 'center'
},
emphasis: {
label: {
show: true,
fontSize: '18',
fontWeight: 'bold'
}
},
labelLine: {
show: false
},
data: this.salesPersonPerformance.map(item => ({
name: item.salesPersonName,
value: item.salesAmount
}))
}
]
}
this.salesPersonChart.setOption(option)
},
handleResize() {
if (this.productSalesChart) {
this.productSalesChart.resize()
}
if (this.salesPersonChart) {
this.salesPersonChart.resize()
}
}
}
}
</script>
<style scoped>
.performance-area {
margin-bottom: 20px;
}
.performance-card {
height: 400px;
}
.card-header {
font-weight: bold;
color: #303133;
}
.chart-container {
height: 320px;
width: 100%;
}
.stats-container {
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 20px;
padding: 20px;
height: 320px;
}
.stat-item {
text-align: center;
padding: 15px;
background: #f8f9fa;
border-radius: 8px;
border: 1px solid #e9ecef;
}
.stat-number {
font-size: 24px;
font-weight: bold;
color: #409EFF;
margin-bottom: 5px;
}
.stat-label {
font-size: 12px;
color: #606266;
}
</style>

View File

@@ -0,0 +1,152 @@
<template>
<div class="recommendation-area">
<el-row :gutter="20">
<!-- 订单维度推荐 -->
<el-col :span="12">
<el-card shadow="hover" class="recommendation-card">
<div slot="header" class="card-header">
<span>订单维度推荐</span>
</div>
<div class="table-container">
<el-table :data="orderRecommendations" size="small" height="320" v-loading="!orderRecommendations.length">
<el-table-column prop="orderCode" label="订单编号" width="120" />
<el-table-column prop="customerName" label="客户名称" width="100" />
<el-table-column prop="orderStatus" label="订单状态" width="80" />
<el-table-column prop="priority" label="优先级" width="60">
<template slot-scope="scope">
<el-tag :type="getPriorityType(scope.row.priority)" size="mini">
{{ scope.row.priority }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="recommendationReason" label="推荐原因" width="150" show-overflow-tooltip />
<el-table-column prop="suggestedAction" label="建议操作" width="100" />
<el-table-column prop="estimatedCompletionTime" label="预计完成时间" width="120" />
</el-table>
<div v-if="!orderRecommendations.length" class="empty-data">
<i class="el-icon-warning-outline"></i>
<p>暂无推荐数据</p>
</div>
</div>
</el-card>
</el-col>
<!-- 原料维度推荐 -->
<el-col :span="12">
<el-card shadow="hover" class="recommendation-card">
<div slot="header" class="card-header">
<span>原料维度推荐</span>
</div>
<div class="table-container">
<el-table :data="materialRecommendations" size="small" height="320" v-loading="!materialRecommendations.length">
<el-table-column prop="materialName" label="原料名称" width="120" />
<el-table-column prop="recommendedPurchaseQuantity" label="推荐采购数量" width="120" />
<el-table-column prop="recommendedSupplier" label="推荐供应商" width="100" show-overflow-tooltip />
<el-table-column prop="urgencyLevel" label="紧急程度" width="80">
<template slot-scope="scope">
<el-tag :type="getUrgencyType(scope.row.urgencyLevel)" size="mini">
{{ scope.row.urgencyLevel }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="recommendationReason" label="推荐原因" width="150" show-overflow-tooltip />
<el-table-column prop="suggestedAction" label="建议操作" width="100" />
<el-table-column prop="estimatedArrivalTime" label="预计到货时间" width="120" />
</el-table>
<div v-if="!materialRecommendations.length" class="empty-data">
<i class="el-icon-warning-outline"></i>
<p>暂无推荐数据</p>
</div>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
export default {
name: 'RecommendationArea',
props: {
recommendationArea: {
type: Object,
required: true,
default: () => ({})
}
},
computed: {
orderRecommendations() {
return this.recommendationArea.orderRecommendations || []
},
materialRecommendations() {
return this.recommendationArea.materialRecommendations || []
}
},
methods: {
getPriorityType(priority) {
switch (priority) {
case '高':
return 'danger'
case '中':
return 'warning'
case '低':
return 'success'
default:
return 'info'
}
},
getUrgencyType(urgency) {
switch (urgency) {
case '紧急':
return 'danger'
case '一般':
return 'warning'
case '低':
return 'success'
default:
return 'info'
}
}
}
}
</script>
<style scoped>
.recommendation-area {
margin-bottom: 20px;
}
.recommendation-card {
height: 400px;
}
.card-header {
font-weight: bold;
color: #303133;
}
.table-container {
height: 320px;
overflow: hidden;
position: relative;
}
.empty-data {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
text-align: center;
color: #909399;
}
.empty-data i {
font-size: 48px;
margin-bottom: 10px;
}
.empty-data p {
margin: 0;
font-size: 14px;
}
</style>

View File

@@ -10,12 +10,57 @@
<el-button icon="el-icon-setting" style="margin-left: 10px;" @click="drawerVisible = true">定时刷新设置</el-button>
</el-col>
</el-row>
<!-- 业绩区 -->
<el-row :gutter="20" class="section-row">
<el-col :span="24">
<div class="section-title">
<h2>业绩区</h2>
<p>产品销售情况销售人员业绩总订单数量</p>
</div>
<PerformanceArea :performance-area="dashboardData.performanceArea" />
</el-col>
</el-row>
<!-- 当前情况区 -->
<el-row :gutter="20" class="section-row">
<el-col :span="24">
<div class="section-title">
<h2>情况区</h2>
<p>订单所需的产品统计根据BOM计算的原料需求原料库存和需求情况</p>
</div>
<CurrentSituationArea :current-situation-area="dashboardData.currentSituationArea" />
</el-col>
</el-row>
<!-- 推荐区 -->
<el-row :gutter="20" class="section-row">
<el-col :span="24">
<div class="section-title">
<h2>推荐区</h2>
<p>订单维度推荐原料维度推荐</p>
</div>
<RecommendationArea :recommendation-area="dashboardData.recommendationArea" />
</el-col>
</el-row>
<!-- 原有图表区域保留兼容性 -->
<el-row :gutter="20" class="section-row">
<el-col :span="24">
<div class="section-title">
<h2>原有图表区域</h2>
<p>兼容原有的图表展示</p>
</div>
</el-col>
</el-row>
<!-- 顶部3 张summary卡片 -->
<el-row :gutter="20" class="top-row">
<el-col :span="24">
<OrderSummary :data-info="orderSummaryData" />
</el-col>
</el-row>
<!-- 第一行图表 -->
<el-row :gutter="20" class="chart-row">
<el-col :span="8">
@@ -28,6 +73,7 @@
<CustomerRegion :customer-data="customerClusterData" />
</el-col>
</el-row>
<!-- 定时刷新设置抽屉 -->
<el-drawer
title="定时刷新设置"
@@ -56,6 +102,9 @@ import OrderSummary from './components/OrderSummary.vue'
import OrderCompletion from './components/OrderCompletion.vue'
import ProductSales from './components/ProductSales.vue'
import CustomerRegion from './components/CustomerRegion.vue'
import PerformanceArea from './components/PerformanceArea.vue'
import CurrentSituationArea from './components/CurrentSituationArea.vue'
import RecommendationArea from './components/RecommendationArea.vue'
import { getDashboardData } from '@/api/wms/order'
export default {
@@ -65,9 +114,19 @@ export default {
OrderCompletion,
ProductSales,
CustomerRegion,
PerformanceArea,
CurrentSituationArea,
RecommendationArea,
},
data() {
return {
// 新的数据结构
dashboardData: {
performanceArea: {},
currentSituationArea: {},
recommendationArea: {}
},
// 原有数据结构(保持兼容性)
orderSummaryData: {
totalOrders: 0,
completedThisMonth: 0,
@@ -97,20 +156,32 @@ export default {
try {
const res = await getDashboardData()
const data = res
// 更新新的数据结构
this.dashboardData = {
performanceArea: data.performanceArea || {},
currentSituationArea: data.currentSituationArea || {},
recommendationArea: data.recommendationArea || {}
}
// 保持原有数据结构的兼容性
this.orderSummaryData = {
totalOrders: data.orderSummary.totalOrderCount,
completedThisMonth: data.orderSummary.monthFinishedOrderCount,
completionRate: data.orderSummary.finishedRate,
totalOrders: data.orderSummary?.totalOrderCount || 0,
completedThisMonth: data.orderSummary?.monthFinishedOrderCount || 0,
completionRate: data.orderSummary?.finishedRate || 0,
...data.orderSummary
}
this.productSalesData = data.productRank
this.customerClusterData = data.customerRegion
this.productSalesData = data.productRank || []
this.customerClusterData = data.customerRegion || []
this.materialAnalysisData = {
categories: data.orderMaterial.map(item => item.materialName),
usageFrequency: data.orderMaterial.map(item => item.usedCount),
stockQuantity: data.orderMaterial.map(item => item.stockCount),
purchaseCycle: data.orderMaterial.map(item => item.purchaseCycle)
categories: (data.orderMaterial || []).map(item => item.materialName),
usageFrequency: (data.orderMaterial || []).map(item => item.usedCount),
stockQuantity: (data.orderMaterial || []).map(item => item.stockCount),
purchaseCycle: (data.orderMaterial || []).map(item => item.purchaseCycle)
}
} catch (error) {
console.error('获取数据看板数据失败:', error)
this.$message.error('获取数据失败,请稍后重试')
} finally {
this.loading = false
}
@@ -173,6 +244,28 @@ export default {
box-sizing: border-box;
}
.section-row {
margin-bottom: 30px;
}
.section-title {
margin-bottom: 20px;
padding: 0 10px;
}
.section-title h2 {
margin: 0 0 8px 0;
font-size: 20px;
font-weight: 600;
color: #303133;
}
.section-title p {
margin: 0;
font-size: 14px;
color: #909399;
}
.top-row,
.chart-row {
margin-bottom: 20px;

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;
}

View File

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

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;
}

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;
}

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;
}

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;
}

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;
}

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;
}

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;
}

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;
}

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;
}

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;
}

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();
}

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;
}
}