AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

T2P upload data newss

Browse Source
This commit is contained in:
yadavendras
2017-01-20 13:49:11 +05:30
parent ddb9845b9e
commit 02cb3833b7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+2 -2
View File
@@ -2300,13 +2300,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public ArrayList<BrandMasterGetterSetter> getBrandMasterData(String store_id) {
public ArrayList<BrandMasterGetterSetter> getBrandMasterData(String store_id, String category_id) {
Cursor cursordata = null;
ArrayList<BrandMasterGetterSetter> Data = new ArrayList<BrandMasterGetterSetter>();
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();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+2 -2
View File
@@ -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<BrandMasterGetterSetter> brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id);
final ArrayList<BrandMasterGetterSetter> brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id,categoryId);
BrandMasterGetterSetter brand = new BrandMasterGetterSetter();
brand.setBRAND(getResources().getString(R.string.select));