修改bug
This commit is contained in:
@@ -289,7 +289,7 @@ function splitCurrentAndPreviousB(factoryListResponse) {
|
||||
}
|
||||
|
||||
function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) {
|
||||
console.log('工厂',targetListResponse);
|
||||
console.log('工厂',preData);
|
||||
|
||||
// 初始数据
|
||||
const { chipOeeRate, transformRate, chipRate, stdRate } = initA();
|
||||
@@ -343,17 +343,24 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
|
||||
// componentYieldRate: 0.73,
|
||||
// },
|
||||
// ];
|
||||
if (preData && preData[0] != null) {
|
||||
if (preData) {
|
||||
for (const factory of preData) {
|
||||
const fId = getPreFactoryId(factory);
|
||||
const fId = getPreFactoryId(factory)
|
||||
console.log('factory',factory.previousYearOee);
|
||||
// chipInvest.previous[fId] = factory.previousYearInputNumber;
|
||||
// chipOeeRate.current[fId] = factory.oee;
|
||||
chipOeeRate.previous[fId] = factory.previousYearOee;
|
||||
if (factory.previousGlassType === 0) {
|
||||
chipOeeRate.previous[fId] = factory.previousYearOee;
|
||||
}
|
||||
// chipOeeRate.previous[fId] = factory.previousYearOee;
|
||||
// 转化效率
|
||||
transformRate.previous[fId] =factory.previousYearComponentConversionEfficiency ;
|
||||
if (factory.previousGlassType === 1) {
|
||||
transformRate.previous[fId] = factory.previousYearComponentConversionEfficiency;
|
||||
}
|
||||
// transformRate.previous[fId] =factory.previousYearComponentConversionEfficiency ;
|
||||
// 芯片良率 与 标准组件良率
|
||||
if (![0, 1].includes(factory.glassType)) continue;
|
||||
const _t = [chipRate, stdRate][factory.glassType]
|
||||
if (![0, 1].includes(factory.previousGlassType)) continue;
|
||||
const _t = [chipRate, stdRate][factory.previousGlassType]
|
||||
// _t.current[fId] = factory.yieldRate ;
|
||||
_t.previous[fId] = factory.previousYearYieldRate ;
|
||||
// }
|
||||
@@ -393,6 +400,7 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
|
||||
_t.current[fId] = factory.yieldRate ;
|
||||
// _t.previous[fId] = factory.previousYearYieldRate ;
|
||||
}
|
||||
console.log('chipOeeRate',stdRate);
|
||||
// console.log('chipOeeRate',chipOeeRate);
|
||||
return {
|
||||
chipOeeRate,
|
||||
|
||||
Reference in New Issue
Block a user