| Line 204... |
Line 204... |
| 204 |
//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());
|
| 205 |
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);
|
| 206 |
vendor_warehouses.addAll(ours_warehouses);
|
206 |
vendor_warehouses.addAll(ours_warehouses);
|
| 207 |
for (Warehouse warehouse:vendor_warehouses){
|
207 |
for (Warehouse warehouse:vendor_warehouses){
|
| 208 |
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){
|
209 |
/*if(warehouse.getLogisticsLocation().equals(WarehouseLocation.Delhi) && warehouse.getWarehouseType().equals(WarehouseType.THIRD_PARTY) && warehouse.getVendor().getId()!=1){
|
| 210 |
|
210 |
|
| 211 |
}
|
211 |
}
|
| 212 |
else{
|
212 |
else{
|
| 213 |
continue;
|
213 |
continue;
|
| 214 |
}
|
214 |
}
|
| - |
|
215 |
*/ continue;
|
| 215 |
}
|
216 |
}
|
| 216 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
217 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
| 217 |
ignoredItem.setItemId(thriftItem.getId());
|
218 |
ignoredItem.setItemId(thriftItem.getId());
|
| 218 |
ignoredItem.setWarehouseId(warehouse.getId());
|
219 |
ignoredItem.setWarehouseId(warehouse.getId());
|
| 219 |
if (itemavailability.get(warehouse.getId())!=null && !thirdpartywarehouseids.contains(warehouse.getId()) && !ignoreItems.contains(ignoredItem)){
|
220 |
if (itemavailability.get(warehouse.getId())!=null && !thirdpartywarehouseids.contains(warehouse.getId()) && !ignoreItems.contains(ignoredItem)){
|
| Line 244... |
Line 245... |
| 244 |
}
|
245 |
}
|
| 245 |
}
|
246 |
}
|
| 246 |
else{
|
247 |
else{
|
| 247 |
for (Map.Entry<Long,Long> entry : itemavailability.entrySet()) {
|
248 |
for (Map.Entry<Long,Long> entry : itemavailability.entrySet()) {
|
| 248 |
if(allWarehousesMap.get(entry.getKey()).getBillingWarehouseId()!=7){
|
249 |
if(allWarehousesMap.get(entry.getKey()).getBillingWarehouseId()!=7){
|
| 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 |
/* 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 |
|
| 251 |
}
|
252 |
}
|
| 252 |
else{
|
253 |
else{
|
| 253 |
continue;
|
254 |
continue;
|
| 254 |
}
|
255 |
}
|
| - |
|
256 |
*/
|
| - |
|
257 |
continue;
|
| 255 |
}
|
258 |
}
|
| 256 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
259 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
| 257 |
ignoredItem.setItemId(thriftItem.getId());
|
260 |
ignoredItem.setItemId(thriftItem.getId());
|
| 258 |
ignoredItem.setWarehouseId(entry.getKey());
|
261 |
ignoredItem.setWarehouseId(entry.getKey());
|
| 259 |
if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
|
262 |
if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
|
| Line 289... |
Line 292... |
| 289 |
itemreserve = iteminventory.getReserved();
|
292 |
itemreserve = iteminventory.getReserved();
|
| 290 |
if (thriftItem.isIsWarehousePreferenceSticky() && thriftItem.getPreferredVendor()!=0){
|
293 |
if (thriftItem.isIsWarehousePreferenceSticky() && thriftItem.getPreferredVendor()!=0){
|
| 291 |
//System.out.println("Item id "+thriftItem.getId()+".Found prefered vendor and warehouse is marked sticky (Calculating Reserve)"+thriftItem.getPreferredVendor());
|
294 |
//System.out.println("Item id "+thriftItem.getId()+".Found prefered vendor and warehouse is marked sticky (Calculating Reserve)"+thriftItem.getPreferredVendor());
|
| 292 |
for (Warehouse warehouse:vendor_warehouses){
|
295 |
for (Warehouse warehouse:vendor_warehouses){
|
| 293 |
if(warehouse.getBillingWarehouseId()!=7){
|
296 |
if(warehouse.getBillingWarehouseId()!=7){
|
| 294 |
if(warehouse.getLogisticsLocation().equals(WarehouseLocation.Delhi) && warehouse.getWarehouseType().equals(WarehouseType.THIRD_PARTY) && warehouse.getVendor().getId()!=1){
|
297 |
/* if(warehouse.getLogisticsLocation().equals(WarehouseLocation.Delhi) && warehouse.getWarehouseType().equals(WarehouseType.THIRD_PARTY) && warehouse.getVendor().getId()!=1){
|
| 295 |
|
298 |
|
| 296 |
}
|
299 |
}
|
| 297 |
else{
|
300 |
else{
|
| 298 |
continue;
|
301 |
continue;
|
| 299 |
}
|
302 |
}
|
| - |
|
303 |
*/ continue;
|
| 300 |
}
|
304 |
}
|
| 301 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
305 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
| 302 |
ignoredItem.setItemId(thriftItem.getId());
|
306 |
ignoredItem.setItemId(thriftItem.getId());
|
| 303 |
ignoredItem.setWarehouseId(warehouse.getId());
|
307 |
ignoredItem.setWarehouseId(warehouse.getId());
|
| 304 |
if (itemreserve.get(warehouse.getId())!=null && !thirdpartywarehouseids.contains(warehouse.getId()) && !ignoreItems.contains(warehouse.getId())){
|
308 |
if (itemreserve.get(warehouse.getId())!=null && !thirdpartywarehouseids.contains(warehouse.getId()) && !ignoreItems.contains(warehouse.getId())){
|
| Line 317... |
Line 321... |
| 317 |
}
|
321 |
}
|
| 318 |
}
|
322 |
}
|
| 319 |
}else{
|
323 |
}else{
|
| 320 |
for (Map.Entry<Long,Long> entry : itemreserve.entrySet()) {
|
324 |
for (Map.Entry<Long,Long> entry : itemreserve.entrySet()) {
|
| 321 |
if(allWarehousesMap.get(entry.getKey()).getBillingWarehouseId()!=7){
|
325 |
if(allWarehousesMap.get(entry.getKey()).getBillingWarehouseId()!=7){
|
| 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){
|
326 |
/*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 |
|
327 |
|
| 324 |
}
|
328 |
}
|
| 325 |
else{
|
329 |
else{
|
| 326 |
continue;
|
330 |
continue;
|
| 327 |
}
|
331 |
}
|
| - |
|
332 |
*/ continue;
|
| 328 |
}
|
333 |
}
|
| 329 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
334 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
| 330 |
ignoredItem.setItemId(thriftItem.getId());
|
335 |
ignoredItem.setItemId(thriftItem.getId());
|
| 331 |
ignoredItem.setWarehouseId(entry.getKey());
|
336 |
ignoredItem.setWarehouseId(entry.getKey());
|
| 332 |
if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
|
337 |
if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
|