From 02cb3833b7cda2d162ca7e072adf44e997ff59ad Mon Sep 17 00:00:00 2001 From: yadavendras Date: Fri, 20 Jan 2017 13:49:11 +0530 Subject: [PATCH] T2P upload data newss --- .../main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java | 4 ++-- .../cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 806a337..b2b474f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -2300,13 +2300,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public ArrayList getBrandMasterData(String store_id) { + public ArrayList getBrandMasterData(String store_id, String category_id) { Cursor cursordata = null; ArrayList Data = new ArrayList(); try { - cursordata = db.rawQuery("SELECT BR.BRAND_ID, BR.BRAND FROM BRAND_MASTER BR INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID =CA.CATEGORY_ID WHERE COMPANY_ID =1", null); + cursordata = db.rawQuery("SELECT BR.BRAND_ID, SB.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM BRAND_MASTER BR INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID =CA.CATEGORY_ID WHERE COMPANY_ID =1 AND SB.CATEGORY_ID ='" + category_id+ "'", null); if (cursordata != null) { cursordata.moveToFirst(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java index 73310ec..37ddea2 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -166,7 +166,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl str = CommonString.FILE_PATH; ///band List - brand_list = db.getBrandMasterData(store_id); + brand_list = db.getBrandMasterData(store_id, categoryId); BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); String str = getResources().getString(R.string.select); brand.setBRAND(str); @@ -1009,7 +1009,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl public void showSkuDialog() { - final ArrayList brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id); + final ArrayList brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id,categoryId); BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); brand.setBRAND(getResources().getString(R.string.select));