|
|
@@ -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, mb.origin' +
|
|
|
+ ' msb.remark, msb.is_summary, mbh.m_tax, mb.in_time, mbh.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.origin' +
|
|
|
+ ' mb.remark, mb.is_summary, mbh.m_tax, mb.in_time, mbh.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 = ?'+
|
