|
@@ -973,12 +973,12 @@ class AnalysisStageExcelTree extends AnalysisExcelTree {
|
|
node.unit_price = this.ctx.helper.round(aeUtils.toNumber(row[this.colsDef.unit_price]), this.decimal.up);
|
|
node.unit_price = this.ctx.helper.round(aeUtils.toNumber(row[this.colsDef.unit_price]), this.decimal.up);
|
|
const precision = this.ctx.helper.findPrecision(this.precision, node.unit);
|
|
const precision = this.ctx.helper.findPrecision(this.precision, node.unit);
|
|
node.contract_qty = this.ctx.helper.round(aeUtils.toNumber(row[this.colsDef.contract_qty]), precision.value);
|
|
node.contract_qty = this.ctx.helper.round(aeUtils.toNumber(row[this.colsDef.contract_qty]), precision.value);
|
|
- if (node.quantity && node.unit_price) {
|
|
|
|
- node.contract_tp = this.ctx.helper.mul(node.quantity, node.unit_price, this.decimal.tp);
|
|
|
|
|
|
+ if (node.contract_qty && node.unit_price) {
|
|
|
|
+ node.contract_tp = this.ctx.helper.mul(node.contract_qty, node.unit_price, this.decimal.tp);
|
|
} else {
|
|
} else {
|
|
node.contract_tp = null;
|
|
node.contract_tp = null;
|
|
}
|
|
}
|
|
- if (this.filter.filterZeroGcl && !node.quantity && !node.total_price) return true;
|
|
|
|
|
|
+ if (this.filter.filterZeroGcl && !node.contract_qty && !node.contract_tp) return true;
|
|
return this.cacheTree.addGclNode(node);
|
|
return this.cacheTree.addGclNode(node);
|
|
}
|
|
}
|
|
/**
|
|
/**
|