汇总表，新增汇总 (标段)台账-变更-金额，(合计)台账-变更-金额 指标数据

app/service/rpt_gather_memory.js

@@ -39,6 +39,8 @@ const gatherUtils = {
         gatherNode[prefix + "tp"] = helper.add(gatherNode[prefix + "tp"], sourceNode.total_price);
         gatherNode[prefix + "deal_qty"] = helper.add(gatherNode[prefix + "deal_qty"], sourceNode.deal_qty);
         gatherNode[prefix + "deal_tp"] = helper.add(gatherNode[prefix + "deal_tp"], sourceNode.deal_tp);
+        gatherNode[prefix + 'tz_qc_qty'] = helper.add(gatherNode[prefix + 'tz_qc_qty'], sourceNode.tz_qc_qty);
+        gatherNode[prefix + 'tz_qc_tp'] = helper.add(gatherNode[prefix + 'tz_qc_tp'], sourceNode.tz_qc_tp);
 
         gatherNode[prefix + "dgn_qty1"] = helper.add(gatherNode[prefix + "dgn_qty1"], sourceNode.dgn_qty1);
         gatherNode[prefix + "dgn_qty2"] = helper.add(gatherNode[prefix + "dgn_qty2"], sourceNode.dgn_qty2);
@@ -82,6 +84,8 @@ const gatherUtils = {
         gatherNode.s_tp = helper.add(gatherNode.s_tp, sourceNode.total_price);
         gatherNode.s_deal_qty = helper.add(gatherNode.s_deal_qty, sourceNode.deal_qty);
         gatherNode.s_deal_tp = helper.add(gatherNode.s_deal_tp, sourceNode.deal_tp);
+        gatherNode.s_tz_qc_qty = helper.add(gatherNode.s_tz_qc_qty, sourceNode.tz_qc_qty);
+        gatherNode.s_tz_qc_tp = helper.add(gatherNode.s_tz_qc_tp, sourceNode.tz_qc_tp);
 
         gatherNode.s_dgn_qty1 = helper.add(gatherNode.s_dgn_qty1, sourceNode.dgn_qty1);
         gatherNode.s_dgn_qty2 = helper.add(gatherNode.s_dgn_qty2, sourceNode.dgn_qty2);
@@ -130,6 +134,8 @@ const gatherUtils = {
         gatherNode[prefix + "tp"] = helper.add(gatherNode[prefix + "tp"], sourceNode.total_price);
         gatherNode[prefix + "deal_qty"] = helper.add(gatherNode[prefix + "deal_qty"], sourceNode.deal_qty);
         gatherNode[prefix + "deal_tp"] = helper.add(gatherNode[prefix + "deal_tp"], sourceNode.deal_tp);
+        gatherNode[prefix + 'tz_qc_qty'] = helper.add(gatherNode[prefix + 'tz_qc_qty'], sourceNode.tz_qc_qty);
+        gatherNode[prefix + 'tz_qc_tp'] = helper.add(gatherNode[prefix + 'tz_qc_tp'], sourceNode.tz_qc_tp);
 
         gatherNode[prefix + "dgn_qty1"] = helper.add(gatherNode[prefix + "dgn_qty1"], sourceNode.dgn_qty1);
         gatherNode[prefix + "dgn_qty2"] = helper.add(gatherNode[prefix + "dgn_qty2"], sourceNode.dgn_qty2);
@@ -151,6 +157,8 @@ const gatherUtils = {
         gatherNode.s_tp = helper.add(gatherNode.s_tp, sourceNode.total_price);
         gatherNode.s_deal_qty = helper.add(gatherNode.s_deal_qty, sourceNode.deal_qty);
         gatherNode.s_deal_tp = helper.add(gatherNode.s_deal_tp, sourceNode.deal_tp);
+        gatherNode.s_tz_qc_qty = helper.add(gatherNode.s_tz_qc_qty, sourceNode.tz_qc_qty);
+        gatherNode.s_tz_qc_tp = helper.add(gatherNode.s_tz_qc_tp, sourceNode.tz_qc_tp);
 
         gatherNode.s_contract_qty = helper.add(gatherNode.s_contract_qty, sourceNode.contract_qty);
         gatherNode.s_contract_tp = helper.add(gatherNode.s_contract_tp, sourceNode.contract_tp);
@@ -169,6 +177,8 @@ const gatherUtils = {
         gatherNode[prefix + "tp"] = helper.add(gatherNode[prefix + "tp"], sourceNode.total_price);
         gatherNode[prefix + "deal_qty"] = helper.add(gatherNode[prefix + "deal_qty"], sourceNode.deal_qty);
         gatherNode[prefix + "deal_tp"] = helper.add(gatherNode[prefix + "deal_tp"], sourceNode.deal_tp);
+        gatherNode[prefix + 'tz_qc_qty'] = helper.add(gatherNode[prefix + 'tz_qc_qty'], sourceNode.tz_qc_qty);
+        gatherNode[prefix + 'tz_qc_tp'] = helper.add(gatherNode[prefix + 'tz_qc_tp'], sourceNode.tz_qc_tp);
 
         gatherNode[prefix + "dgn_qty1"] = helper.add(gatherNode[prefix + "dgn_qty1"], sourceNode.dgn_qty1);
         gatherNode[prefix + "dgn_qty2"] = helper.add(gatherNode[prefix + "dgn_qty2"], sourceNode.dgn_qty2);
@@ -177,6 +187,8 @@ const gatherUtils = {
         gatherNode.s_tp = helper.add(gatherNode.s_tp, sourceNode.total_price);
         gatherNode.s_deal_qty = helper.add(gatherNode.s_deal_qty, sourceNode.deal_qty);
         gatherNode.s_deal_tp = helper.add(gatherNode.s_deal_tp, sourceNode.deal_tp);
+        gatherNode.s_tz_qc_qty = helper.add(gatherNode.s_tz_qc_qty, sourceNode.tz_qc_qty);
+        gatherNode.s_tz_qc_tp = helper.add(gatherNode.s_tz_qc_tp, sourceNode.tz_qc_tp);
     },
     gatherSpecial: function (gatherNode, sourceNode, prefix, helper) {
         gatherNode[prefix + "qty"] = helper.add(gatherNode[prefix + "qty"], sourceNode.quantity);
@@ -578,7 +590,7 @@ module.exports = app => {
                     'contract_tp', 'qc_tp', 'contract_pc_tp', 'qc_pc_tp', 'pc_tp', 'gather_tp',
                     'pre_contract_tp', 'pre_qc_tp', 'pre_gather_tp',
                     'end_contract_tp', 'end_qc_tp', 'end_gather_tp',
-                    'due_qc_tp', 'due_final_tp',
+                    'due_qc_tp', 'due_final_tp', 'tz_qc_tp',
                 ],
                 calc: function (node) {
                     if (node.children && node.children.length === 0) {
@@ -642,9 +654,13 @@ module.exports = app => {
                     { data: preStagePos, fields: ['contract_qty', 'qc_qty'], prefix: 'pre_', relaId: 'pid' },
                 ]);
             }
+
             billsTree.loadDatas(billsData);
-            billsTree.calculateAll();
             pos.loadDatas(posData);
+            const tenderInfo = await this.ctx.service.tenderInfo.getTenderInfo(tender.id);
+            const reCalcChange = await this.ctx.service.change.getReCalcChangeData(tender.id, tenderInfo);
+            Ledger.treeUtils.loadChangeData(billsTree, pos, reCalcChange, tenderInfo, helper);
+            billsTree.calculateAll();
             pos.calculateAll();
 
             this.resultTree.loadGatherTree(billsTree, function (gatherNode, sourceNode) {