| Line 7... |
Line 7... |
| 7 |
import in.shop2020.model.v1.inventory.InventoryService.Client;
|
7 |
import in.shop2020.model.v1.inventory.InventoryService.Client;
|
| 8 |
import in.shop2020.model.v1.inventory.InventoryType;
|
8 |
import in.shop2020.model.v1.inventory.InventoryType;
|
| 9 |
import in.shop2020.model.v1.inventory.ItemInventory;
|
9 |
import in.shop2020.model.v1.inventory.ItemInventory;
|
| 10 |
import in.shop2020.model.v1.inventory.SnapdealInventoryItem;
|
10 |
import in.shop2020.model.v1.inventory.SnapdealInventoryItem;
|
| 11 |
import in.shop2020.model.v1.inventory.Warehouse;
|
11 |
import in.shop2020.model.v1.inventory.Warehouse;
|
| - |
|
12 |
import in.shop2020.model.v1.inventory.WarehouseLocation;
|
| 12 |
import in.shop2020.model.v1.inventory.WarehouseType;
|
13 |
import in.shop2020.model.v1.inventory.WarehouseType;
|
| 13 |
import in.shop2020.thrift.clients.CatalogClient;
|
14 |
import in.shop2020.thrift.clients.CatalogClient;
|
| 14 |
import in.shop2020.thrift.clients.InventoryClient;
|
15 |
import in.shop2020.thrift.clients.InventoryClient;
|
| 15 |
import in.shop2020.thrift.clients.TransactionClient;
|
16 |
import in.shop2020.thrift.clients.TransactionClient;
|
| 16 |
import in.shop2020.utils.GmailUtils;
|
17 |
import in.shop2020.utils.GmailUtils;
|
| Line 203... |
Line 204... |
| 203 |
//System.out.println("Item id "+thriftItem.getId()+".Found prefered vendor and warehouse is marked sticky (Calculating availability)"+thriftItem.getPreferredVendor());
|
204 |
//System.out.println("Item id "+thriftItem.getId()+".Found prefered vendor and warehouse is marked sticky (Calculating availability)"+thriftItem.getPreferredVendor());
|
| 204 |
vendor_warehouses = inventoryClient.getWarehouses(WarehouseType.THIRD_PARTY,InventoryType.GOOD , thriftItem.getPreferredVendor(), 0, 0);
|
205 |
vendor_warehouses = inventoryClient.getWarehouses(WarehouseType.THIRD_PARTY,InventoryType.GOOD , thriftItem.getPreferredVendor(), 0, 0);
|
| 205 |
vendor_warehouses.addAll(ours_warehouses);
|
206 |
vendor_warehouses.addAll(ours_warehouses);
|
| 206 |
for (Warehouse warehouse:vendor_warehouses){
|
207 |
for (Warehouse warehouse:vendor_warehouses){
|
| 207 |
if(warehouse.getBillingWarehouseId()!=7){
|
208 |
if(warehouse.getBillingWarehouseId()!=7){
|
| - |
|
209 |
if(warehouse.getLogisticsLocation().equals(WarehouseLocation.Delhi) && warehouse.getWarehouseType().equals(WarehouseType.THIRD_PARTY) && warehouse.getVendor().getId()!=1){
|
| - |
|
210 |
|
| - |
|
211 |
}
|
| - |
|
212 |
else{
|
| 208 |
continue;
|
213 |
continue;
|
| - |
|
214 |
}
|
| 209 |
}
|
215 |
}
|
| 210 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
216 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
| 211 |
ignoredItem.setItemId(thriftItem.getId());
|
217 |
ignoredItem.setItemId(thriftItem.getId());
|
| 212 |
ignoredItem.setWarehouseId(warehouse.getId());
|
218 |
ignoredItem.setWarehouseId(warehouse.getId());
|
| 213 |
if (itemavailability.get(warehouse.getId())!=null && !thirdpartywarehouseids.contains(warehouse.getId()) && !ignoreItems.contains(ignoredItem)){
|
219 |
if (itemavailability.get(warehouse.getId())!=null && !thirdpartywarehouseids.contains(warehouse.getId()) && !ignoreItems.contains(ignoredItem)){
|
| Line 238... |
Line 244... |
| 238 |
}
|
244 |
}
|
| 239 |
}
|
245 |
}
|
| 240 |
else{
|
246 |
else{
|
| 241 |
for (Map.Entry<Long,Long> entry : itemavailability.entrySet()) {
|
247 |
for (Map.Entry<Long,Long> entry : itemavailability.entrySet()) {
|
| 242 |
if(allWarehousesMap.get(entry.getKey()).getBillingWarehouseId()!=7){
|
248 |
if(allWarehousesMap.get(entry.getKey()).getBillingWarehouseId()!=7){
|
| 243 |
continue;
|
249 |
if(allWarehousesMap.get(entry.getKey()).getLogisticsLocation().equals(WarehouseLocation.Delhi) && allWarehousesMap.get(entry.getKey()).getWarehouseType().equals(WarehouseType.THIRD_PARTY) && allWarehousesMap.get(entry.getKey()).getVendor().getId()!=1){
|
| - |
|
250 |
|
| - |
|
251 |
}
|
| - |
|
252 |
else{
|
| - |
|
253 |
continue;
|
| - |
|
254 |
}
|
| 244 |
}
|
255 |
}
|
| 245 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
256 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
| 246 |
ignoredItem.setItemId(thriftItem.getId());
|
257 |
ignoredItem.setItemId(thriftItem.getId());
|
| 247 |
ignoredItem.setWarehouseId(entry.getKey());
|
258 |
ignoredItem.setWarehouseId(entry.getKey());
|
| 248 |
if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
|
259 |
if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
|
| Line 278... |
Line 289... |
| 278 |
itemreserve = iteminventory.getReserved();
|
289 |
itemreserve = iteminventory.getReserved();
|
| 279 |
if (thriftItem.isIsWarehousePreferenceSticky() && thriftItem.getPreferredVendor()!=0){
|
290 |
if (thriftItem.isIsWarehousePreferenceSticky() && thriftItem.getPreferredVendor()!=0){
|
| 280 |
//System.out.println("Item id "+thriftItem.getId()+".Found prefered vendor and warehouse is marked sticky (Calculating Reserve)"+thriftItem.getPreferredVendor());
|
291 |
//System.out.println("Item id "+thriftItem.getId()+".Found prefered vendor and warehouse is marked sticky (Calculating Reserve)"+thriftItem.getPreferredVendor());
|
| 281 |
for (Warehouse warehouse:vendor_warehouses){
|
292 |
for (Warehouse warehouse:vendor_warehouses){
|
| 282 |
if(warehouse.getBillingWarehouseId()!=7){
|
293 |
if(warehouse.getBillingWarehouseId()!=7){
|
| - |
|
294 |
if(warehouse.getLogisticsLocation().equals(WarehouseLocation.Delhi) && warehouse.getWarehouseType().equals(WarehouseType.THIRD_PARTY) && warehouse.getVendor().getId()!=1){
|
| - |
|
295 |
|
| - |
|
296 |
}
|
| - |
|
297 |
else{
|
| 283 |
continue;
|
298 |
continue;
|
| - |
|
299 |
}
|
| 284 |
}
|
300 |
}
|
| 285 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
301 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
| 286 |
ignoredItem.setItemId(thriftItem.getId());
|
302 |
ignoredItem.setItemId(thriftItem.getId());
|
| 287 |
ignoredItem.setWarehouseId(warehouse.getId());
|
303 |
ignoredItem.setWarehouseId(warehouse.getId());
|
| 288 |
if (itemreserve.get(warehouse.getId())!=null && !thirdpartywarehouseids.contains(warehouse.getId()) && !ignoreItems.contains(warehouse.getId())){
|
304 |
if (itemreserve.get(warehouse.getId())!=null && !thirdpartywarehouseids.contains(warehouse.getId()) && !ignoreItems.contains(warehouse.getId())){
|
| Line 301... |
Line 317... |
| 301 |
}
|
317 |
}
|
| 302 |
}
|
318 |
}
|
| 303 |
}else{
|
319 |
}else{
|
| 304 |
for (Map.Entry<Long,Long> entry : itemreserve.entrySet()) {
|
320 |
for (Map.Entry<Long,Long> entry : itemreserve.entrySet()) {
|
| 305 |
if(allWarehousesMap.get(entry.getKey()).getBillingWarehouseId()!=7){
|
321 |
if(allWarehousesMap.get(entry.getKey()).getBillingWarehouseId()!=7){
|
| 306 |
continue;
|
322 |
if(allWarehousesMap.get(entry.getKey()).getLogisticsLocation().equals(WarehouseLocation.Delhi) && allWarehousesMap.get(entry.getKey()).getWarehouseType().equals(WarehouseType.THIRD_PARTY) && allWarehousesMap.get(entry.getKey()).getVendor().getId()!=1){
|
| - |
|
323 |
|
| - |
|
324 |
}
|
| - |
|
325 |
else{
|
| - |
|
326 |
continue;
|
| - |
|
327 |
}
|
| 307 |
}
|
328 |
}
|
| 308 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
329 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
| 309 |
ignoredItem.setItemId(thriftItem.getId());
|
330 |
ignoredItem.setItemId(thriftItem.getId());
|
| 310 |
ignoredItem.setWarehouseId(entry.getKey());
|
331 |
ignoredItem.setWarehouseId(entry.getKey());
|
| 311 |
if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
|
332 |
if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
|