|
@@ -1139,7 +1139,7 @@ module.exports = app => {
|
|
|
const sql =
|
|
|
'SELECT C.*, Sum(U.utp) As used_tp, TRUNCATE(Sum(U.utp) / C.total_price * 100 + 0.005, 2) As used_pt' +
|
|
|
' FROM ' + this.tableName + ' As C' +
|
|
|
- ' LEFT JOIN (SELECT sc.tid, sc.cid, sc.cbid, IF(SUM(sc.qty) > 0, TRUNCATE(SUM(sc.qty) * cb.unit_price + ?, 0), TRUNCATE(SUM(sc.qty) * cb.unit_price - ?, ?)) As utp' +
|
|
|
+ ' LEFT JOIN (SELECT sc.tid, sc.cid, sc.cbid, IF(SUM(sc.qty) > 0, TRUNCATE(SUM(sc.qty) * cb.unit_price + ?, ?), TRUNCATE(SUM(sc.qty) * cb.unit_price - ?, ?)) As utp' +
|
|
|
' FROM ' + this.ctx.service.stageChange.tableName + ' As sc' +
|
|
|
' INNER JOIN (' +
|
|
|
' SELECT MAX(`stimes`) As `stimes`, MAX(`sorder`) As `sorder`, `lid`, `pid`, `cbid`, sChange.`sid` ' +
|
|
@@ -1159,8 +1159,9 @@ module.exports = app => {
|
|
|
' ORDER By in_time';
|
|
|
// 舍入步长
|
|
|
const step = parseFloat('0.' + '0000000'.substr(0, this.ctx.tender.info.decimal.tp) + '5');
|
|
|
- const sqlParam = [step, step, this.ctx.tender.info.decimal.tp, tid, tid, audit.flow.status.checked];
|
|
|
- return await this.db.query(sql, sqlParam);
|
|
|
+ const sqlParam = [step, this.ctx.tender.info.decimal.tp, step, this.ctx.tender.info.decimal.tp, tid, tid, audit.flow.status.checked];
|
|
|
+ const data = await this.db.query(sql, sqlParam);
|
|
|
+ return data;
|
|
|
}
|
|
|
|
|
|
/**
|