Subversion Repositories SmartDukaan

Rev

Rev 9508 | Rev 9510 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 9508 Rev 9509
Line 223... Line 223...
223 
							}
 223 
							}
224 
							in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
 224 
							in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems ignoredItem = new in.shop2020.model.v1.inventory.IgnoredInventoryUpdateItems();
225 
							ignoredItem.setItemId(thriftItem.getId());
 225 
							ignoredItem.setItemId(thriftItem.getId());
226 
							ignoredItem.setWarehouseId(entry.getKey());
 226 
							ignoredItem.setWarehouseId(entry.getKey());
227 
							if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
 227 
							if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
- 
 
 228 
 
228 
								nlc = inventoryClient.getNlcForWarehouse(entry.getKey(),thriftItem.getId());
 229 
								nlc = inventoryClient.getNlcForWarehouse(entry.getKey(),thriftItem.getId());
229 
								try{
 230 
								try{
230 
									maxnlc = catalogClient.getSnapdealItem(thriftItem.getId()).getMaxNlc();
 231 
									maxnlc = catalogClient.getSnapdealItem(thriftItem.getId()).getMaxNlc();
231 
								}
 232 
								}
232 
								catch(TTransportException e){
 233 
								catch(TTransportException e){
233 
									catalogClient = catalogServiceClient.getClient();
234 
									catalogClient = catalogServiceClient.getClient();
234 
									maxnlc = catalogClient.getSnapdealItem(thriftItem.getId()).getMaxNlc();
 235 
									maxnlc = catalogClient.getSnapdealItem(thriftItem.getId()).getMaxNlc();
235 
								}
 236 
								}
- 
 
 237 
								System.out.println("itemId:" + thriftItem.getId() + "\tmaxnlc: " + maxnlc + "\tnlc:" + nlc + "\twid:" + entry.getKey() );
236 
								if(nlc !=0 && (maxnlc >= nlc)){
 238 
								if(nlc !=0 && (maxnlc >= nlc)){
237 
									total_held = inventoryClient.getHoldInventoryDetailForItemForWarehouseIdExceptSource(thriftItem.getId(), entry.getKey(), 0);
 239 
									total_held = inventoryClient.getHoldInventoryDetailForItemForWarehouseIdExceptSource(thriftItem.getId(), entry.getKey(), 0);
238 
									heldForSource = heldForSource + total_held - inventoryClient.getHoldInventoryDetailForItemForWarehouseIdExceptSource(thriftItem.getId(), entry.getKey(), 7);
 240 
									heldForSource = heldForSource + total_held - inventoryClient.getHoldInventoryDetailForItemForWarehouseIdExceptSource(thriftItem.getId(), entry.getKey(), 7);
239 
									available =  available + entry.getValue() - total_held;
 241 
									available =  available + entry.getValue() - total_held;
- 
 
 242 
									System.out.println("itemId:" + thriftItem.getId() + "\ttotal_held: " + total_held + "\theldForSource:" + heldForSource + "\tavailable:" + available);
240 
								}
 243 
								}
241 
								else if(maxnlc==0){
 244 
								else if(maxnlc==0){
242 
									total_held = inventoryClient.getHoldInventoryDetailForItemForWarehouseIdExceptSource(thriftItem.getId(), entry.getKey(), 0);
 245 
									total_held = inventoryClient.getHoldInventoryDetailForItemForWarehouseIdExceptSource(thriftItem.getId(), entry.getKey(), 0);
243 
									heldForSource = heldForSource + total_held - inventoryClient.getHoldInventoryDetailForItemForWarehouseIdExceptSource(thriftItem.getId(), entry.getKey(), 7);
 246 
									heldForSource = heldForSource + total_held - inventoryClient.getHoldInventoryDetailForItemForWarehouseIdExceptSource(thriftItem.getId(), entry.getKey(), 7);
244 
									available = available + itemavailability.get(entry.getKey()) - total_held;
 247 
									available = available + itemavailability.get(entry.getKey()) - total_held;
- 
 
 248 
									System.out.println("itemId:" + thriftItem.getId() + "\ttotal_held: " + total_held + "\theldForSource:" + heldForSource + "\tavailable:" + available);
245 
								}
 249 
								}
246 
 
 250 
 
247 
							}
 251 
							}
248 
						}
 252 
						}
249 
					}
 253 
					}
Line 259... Line 263...
259 
							ignoredItem.setItemId(thriftItem.getId());
 263 
							ignoredItem.setItemId(thriftItem.getId());
260 
							ignoredItem.setWarehouseId(warehouse.getId());
 264 
							ignoredItem.setWarehouseId(warehouse.getId());
261 
							if (itemreserve.get(warehouse.getId())!=null && !thirdpartywarehouseids.contains(warehouse.getId()) && !ignoreItems.contains(warehouse.getId())){
 265 
							if (itemreserve.get(warehouse.getId())!=null && !thirdpartywarehouseids.contains(warehouse.getId()) && !ignoreItems.contains(warehouse.getId())){
262 
								nlc = inventoryClient.getNlcForWarehouse(warehouse.getId(),thriftItem.getId());
 266 
								nlc = inventoryClient.getNlcForWarehouse(warehouse.getId(),thriftItem.getId());
263 
								maxnlc = catalogClient.getSnapdealItem(thriftItem.getId()).getMaxNlc();
 267 
								maxnlc = catalogClient.getSnapdealItem(thriftItem.getId()).getMaxNlc();
- 
 
 268 
								System.out.println("itemId:" + thriftItem.getId() + "\tmaxnlc: " + maxnlc + "\tnlc:" + nlc + "\twid:" + warehouse.getId() );
264 
								if(nlc !=0 && (maxnlc >= nlc)){
 269 
								if(nlc !=0 && (maxnlc >= nlc)){
265 
									reserve = reserve + itemreserve.get(warehouse.getId());
 270 
									reserve = reserve + itemreserve.get(warehouse.getId());
266 
									System.out.println("itemId:" + thriftItem.getId() + "\ttotal_held: " + total_held + "\theldForSource:" + heldForSource + "\treserve:" + reserve);
 271 
									System.out.println("itemId:" + thriftItem.getId() + "\ttotal_held: " + total_held + "\theldForSource:" + heldForSource + "\treserve:" + reserve);
267 
								}
 272 
								}
268 
								else if(maxnlc==0){
 273 
								else if(maxnlc==0){
Line 281... Line 286...
281 
							ignoredItem.setItemId(thriftItem.getId());
 286 
							ignoredItem.setItemId(thriftItem.getId());
282 
							ignoredItem.setWarehouseId(entry.getKey());
 287 
							ignoredItem.setWarehouseId(entry.getKey());
283 
							if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
 288 
							if(!thirdpartywarehouseids.contains(entry.getKey()) && !ignoreItems.contains(ignoredItem)){
284 
								nlc = inventoryClient.getNlcForWarehouse(entry.getKey(),thriftItem.getId());
 289 
								nlc = inventoryClient.getNlcForWarehouse(entry.getKey(),thriftItem.getId());
285 
								maxnlc = catalogClient.getSnapdealItem(thriftItem.getId()).getMaxNlc();
 290 
								maxnlc = catalogClient.getSnapdealItem(thriftItem.getId()).getMaxNlc();
- 
 
 291 
								System.out.println("itemId:" + thriftItem.getId() + "\tmaxnlc: " + maxnlc + "\tnlc:" + nlc + "\twid:" + entry.getKey() );
286 
								if(nlc !=0 && (maxnlc >= nlc)){
 292 
								if(nlc !=0 && (maxnlc >= nlc)){
287 
									reserve =  reserve + entry.getValue();
 293 
									reserve =  reserve + entry.getValue();
288 
									System.out.println("itemId:" + thriftItem.getId() + "\ttotal_held: " + total_held + "\theldForSource:" + heldForSource + "\treserve:" + reserve);
 294 
									System.out.println("itemId:" + thriftItem.getId() + "\ttotal_held: " + total_held + "\theldForSource:" + heldForSource + "\treserve:" + reserve);
289 
								}
 295 
								}
290 
								else if(maxnlc==0){
 296 
								else if(maxnlc==0){