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

YSY commit

Browse Source
This commit is contained in:
yadavendras
2019-09-07 17:38:49 +05:30
parent 8d2abf5317
commit 9472424dee
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/build.gradle
+2 -2
View File
@@ -21,8 +21,8 @@ android {
targetSdkVersion 26 targetSdkVersion 26
//For Egypt //For Egypt
versionCode 25 versionCode 26
versionName "3.7" versionName "3.8"
//For UAE //For UAE
/*versionCode 22 /*versionCode 22
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java
+7 -1
View File
@@ -270,7 +270,13 @@ public class StockDataActivity extends AppCompatActivity implements DialogCallba
//childDataList = new ArrayList<>(); //childDataList = new ArrayList<>();
childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id); childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (!(childDataList.size() > 0)) { if (!(childDataList.size() > 0)) {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK);
if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK_ADHOC);
}
else {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK);
}
} }
hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList); hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);