1

app/service/report_memory.js

@@ -93,6 +93,7 @@ module.exports = app => {
                     p.final_1_ratio = ctx.helper.mul(ctx.helper.div(p.end_gather_qty, p.end_final_1_qty, 4), 100);
 
                     p.due_final_qty = ctx.helper.add(p.quantity, p.due_qc_qty);
+                    p.end_ex_stage_qty1 = ctx.helper.add(p.pre_ex_stage_qty1, p.ex_stage_qty1);
                 }
             });
             // 需要缓存的数据
@@ -118,6 +119,7 @@ module.exports = app => {
                     'end_contract_pc_tp', 'end_qc_pc_tp', 'end_pc_tp',
                     'year_contract_tp', 'year_qc_tp', 'year_contract_pc_tp', 'year_qc_pc_tp', 'year_pc_tp', 'year_gather_tp',
                     'due_qc_tp', 'due_final_tp', 'tz_qc_tp',
+                    'ex_stage_tp1', 'pre_ex_stage_tp1', 'end_ex_stage_tp1',
                 ],
                 calc: function (node, helper, decimal) {
                     if (node.children && node.children.length === 0) {
@@ -132,6 +134,7 @@ module.exports = app => {
                         node.end_final_1_qty = helper.add(node.final_1_qty, node.end_qc_qty);
 
                         node.due_final_qty = helper.add(node.quantity, node.due_qc_qty);
+                        node.end_ex_stage_qty1 = helper.add(node.pre_ex_stage_qty1, node.ex_stage_qty1);
                     }
                     node.pre_gather_tp = helper.add(node.pre_contract_tp, node.pre_qc_tp);
                     node.gather_tp = helper.sum([node.contract_tp, node.qc_tp, node.pc_tp]);
@@ -147,6 +150,7 @@ module.exports = app => {
                     node.final_1_ratio = helper.mul(helper.div(node.end_gather_tp, node.end_final_1_tp, 4), 100);
 
                     node.due_final_tp = helper.add(node.total_price, node.due_qc_tp);
+                    node.end_ex_stage_tp1 = helper.add(node.pre_ex_stage_tp1, node.ex_stage_tp1);
                 }
             });
         }