|
@@ -251,12 +251,12 @@ let calcTools = {
|
|
if (md.type == gljType.MACHINE_LABOUR) {
|
|
if (md.type == gljType.MACHINE_LABOUR) {
|
|
let q = md["consumption"] ? md["consumption"] : 0;
|
|
let q = md["consumption"] ? md["consumption"] : 0;
|
|
let p = md["basePrice"] ? md["basePrice"] : 0;
|
|
let p = md["basePrice"] ? md["basePrice"] : 0;
|
|
- mdSum = mdSum + (q * p).toDecimal(decimalObj.process);
|
|
|
|
- mdSum = (mdSum).toDecimal(decimalObj.process);
|
|
|
|
|
|
+ mdSum = mdSum + (q * p).toDecimal(decimalObj.ration.unitFee);
|
|
|
|
+ mdSum = (mdSum).toDecimal(decimalObj.ration.unitFee);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- result = result + (glj["quantity"] * mdSum).toDecimal(decimalObj.process);
|
|
|
|
- result = (result).toDecimal(decimalObj.process);
|
|
|
|
|
|
+ result = result + (glj["quantity"] * mdSum).toDecimal(decimalObj.ration.unitFee);
|
|
|
|
+ result = (result).toDecimal(decimalObj.ration.unitFee);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|