| 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;
|
- |
|
| 216 |
}
|
215 |
}
|
| 217 |
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();
|
| 218 |
ignoredItem.setItemId(thriftItem.getId());
|
217 |
ignoredItem.setItemId(thriftItem.getId());
|
| 219 |
ignoredItem.setWarehouseId(warehouse.getId());
|
218 |
ignoredItem.setWarehouseId(warehouse.getId());
|
| 220 |
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 224... |
Line 223... |
| 224 |
catch(TTransportException e){
|
223 |
catch(TTransportException e){
|
| 225 |
inventoryClient = inventoryServiceClient.getClient();
|
224 |
inventoryClient = inventoryServiceClient.getClient();
|
| 226 |
nlc = inventoryClient.getNlcForWarehouse(warehouse.getId(),thriftItem.getId());
|
225 |
nlc = inventoryClient.getNlcForWarehouse(warehouse.getId(),thriftItem.getId());
|
| 227 |
}
|
226 |
}
|
| 228 |
maxnlc = catalogClient.getSnapdealItem(thriftItem.getId()).getMaxNlc();
|
227 |
maxnlc = catalogClient.getSnapdealItem(thriftItem.getId()).getMaxNlc();
|
| - |
|
228 |
|
| 229 |
//System.out.println("itemId:" + thriftItem.getId() + "\tmaxnlc: " + maxnlc + "\tnlc:" + nlc + "\twid:" + warehouse.getId() );
|
229 |
//System.out.println("itemId:" + thriftItem.getId() + "\tmaxnlc: " + maxnlc + "\tnlc:" + nlc + "\twid:" + warehouse.getId() );
|
| 230 |
if(nlc !=0 && (maxnlc >= nlc)){
|
230 |
if(nlc !=0 && (maxnlc >= nlc)){
|
| 231 |
total_warehouse_held = inventoryClient.getHoldInventoryDetailForItemForWarehouseIdExceptSource(thriftItem.getId(), warehouse.getId(), 0);
|
231 |
total_warehouse_held = inventoryClient.getHoldInventoryDetailForItemForWarehouseIdExceptSource(thriftItem.getId(), warehouse.getId(), 0);
|
| 232 |
heldForSource = heldForSource + total_warehouse_held - inventoryClient.getHoldInventoryDetailForItemForWarehouseIdExceptSource(thriftItem.getId(), warehouse.getId(), 7);
|
232 |
heldForSource = heldForSource + total_warehouse_held - inventoryClient.getHoldInventoryDetailForItemForWarehouseIdExceptSource(thriftItem.getId(), warehouse.getId(), 7);
|
| 233 |
available = available + itemavailability.get(warehouse.getId());
|
233 |
available = available + itemavailability.get(warehouse.getId());
|
| Line 245... |
Line 245... |
| 245 |
}
|
245 |
}
|
| 246 |
}
|
246 |
}
|
| 247 |
else{
|
247 |
else{
|
| 248 |
for (Map.Entry<Long,Long> entry : itemavailability.entrySet()) {
|
248 |
for (Map.Entry<Long,Long> entry : itemavailability.entrySet()) {
|
| 249 |
if(allWarehousesMap.get(entry.getKey()).getBillingWarehouseId()!=7){
|
249 |
if(allWarehousesMap.get(entry.getKey()).getBillingWarehouseId()!=7){
|
| 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 |
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){
|
| 251 |
|
251 |
|
| 252 |
}
|
252 |
}
|
| 253 |
else{
|
253 |
else{
|
| 254 |
continue;
|
254 |
continue;
|
| 255 |
}
|
255 |
}
|
| 256 |
*/
|
- |
|
| 257 |
continue;
|
- |
|
| 258 |
}
|
256 |
}
|
| 259 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
257 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
| 260 |
ignoredItem.setItemId(thriftItem.getId());
|
258 |
ignoredItem.setItemId(thriftItem.getId());
|
| 261 |
ignoredItem.setWarehouseId(entry.getKey());
|
259 |
ignoredItem.setWarehouseId(entry.getKey());
|
| 262 |
if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
|
260 |
if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
|
| Line 292... |
Line 290... |
| 292 |
itemreserve = iteminventory.getReserved();
|
290 |
itemreserve = iteminventory.getReserved();
|
| 293 |
if (thriftItem.isIsWarehousePreferenceSticky() && thriftItem.getPreferredVendor()!=0){
|
291 |
if (thriftItem.isIsWarehousePreferenceSticky() && thriftItem.getPreferredVendor()!=0){
|
| 294 |
//System.out.println("Item id "+thriftItem.getId()+".Found prefered vendor and warehouse is marked sticky (Calculating Reserve)"+thriftItem.getPreferredVendor());
|
292 |
//System.out.println("Item id "+thriftItem.getId()+".Found prefered vendor and warehouse is marked sticky (Calculating Reserve)"+thriftItem.getPreferredVendor());
|
| 295 |
for (Warehouse warehouse:vendor_warehouses){
|
293 |
for (Warehouse warehouse:vendor_warehouses){
|
| 296 |
if(warehouse.getBillingWarehouseId()!=7){
|
294 |
if(warehouse.getBillingWarehouseId()!=7){
|
| 297 |
/* if(warehouse.getLogisticsLocation().equals(WarehouseLocation.Delhi) && warehouse.getWarehouseType().equals(WarehouseType.THIRD_PARTY) && warehouse.getVendor().getId()!=1){
|
295 |
if(warehouse.getLogisticsLocation().equals(WarehouseLocation.Delhi) && warehouse.getWarehouseType().equals(WarehouseType.THIRD_PARTY) && warehouse.getVendor().getId()!=1){
|
| 298 |
|
296 |
|
| 299 |
}
|
297 |
}
|
| 300 |
else{
|
298 |
else{
|
| 301 |
continue;
|
299 |
continue;
|
| 302 |
}
|
300 |
}
|
| 303 |
*/ continue;
|
- |
|
| 304 |
}
|
301 |
}
|
| 305 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
302 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
| 306 |
ignoredItem.setItemId(thriftItem.getId());
|
303 |
ignoredItem.setItemId(thriftItem.getId());
|
| 307 |
ignoredItem.setWarehouseId(warehouse.getId());
|
304 |
ignoredItem.setWarehouseId(warehouse.getId());
|
| 308 |
if (itemreserve.get(warehouse.getId())!=null && !thirdpartywarehouseids.contains(warehouse.getId()) && !ignoreItems.contains(warehouse.getId())){
|
305 |
if (itemreserve.get(warehouse.getId())!=null && !thirdpartywarehouseids.contains(warehouse.getId()) && !ignoreItems.contains(warehouse.getId())){
|
| Line 321... |
Line 318... |
| 321 |
}
|
318 |
}
|
| 322 |
}
|
319 |
}
|
| 323 |
}else{
|
320 |
}else{
|
| 324 |
for (Map.Entry<Long,Long> entry : itemreserve.entrySet()) {
|
321 |
for (Map.Entry<Long,Long> entry : itemreserve.entrySet()) {
|
| 325 |
if(allWarehousesMap.get(entry.getKey()).getBillingWarehouseId()!=7){
|
322 |
if(allWarehousesMap.get(entry.getKey()).getBillingWarehouseId()!=7){
|
| 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 |
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){
|
| 327 |
|
324 |
|
| 328 |
}
|
325 |
}
|
| 329 |
else{
|
326 |
else{
|
| 330 |
continue;
|
327 |
continue;
|
| 331 |
}
|
328 |
}
|
| 332 |
*/ continue;
|
- |
|
| 333 |
}
|
329 |
}
|
| 334 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
330 |
in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
|
| 335 |
ignoredItem.setItemId(thriftItem.getId());
|
331 |
ignoredItem.setItemId(thriftItem.getId());
|
| 336 |
ignoredItem.setWarehouseId(entry.getKey());
|
332 |
ignoredItem.setWarehouseId(entry.getKey());
|
| 337 |
if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
|
333 |
if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
|