|
@@ -1198,11 +1198,11 @@ module.exports = app => {
|
|
? field + ' = ' + self.db.escape(value)
|
|
? field + ' = ' + self.db.escape(value)
|
|
: self.db.format("(?? = null or ?? = '')", [field, field]);
|
|
: self.db.format("(?? = null or ?? = '')", [field, field]);
|
|
};
|
|
};
|
|
- const filter = getFilterPart('cb.code', bills.b_code) +
|
|
|
|
|
|
+ let filter = getFilterPart('cb.code', bills.b_code) +
|
|
' And ' + getFilterPart('cb.name', bills.name) +
|
|
' And ' + getFilterPart('cb.name', bills.name) +
|
|
' And ' + getFilterPart('cb.unit', bills.unit) +
|
|
' And ' + getFilterPart('cb.unit', bills.unit) +
|
|
- ' And cb.`unit_price` = ' + this.db.escape(bills.unit_price) +
|
|
|
|
- (pos ? ' And ' + getFilterPart('cb.bwmx', pos.name) : '');
|
|
|
|
|
|
+ ' And cb.`unit_price` = ' + this.db.escape(bills.unit_price);
|
|
|
|
+ // if (data.pos) filter = filter + ' And ' + getFilterPart('cb.bwmx', pos.name);
|
|
const sql =
|
|
const sql =
|
|
'SELECT c.cid, c.code, c.name, c.w_code, c.p_code, c.peg, c.org_name, c.org_code, c.new_name, c.new_code,' +
|
|
'SELECT c.cid, c.code, c.name, c.w_code, c.p_code, c.peg, c.org_name, c.org_code, c.new_name, c.new_code,' +
|
|
' c.content, c.basis, c.memo, c.type, c.class, c.quality, c.company, c.charge, ' +
|
|
' c.content, c.basis, c.memo, c.type, c.class, c.quality, c.company, c.charge, ' +
|