浏览代码

计量单元汇总表,关联计量单元台账表

MaiXinRong 2 年之前
父节点
当前提交
376bc27382
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 1 0
      app/service/report.js
  2. 3 3
      app/service/rpt_gather_memory.js

+ 1 - 0
app/service/report.js

@@ -399,6 +399,7 @@ module.exports = app => {
                         break;
                 }
             }
+            console.log(rst.mem_gather_stage_pos[0]);
             return rst;
         }
     }

+ 3 - 3
app/service/rpt_gather_memory.js

@@ -549,8 +549,8 @@ module.exports = app => {
             }, function (gatherNode, sourceNode) {
                 const posRange = pos.getLedgerPos(sourceNode.id);
                 if (!posRange || posRange.length === 0) return;
-                resultPos.loadGatherPos(posRange, (gatherPos, sourcePos) => {
-                    gatherUtils.gatherPos(gatherPos, sourcePos, 'ts_' + sKey + '_', helper);
+                resultPos.loadGatherPos(gatherNode.id, posRange, (gatherPos, sourcePos) => {
+                    gatherUtils.gatherSpecialPos(gatherPos, sourcePos, 'ts_' + sKey + '_', helper);
                 });
             });
         }
@@ -566,7 +566,7 @@ module.exports = app => {
                 level: 'level',
                 rootId: -1
             });
-            this.resultPos = new Ledger.gatherPos(this.ctx, { id: 'id', ledgerId: 'lid' });
+            this.resultPos = new Ledger.gatherPos({ id: 'id', ledgerId: 'lid' });
 
             const gsSetting = JSON.parse(gsDefine.setting);
             let commonIndex = 0;