新增指标

app/lib/rm/material.js

@@ -176,7 +176,7 @@ class ReportMemoryMaterial {
                     '    msb.quantity, mb.expr,' +
                     '    mb.basic_price, mb.basic_times, ' +
                     '    msb.msg_tp, msb.msg_times, msb.msg_spread, mb.m_up_risk, mb.m_down_risk, msb.m_spread, msb.m_tp, mb.pre_tp, msb.m_tax_tp, mb.tax_pre_tp, mb.origin, ' +
-                    '    msb.remark, msb.is_summary, mb.m_tax, mb.in_time' +
+                    '    msb.remark, msb.is_summary, mb.m_tax, mb.in_time, mb.origin' +
                     `  FROM ${this.ctx.service.materialStageBills.tableName} msb` +
                     `  LEFT JOIN ${this.ctx.service.materialBills.tableName} mb ON msb.mb_id = mb.id` +
                     '  LEFT JOIN ' + this.ctx.service.materialStage.tableName + ' ms ON msb.ms_id = ms.id ' +
@@ -197,7 +197,7 @@ class ReportMemoryMaterial {
                     '    msb.quantity, mbh.expr,' +
                     '    mb.basic_price, mb.basic_times, ' +
                     '    msb.msg_tp, msb.msg_times, msb.msg_spread, mbh.m_up_risk, mbh.m_down_risk, msb.m_spread, msb.m_tp, mbh.pre_tp, msb.m_tax_tp, mbh.tax_pre_tp, mbh.origin, ' +
-                    '    msb.remark, msb.is_summary, mbh.m_tax, mb.in_time' +
+                    '    msb.remark, msb.is_summary, mbh.m_tax, mb.in_time, mb.origin' +
                     `  FROM ${this.ctx.service.materialStageBills.tableName} msb` +
                     '  LEFT JOIN ' + this.ctx.service.materialBillsHistory.tableName + ' mbh ON msb.mb_id = mbh.mb_id AND msb.mid = mbh.mid' +
                     '  LEFT JOIN ' + this.ctx.service.materialBills.tableName + ' mb ON msb.mb_id = mb.id ' +
@@ -210,7 +210,7 @@ class ReportMemoryMaterial {
                     '    mbh.quantity, mbh.expr,' +
                     '    mb.basic_price, mb.basic_times, ' +
                     '    mbh.msg_tp, mbh.msg_times, mbh.msg_spread, mbh.m_up_risk, mbh.m_down_risk, mbh.m_spread, mbh.m_tp, mbh.pre_tp, mbh.m_tax_tp, mbh.tax_pre_tp, mbh.origin, ' +
-                    '    mb.remark, mb.is_summary, mbh.m_tax, mb.in_time' +
+                    '    mb.remark, mb.is_summary, mbh.m_tax, mb.in_time, mb.origin' +
                     '  FROM ' + this.ctx.service.materialBillsHistory.tableName + ' mbh ' +
                     '  LEFT JOIN ' + this.ctx.service.materialBills.tableName + ' mb ON mbh.mb_id = mb.id ' +
                     '  WHERE mbh.tid = ? And mbh.mid = ?'+

app/service/report.js

@@ -200,10 +200,6 @@ module.exports = app => {
                             runnableRst.push(materialSource.getMaterialGl(params.tender_id, params.material_order, memFieldKeys[filter]));
                             runnableKey.push(filter);
                             break;
-                        case 'mem_material_gl_month':
-                            runnableRst.push(materialSource.getMaterialGlMonth(params.tender_id, params.material_order, memFieldKeys[filter]));
-                            runnableKey.push(filter);
-                            break;
                         case 'mem_material_gl_detail':
                             runnableRst.push(materialSource.getMaterialGlDetail(params.tender_id, params.material_order, memFieldKeys[filter]));
                             runnableKey.push(filter);