feat(报表): 新增综合报表模板及M卷统计功能
新增综合报表模板,支持按不同仓库类型展示统计信息。添加M卷处理功能,在统计中自动过滤并计算M卷数据。优化报表展示顺序,默认显示产出钢卷。修复异常率计算问题,完善统计信息展示。 新增仓库特定报表页面,包括镀铬、拉矫、脱脂、双机架、镀锌和酸连轧成品库报表。调整KLPTable组件支持高度设置,优化基础面板显示逻辑。 修复API请求超时问题,统一设置超时时间为10分钟。调整标签显示文本,优化用户体验。
This commit is contained in:
@@ -14,7 +14,7 @@ const calcSummary = (list, lossList) => {
|
||||
const totalAvgWeight = totalCount > 0 ? (totalWeight / totalCount)?.toFixed(2) : 0
|
||||
|
||||
// 成品比率
|
||||
const passRate = outCount > 0 ? (outTotalWeight / lossTotalWeight) : 0
|
||||
const passRate = outCount > 0 && lossTotalWeight > 0 ? (outTotalWeight / lossTotalWeight) : 0
|
||||
// 损失比率
|
||||
const lossRate = totalCount > 0 ? (1 - passRate) : 0
|
||||
// 异常率,成品在warehouseId在'2019583656787259393',
|
||||
@@ -26,7 +26,7 @@ const calcSummary = (list, lossList) => {
|
||||
}).length / totalCount : 0
|
||||
|
||||
// 正品率(1-异常率)
|
||||
const passRate2 = totalCount != 0 ? (1 - abRate * totalCount) : 0
|
||||
const passRate2 = totalCount != 0 ? (1 - abRate) : 0
|
||||
|
||||
return {
|
||||
outCount,
|
||||
@@ -102,15 +102,15 @@ const calcAbSummary = (list) => {
|
||||
{ label: '废品库钢卷数', value: o['rubbishCount'] },
|
||||
{ label: '退货库钢卷数', value: o['returnCount'] },
|
||||
|
||||
{ label: '技术部钢卷重量', value: o['jishuWeight'] },
|
||||
{ label: '小钢卷库钢卷重量', value: o['miniWeight'] },
|
||||
{ label: '废品库钢卷重量', value: o['rubbishWeight'] },
|
||||
{ label: '退货库钢卷重量', value: o['returnWeight'] },
|
||||
{ label: '技术部钢卷重量', value: o['jishuWeight'].toFixed(2) },
|
||||
{ label: '小钢卷库钢卷重量', value: o['miniWeight'].toFixed(2) },
|
||||
{ label: '废品库钢卷重量', value: o['rubbishWeight'].toFixed(2) },
|
||||
{ label: '退货库钢卷重量', value: o['returnWeight'].toFixed(2) },
|
||||
|
||||
{ label: '技术部占比', value: (o['jishuCount'] / totalCount * 100).toFixed(2) + '%' },
|
||||
{ label: '小钢卷库占比', value: (o['miniCount'] / totalCount * 100).toFixed(2) + '%' },
|
||||
{ label: '废品库占比', value: (o['rubbishCount'] / totalCount * 100).toFixed(2) + '%' },
|
||||
{ label: '退货库占比', value: (o['returnCount'] / totalCount * 100).toFixed(2) + '%' },
|
||||
{ label: '技术部占比', value: totalCount > 0 ? (o['jishuCount'] / totalCount * 100).toFixed(2) + '%' : '0.00%' },
|
||||
{ label: '小钢卷库占比', value: totalCount > 0 ? (o['miniCount'] / totalCount * 100).toFixed(2) + '%' : '0.00%' },
|
||||
{ label: '废品库占比', value: totalCount > 0 ? (o['rubbishCount'] / totalCount * 100).toFixed(2) + '%' : '0.00%' },
|
||||
{ label: '退货库占比', value: totalCount > 0 ? (o['returnCount'] / totalCount * 100).toFixed(2) + '%' : '0.00%' },
|
||||
]
|
||||
}
|
||||
|
||||
@@ -131,8 +131,68 @@ const calcTeamSummary = (list) => {
|
||||
return teamSummary
|
||||
}
|
||||
|
||||
const calcMSummary = (list, lossList) => {
|
||||
// 统计,需要二外处理M卷,也就是钢卷的currentCoilNo中带有M的钢卷,在统计产出钢卷的数量和重量时需要忽略并记录,并且在统计消耗钢卷的总重量时也需要移除
|
||||
|
||||
// 筛选出 M 卷
|
||||
const mCoils = list.filter(item => item.currentCoilNo && item.currentCoilNo.includes('M'))
|
||||
// 非 M 卷
|
||||
const nonMCoils = list.filter(item => !item.currentCoilNo || !item.currentCoilNo.includes('M'))
|
||||
|
||||
// 非 M 卷作为产出统计
|
||||
const outCount = nonMCoils.length
|
||||
const outTotalWeight = nonMCoils.reduce((acc, cur) => acc + (parseFloat(cur.netWeight) || 0), 0)
|
||||
const outAvgWeight = outCount > 0 ? (outTotalWeight / outCount)?.toFixed(2) : 0
|
||||
|
||||
// 计算产出的 M 卷总重量
|
||||
const mOutTotalWeight = mCoils.reduce((acc, cur) => acc + (parseFloat(cur.netWeight) || 0), 0)
|
||||
|
||||
// 消耗钢卷统计(数量包括所有卷,但总重量减去产出的 M 卷重量)
|
||||
const lossCount = lossList.length
|
||||
const lossTotalWeight = lossList.reduce((acc, cur) => acc + (parseFloat(cur.netWeight) || 0), 0) - mOutTotalWeight
|
||||
const lossAvgWeight = lossCount > 0 ? (lossTotalWeight / lossCount)?.toFixed(2) : 0
|
||||
|
||||
// 合计
|
||||
const totalCount = outCount + lossCount
|
||||
const totalWeight = parseFloat((outTotalWeight + lossTotalWeight).toFixed(2))
|
||||
const totalAvgWeight = totalCount > 0 ? (totalWeight / totalCount)?.toFixed(2) : 0
|
||||
|
||||
// 成品比率
|
||||
const passRate = outCount > 0 && lossTotalWeight > 0 ? (outTotalWeight / lossTotalWeight) : 0
|
||||
// 损失比率
|
||||
const lossRate = totalCount > 0 ? (1 - passRate) : 0
|
||||
|
||||
// 异常率,成品在warehouseId在'2019583656787259393',
|
||||
// '2019583325311414274',
|
||||
// '2019583429955104769',
|
||||
// '2019583137616310273',这四个库中的占比
|
||||
const abRate = totalCount != 0 ? nonMCoils.filter(item => {
|
||||
return item.warehouseId == '2019583656787259393' || item.warehouseId == '2019583325311414274' || item.warehouseId == '2019583429955104769' || item.warehouseId == '2019583137616310273'
|
||||
}).length / totalCount : 0
|
||||
|
||||
// 正品率(1-异常率)
|
||||
const passRate2 = totalCount != 0 ? (1 - abRate) : 0
|
||||
|
||||
return {
|
||||
outCount,
|
||||
outTotalWeight: outTotalWeight.toFixed(2),
|
||||
outAvgWeight,
|
||||
lossCount,
|
||||
lossTotalWeight: lossTotalWeight.toFixed(2),
|
||||
lossAvgWeight,
|
||||
totalCount,
|
||||
totalWeight: totalWeight.toFixed(2),
|
||||
totalAvgWeight,
|
||||
passRate: (passRate * 100)?.toFixed(2) + '%',
|
||||
lossRate: (lossRate * 100)?.toFixed(2) + '%',
|
||||
abRate: (abRate * 100)?.toFixed(2) || 0,
|
||||
passRate2: (passRate2 * 100)?.toFixed(2) || 0,
|
||||
}
|
||||
}
|
||||
|
||||
export {
|
||||
calcSummary,
|
||||
calcAbSummary,
|
||||
calcTeamSummary,
|
||||
calcMSummary,
|
||||
}
|
||||
Reference in New Issue
Block a user