diff --git a/adapter/pradapter.js b/adapter/pradapter.js index fb5a623..d0c2b2b 100644 --- a/adapter/pradapter.js +++ b/adapter/pradapter.js @@ -437,6 +437,7 @@ class PrAdapter extends Adapter { qryBase += "from vw_pr v "; qryBase += "left join tbl_pr p on p._idx = v.id "; qryBase += "left join tbl_currency c on c._idx = p.currency_id "; + qryBase += "left join tbl_justification j on j._idx = v.idxjustification "; let qry = qryBase; qry += "where (trim(v.trxidpr) like '%" + @@ -453,7 +454,7 @@ class PrAdapter extends Adapter { qry += "and " + swherenik + " "; } if (sdivision) { - qry += "and " + sdivision + " "; + qry += "and j.division = '" + division + "' "; } // qry += "order by id asc limit " + offset + ", " + limit; diff --git a/controllers/pr.js b/controllers/pr.js index 6cd3a1e..3d472c6 100644 --- a/controllers/pr.js +++ b/controllers/pr.js @@ -33,10 +33,11 @@ function buildPrAccount({prNo, qtyAcc, prDate, budget, costCenter, profitCenter} function buildPrItem({prNo, shortText, qty, unit, price, prDate}) { return buildPipeString(80, { 0: prNo, - 3: "120", + 3: "TIL", 4: "Putra", 5: shortText, 13: "1603", + 14: "TIL1", 15: "TrackNo1", 16: "ZSRV", 18: qty,