Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/service/stage_bills_final.js

@@ -112,6 +112,8 @@ module.exports = app => {
                     c.unit_price = cp.unit_price;
                     c.contract_tp = this.ctx.helper.add(c.contract_tp, cp.contract_pc_tp);
                     c.qc_tp = this.ctx.helper.add(c.qc_tp, cp.qc_pc_tp);
+                    c.positive_qc_tp = this.ctx.helper.add(c.positive_qc_tp, cp.positive_qc_pc_tp);
+                    c.negative_qc_tp = this.ctx.helper.add(c.negative_qc_tp, cp.negative_qc_pc_tp);
                     curPc.splice(curPc.indexOf(cp), 1);
                 }
                 if (!c.unit_price) {
@@ -129,6 +131,8 @@ module.exports = app => {
                     p.unit_price = cp.unit_price;
                     p.contract_tp = this.ctx.helper.add(p.contract_tp, cp.contract_pc_tp);
                     p.qc_tp = this.ctx.helper.add(p.qc_tp, cp.qc_pc_tp);
+                    c.positive_qc_tp = this.ctx.helper.add(c.positive_qc_tp, cp.positive_qc_pc_tp);
+                    c.negative_qc_tp = this.ctx.helper.add(c.negative_qc_tp, cp.negative_qc_pc_tp);
                     curPc.splice(curPc.indexOf(cp), 1);
                 }
                 if (!p.unit_price) {