期 - 清单数据表，新增两个字段

app/service/report_memory.js

@@ -58,6 +58,9 @@ module.exports = app => {
                     node.end_contract_tp = self.ctx.helper.add(node.pre_contract_tp, node.contract_tp);
                     node.end_qc_tp = self.ctx.helper.add(node.pre_qc_tp, node.qc_tp);
                     node.end_gather_tp = self.ctx.helper.add(node.pre_gather_tp, node.gather_tp);
+
+                    node.final_tp = self.ctx.helper.add(node.total_price, node.end_qc_tp);
+                    node.final_ratio = self.ctx.helper.mul(self.ctx.helper.div(node.end_gather_tp, node.final_tp, 4), 100);
                 }
             });
             this.pos = new Ledger.pos({
@@ -312,6 +315,7 @@ module.exports = app => {
                 'contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'gather_qty', 'gather_tp', 'postil',
                 'pre_contract_qty', 'pre_contract_tp', 'pre_qc_qty', 'pre_qc_tp', 'pre_gather_qty', 'pre_gather_tp',
                 'end_contract_qty', 'end_contract_tp', 'end_qc_qty', 'end_qc_tp', 'end_gather_qty', 'end_gather_tp',
+                'final_tp', 'final_ratio',
             ]);
         }
 

test/app/service/report_memory.test.js

@@ -157,6 +157,9 @@ describe('test/app/service/report_memory.test.js', () => {
             addFields(tableDefine, '截止本期-完成-数量', 'end_gather_qty', dataType.currency);
             addFields(tableDefine, '截止本期-完成-金额', 'end_gather_tp', dataType.currency);
 
+            addFields(tableDefine, '(台账 + 截止本期变更)-金额', 'final_tp', dataType.currency);
+            addFields(tableDefine, '截止本期完成率(%)', 'final_ratio', dataType.double);
+
             delete tableDefine.ID;
             delete tableDefine.key;
             yield ctx.helper.saveBufferFile(JSON.stringify(tableDefine,"","\t"), ctx.app.baseDir + '/mem_stage_bills_define.json');