Browse Source

关联台账,计量单元,本期、截止本期数据问题

MaiXinRong 3 years ago
parent
commit
df9a0b48ee
1 changed files with 2 additions and 4 deletions
  1. 2 4
      app/controller/stage_rela_controller.js

+ 2 - 4
app/controller/stage_rela_controller.js

@@ -144,11 +144,9 @@ module.exports = app => {
             const endStageData = await ctx.service.stageRelaPosFinal.getAllDataByCondition({
                 where: {sid: ctx.stage.id, rela_tid: relaStage.rela_tid},
             });
-            // const curStageData = await ctx.service.stagePos.getLastestStageData2(relaStage.rela_tid, relaStage.rela_sid);
-            // const endStageData = await ctx.service.stagePosFinal.getFinalData({id: relaStage.rela_tid}, relaStage.rela_sid);
             this.ctx.helper.assignRelaData(posData, [
-                { data: curStageData, fields: ['contract_qty', 'contract_expr', 'contract_tp', 'qc_qty', 'qc_tp', 'postil'], prefix: '', relaId: 'lid' },
-                { data: endStageData, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', ], prefix: 'end_', relaId: 'lid' },
+                { data: curStageData, fields: ['contract_qty', 'contract_expr', 'contract_tp', 'qc_qty', 'qc_tp', 'postil'], prefix: '', relaId: 'pid' },
+                { data: endStageData, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', ], prefix: 'end_', relaId: 'pid' },
             ]);
             return posData;
         }