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

kenya4

Browse Source
This commit is contained in:
CPM
2020-11-29 19:06:19 +05:30
parent faea9b0b3d
commit e00cb3d03f
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+11 -4
View File
@@ -3980,7 +3980,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"WHERE CA.CATEGORY_ID = '" + category_id + "'", null); "WHERE CA.CATEGORY_ID = '" + category_id + "'", null);
} }
else { else {
cursordata = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, BR.BRAND FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " + cursordata = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, BR.BRAND||'('||SB.SUB_CATEGORY||')' as BRAND FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " +
"INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " + "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 " + "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " +
"INNER JOIN " + "INNER JOIN " +
@@ -5493,15 +5493,22 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
//get Sub Category Master //get Sub Category Master
public ArrayList<MSL_AvailabilityStockFacingGetterSetter> getSubCategoryMaster( public ArrayList<MSL_AvailabilityStockFacingGetterSetter> getSubCategoryMaster(
String category_id) { String category_id,String store_id) {
ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>(); ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null; Cursor dbcursor = null;
try { try {
dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null); // dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null);
//kenya
dbcursor = db.rawQuery("SELECT DISTINCT BR.sub_category_id, SUB_Category FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " +
"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 " +
"INNER JOIN " +
"(SELECT DISTINCT SKU_ID FROM MAPPING_STOCK_STOREWISE WHERE STORE_ID = '" + store_id + "') A " +
"ON SK.SKU_ID = A.SKU_ID " +
"WHERE BR.COMPANY_ID =1 AND CA.CATEGORY_ID ='" + category_id + "'", null);
if (dbcursor != null) { if (dbcursor != null) {
dbcursor.moveToFirst(); dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) { while (!dbcursor.isAfterLast()) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java
+3 -2
View File
@@ -104,7 +104,8 @@ public class CreateSelfActivity extends AppCompatActivity {
added_sub_category_list = new ArrayList<>(); added_sub_category_list = new ArrayList<>();
ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId); //kenya use
ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId,store_id);
for(int i=0; i<sub_category_list.size(); i++){ for(int i=0; i<sub_category_list.size(); i++){
@@ -149,7 +150,7 @@ public class CreateSelfActivity extends AppCompatActivity {
public void showSkuDialog() { public void showSkuDialog() {
final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId); final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId,store_id);
MSL_AvailabilityStockFacingGetterSetter brand = new MSL_AvailabilityStockFacingGetterSetter(); MSL_AvailabilityStockFacingGetterSetter brand = new MSL_AvailabilityStockFacingGetterSetter();
brand.setSub_category("select"); brand.setSub_category("select");
sub_category_list.add(0, brand); sub_category_list.add(0, brand);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
+2 -2
View File
@@ -219,7 +219,7 @@ public class CategoryListActivity extends AppCompatActivity {
} }
else { else {
final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id); final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id,store_id);
//if Sub Group Data exists for any Sub Category of the Category //if Sub Group Data exists for any Sub Category of the Category
boolean isSubGroupDataExists = false; boolean isSubGroupDataExists = false;
@@ -624,7 +624,7 @@ public class CategoryListActivity extends AppCompatActivity {
} }
}else { }else {
final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id); final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id,store_id);
//if Sub Group Data exists for any Sub Category of the Category //if Sub Group Data exists for any Sub Category of the Category
boolean isSubGroupDataExists = false; boolean isSubGroupDataExists = false;