|
@@ -44,7 +44,6 @@ class srCache {
|
|
|
const db = this.dealBills.find(x => {
|
|
|
return x.code === l.b_code && x.name === l.name && x.unit === l.unit;
|
|
|
});
|
|
|
- if (l.b_code === '101-1-a') console.log(l, db);
|
|
|
l.unit_price = db ? db.unit_price : 0;
|
|
|
if (!l.is_tp) {
|
|
|
l.contract_tp = this.ctx.helper.mul(l.unit_price, l.contract_qty, decimal.tp);
|
|
@@ -284,7 +283,7 @@ module.exports = app => {
|
|
|
}
|
|
|
|
|
|
async getPreRelaStage(tid, sorder, rela_tid) {
|
|
|
- const sql = 'SELECT * FROM ' + this.tableName + ' WHERE tid = ? AND rela_tid = ? And sorder < ? ORDER BY sorder';
|
|
|
+ const sql = 'SELECT * FROM ' + this.tableName + ' WHERE tid = ? AND rela_tid = ? And sorder < ? ORDER BY sorder desc';
|
|
|
return await this.db.queryOne(sql, [tid, rela_tid, sorder]);
|
|
|
}
|
|
|
|