feat(报表): 增强报表功能并优化标签显示
- 新增镀锌1预填接口和报表字段 - 优化标签材质显示逻辑,移除content前缀 - 增加报表分页大小选项和耗时格式化 - 扩展报表可选列和默认列配置 - 改进报表统计计算逻辑,考虑质量状态 - 调整报表页面大小限制为99999
This commit is contained in:
@@ -59,11 +59,11 @@ const calcAbSummary = (list) => {
|
||||
returnWeight: 0,
|
||||
|
||||
// 计入技术部的钢卷占比
|
||||
jishuRate: 0,
|
||||
jishuRate: 0,
|
||||
// 计入小钢卷库的钢卷占比
|
||||
miniRate: 0,
|
||||
miniRate: 0,
|
||||
// 计入废品库的钢卷占比
|
||||
rubbishRate: 0,
|
||||
rubbishRate: 0,
|
||||
// 计入退货库的钢卷占比
|
||||
returnRate: 0,
|
||||
}
|
||||
@@ -76,22 +76,28 @@ const calcAbSummary = (list) => {
|
||||
// 技术部
|
||||
const coil = list[i];
|
||||
// 技术部
|
||||
if (coil.warehouseId == '2019583656787259393') {
|
||||
if (coil.warehouseId == '2019583656787259393' || coil.qualityStatus == 'O') {
|
||||
o['jishuCount'] = o['jishuCount'] + 1
|
||||
o['jishuWeight'] = o['jishuWeight'] + parseFloat(coil.netWeight) || 0
|
||||
}
|
||||
// 小刚卷库
|
||||
if (coil.warehouseId == '2019583325311414274') {
|
||||
else if (coil.warehouseId == '2019583325311414274') {
|
||||
o['miniCount'] = o['miniCount'] + 1
|
||||
o['miniWeight'] = o['miniWeight'] + parseFloat(coil.netWeight) || 0
|
||||
}
|
||||
// 废品库
|
||||
if (coil.warehouseId == '2019583429955104769') {
|
||||
// 废品库, 或者之状态为D-,D,D+,C-,C,C+其中之一
|
||||
else if (coil.warehouseId == '2019583429955104769'
|
||||
|| coil.qualityStatus == 'D-' ||
|
||||
coil.qualityStatus == 'D' ||
|
||||
coil.qualityStatus == 'D+' ||
|
||||
coil.qualityStatus == 'C-' ||
|
||||
coil.qualityStatus == 'C' ||
|
||||
coil.qualityStatus == 'C+') {
|
||||
o['rubbishCount'] = o['rubbishCount'] + 1
|
||||
o['rubbishWeight'] = o['rubbishWeight'] + parseFloat(coil.netWeight) || 0
|
||||
}
|
||||
// 退货库
|
||||
if (coil.warehouseId == '2019583137616310273') {
|
||||
else if (coil.warehouseId == '2019583137616310273') {
|
||||
o['returnCount'] = o['returnCount'] + 1
|
||||
o['returnWeight'] = o['returnWeight'] + parseFloat(coil.netWeight) || 0
|
||||
}
|
||||
@@ -133,35 +139,35 @@ const calcTeamSummary = (list) => {
|
||||
|
||||
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',
|
||||
@@ -172,7 +178,7 @@ const calcMSummary = (list, lossList) => {
|
||||
|
||||
// 正品率(1-异常率)
|
||||
const passRate2 = totalCount != 0 ? (1 - abRate) : 0
|
||||
|
||||
|
||||
return {
|
||||
outCount,
|
||||
outTotalWeight: outTotalWeight.toFixed(2),
|
||||
|
||||
@@ -26,6 +26,16 @@ const defaultColumns = {
|
||||
prop: "productionEndTime",
|
||||
align: "center",
|
||||
},
|
||||
{
|
||||
title: "生产耗时",
|
||||
prop: "productionDuration",
|
||||
align: "center",
|
||||
},
|
||||
{
|
||||
title: '质量状态',
|
||||
prop: 'qualityStatus',
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
title: "逻辑库区",
|
||||
prop: "warehouseName",
|
||||
@@ -92,6 +102,11 @@ const defaultColumns = {
|
||||
prop: "warehouseName",
|
||||
align: "center",
|
||||
},
|
||||
{
|
||||
title: '质量状态',
|
||||
prop: 'qualityStatus',
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
title: "产品类型",
|
||||
prop: "itemId",
|
||||
@@ -148,6 +163,11 @@ const defaultColumns = {
|
||||
prop: "warehouseName",
|
||||
align: "center",
|
||||
},
|
||||
{
|
||||
title: '质量状态',
|
||||
prop: 'qualityStatus',
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
title: "产品类型",
|
||||
prop: "itemId",
|
||||
@@ -209,6 +229,11 @@ const defaultColumns = {
|
||||
prop: "warehouseName",
|
||||
align: "center",
|
||||
},
|
||||
{
|
||||
title: '质量状态',
|
||||
prop: 'qualityStatus',
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
title: "产品类型",
|
||||
prop: "itemId",
|
||||
|
||||
Reference in New Issue
Block a user