|
@@ -377,7 +377,7 @@ module.exports = app => {
|
|
* @return {void}
|
|
* @return {void}
|
|
*/
|
|
*/
|
|
async getMaterialData(tid, mid) {
|
|
async getMaterialData(tid, mid) {
|
|
- const sql = 'SELECT ml.`id`, mb.`code`, mb.`name`, mb.`unit`, ml.`order`, ml.`gather_qty`, ml.`quantity`, ml.`expr`, ml.`mb_id`, ml.`gcl_id`, ml.`xmj_id`, ml.`mx_id`, ml.`ms_id`, ml.`tid`, ml.`mid`, mb.m_spread, ml.ms_id' +
|
|
|
|
|
|
+ const sql = 'SELECT ml.`id`, mb.`code`, mb.`name`, mb.`unit`, ml.`order`, ml.`gather_qty`, ml.`quantity`, ml.`expr`, ml.`mb_id`, ml.`gcl_id`, ml.`xmj_id`, ml.`mx_id`, ml.`ms_id`, ml.`tid`, ml.`mid`, mb.m_spread, ml.ms_id, ml.is_join' +
|
|
' FROM ' + this.tableName + ' as ml' +
|
|
' FROM ' + this.tableName + ' as ml' +
|
|
' LEFT JOIN ' + this.ctx.service.materialBills.tableName + ' as mb' +
|
|
' LEFT JOIN ' + this.ctx.service.materialBills.tableName + ' as mb' +
|
|
' ON ml.`mb_id` = mb.`id`' +
|
|
' ON ml.`mb_id` = mb.`id`' +
|