diff --git a/klp-ui/src/views/wms/report/js/calc.js b/klp-ui/src/views/wms/report/js/calc.js index fd88a95f..4152a0bc 100644 --- a/klp-ui/src/views/wms/report/js/calc.js +++ b/klp-ui/src/views/wms/report/js/calc.js @@ -26,9 +26,16 @@ const calcSummary = (list, lossList) => { // '2019583325311414274', // '2019583429955104769', // '2019583137616310273',这四个库中的占比 + const abStatus = ['O', 'C-', 'C+', 'C', 'D-', 'D+', 'D'] const abRate = totalCount != 0 ? list.filter(item => { - return item.warehouseId == '2019583656787259393' || item.warehouseId == '2019583325311414274' || item.warehouseId == '2019583429955104769' || item.warehouseId == '2019583137616310273' - }).length / totalCount : 0 + // 质量状态为O, C- , C+, C, D-, D+, D的钢卷也属于异常 + return (item.warehouseId == '2019583656787259393' + || item.warehouseId == '2019583325311414274' + || item.warehouseId == '2019583429955104769' + || item.warehouseId == '2019583137616310273' + || abStatus.includes(item.qualityStatus) + ) + }).length / outCount : 0 // 正品率(1-异常率) const passRate2 = totalCount != 0 ? (1 - abRate) : 0 @@ -48,8 +55,8 @@ const calcSummary = (list, lossList) => { avgWeightDiff, passRate: (passRate * 100)?.toFixed(2) + '%', lossRate: (lossRate * 100)?.toFixed(2) + '%', - abRate: (abRate * 100)?.toFixed(2) || 0, - passRate2: (passRate2 * 100)?.toFixed(2) || 0, + abRate: (abRate * 100)?.toFixed(2) + '%' || 0, + passRate2: (passRate2 * 100)?.toFixed(2) + '%' || 0, } } @@ -187,9 +194,14 @@ const calcMSummary = (list, lossList) => { // '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 + const abStatus = ['O', 'C-', 'C+', 'C', 'D-', 'D+', 'D'] + const abRate = totalCount != 0 ? nonMCoils.filter(item => {// 质量状态为O, C- , C+, C, D-, D+, D的钢卷也属于异常 + return (item.warehouseId == '2019583656787259393' + || item.warehouseId == '2019583325311414274' + || item.warehouseId == '2019583429955104769' + || item.warehouseId == '2019583137616310273' + || abStatus.includes(item.qualityStatus)) + }).length / outCount : 0 // 正品率(1-异常率) const passRate2 = totalCount != 0 ? (1 - abRate) : 0 @@ -209,8 +221,8 @@ const calcMSummary = (list, lossList) => { avgWeightDiff, passRate: (passRate * 100)?.toFixed(2) + '%', lossRate: (lossRate * 100)?.toFixed(2) + '%', - abRate: (abRate * 100)?.toFixed(2) || 0, - passRate2: (passRate2 * 100)?.toFixed(2) || 0, + abRate: (abRate * 100)?.toFixed(2) + '%' || 0, + passRate2: (passRate2 * 100)?.toFixed(2) + '%' || 0, } }