浏览代码

汇总表,计量单元,完善交叉数据

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

+ 2 - 1
app/service/rpt_gather_memory.js

@@ -457,7 +457,7 @@ module.exports = app => {
                     node.end_gather_qty = helper.add(node.pre_gather_qty, node.gather_qty);
                 },
             });
-            const posData = await this.ctx.service.pos.getAllDataByCondition({ where: { tid: tender.id } });
+            const posData = await this.ctx.service.pos.getPosData({ tid: tender.id });
             if (stage) {
                 await this.ctx.service.stage.doCheckStage(stage);
                 const curStage = stage.readOnly
@@ -627,6 +627,7 @@ module.exports = app => {
 
             this.resultTree.resortChildrenDefault();
             gatherUtils.completeGatherData(this.resultTree.nodes, completeDatas);
+            gatherUtils.completeGatherData(this.resultPos.datas, completeDatas);
         }
 
         async getGatherStageBills(memFieldKeys, gsDefine, gsCustom) {