|
|
@@ -112,7 +112,7 @@ class rptMemChange extends RptMemBase {
|
|
|
async getChangeLedgerBillsData(fields, showLevel) {
|
|
|
try {
|
|
|
const billsData = await this.ctx.service.ledger.getData(this.ctx.tender.id);
|
|
|
- const changeBillsData = await this.ctx.service.changeLedger.getAllDataByCondition({ where: { ccid: this.ctx.change.id } });
|
|
|
+ const changeBillsData = await this.ctx.service.changeLedger.getAllDataByCondition({ where: { tender_id: this.ctx.tender.id } });
|
|
|
billsData.push(...changeBillsData);
|
|
|
|
|
|
const billsTree = this._getNewBillsTree();
|
|
|
@@ -132,7 +132,7 @@ class rptMemChange extends RptMemBase {
|
|
|
async getChangeLedgerPosData() {
|
|
|
try {
|
|
|
const posData = await this.ctx.service.pos.getAllDataByCondition({ where: {tid: this.ctx.tender.id }});
|
|
|
- const changePosData = await this.ctx.service.changePos.getAllDataByCondition({ where: { ccid: this.ctx.change.id } });
|
|
|
+ const changePosData = await this.ctx.service.changePos.getAllDataByCondition({ where: { tid: this.ctx.tender.id } });
|
|
|
posData.push(...changePosData);
|
|
|
|
|
|
const pos = new Ledger.pos({
|