Subversion Repositories SmartDukaan

Rev

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

Rev 6098 Rev 6241
Line 480... Line 480...
480
        tItem.setProductGroup(item.getProductGroup());
480
        tItem.setProductGroup(item.getProductGroup());
481
        tItem.setBrand(item.getBrand());
481
        tItem.setBrand(item.getBrand());
482
        tItem.setModelName(item.getModelName());
482
        tItem.setModelName(item.getModelName());
483
        tItem.setModelNumber(item.getModelNumber());
483
        tItem.setModelNumber(item.getModelNumber());
484
        tItem.setColor(item.getColor());
484
        tItem.setColor(item.getColor());
485
 
-
 
-
 
485
        tItem.setShowSellingPrice(item.isShowSellingPrice());
486
        tItem.setStatus_description(item.getItemStatusDesc());
486
        tItem.setStatus_description(item.getItemStatusDesc());
487
        tItem.setComments(item.getComments());
487
        tItem.setComments(item.getComments());
488
 
488
 
489
        if(item.getMrp() != null) {
489
        if(item.getMrp() != null) {
490
            tItem.setMrp(item.getMrp());
490
            tItem.setMrp(item.getMrp());
Line 948... Line 948...
948
                thriftItem.isSetExpectedDelay() ? thriftItem.getExpectedDelay() : null,
948
                thriftItem.isSetExpectedDelay() ? thriftItem.getExpectedDelay() : null,
949
                thriftItem.isIsWarehousePreferenceSticky(),
949
                thriftItem.isIsWarehousePreferenceSticky(),
950
                thriftItem.isHasItemNo(),
950
                thriftItem.isHasItemNo(),
951
                ItemType.SERIALIZED.equals(thriftItem.getType()),
951
                ItemType.SERIALIZED.equals(thriftItem.getType()),
952
                thriftItem.isClearance(),
952
                thriftItem.isClearance(),
-
 
953
                thriftItem.isSetShowSellingPrice() ? thriftItem.isShowSellingPrice() : false,
953
                thriftItem.isSetPreferredVendor() ? thriftItem.getPreferredVendor() : null,
954
                thriftItem.isSetPreferredVendor() ? thriftItem.getPreferredVendor() : null,
954
                itemInventoryMap,
955
                itemInventoryMap,
955
                vendorPricingMap,
956
                vendorPricingMap,
956
                vItemMap,
957
                vItemMap,
957
                sourcePricingMap,
958
                sourcePricingMap,
Line 1201... Line 1202...
1201
                    ConfigClientKeys.catalog_service_server_host_prod.toString(),
1202
                    ConfigClientKeys.catalog_service_server_host_prod.toString(),
1202
                    ConfigClientKeys.catalog_service_server_port.toString());
1203
                    ConfigClientKeys.catalog_service_server_port.toString());
1203
            
1204
            
1204
            Client catalogClient_Prod = catalogServiceClient_Prod.getClient();
1205
            Client catalogClient_Prod = catalogServiceClient_Prod.getClient();
1205
 
1206
 
1206
            InventoryClient inventoryServiceClient= new InventoryClient();
-
 
1207
            
-
 
1208
            InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-
 
1209
 
1207
 
1210
            in.shop2020.model.v1.catalog.Item tItem = catalogClient_Prod.getItem(item.getId());
1208
            in.shop2020.model.v1.catalog.Item tItem = catalogClient_Prod.getItem(item.getId());
1211
            if(item.getExpectedDelay() != null) {
1209
            if(item.getExpectedDelay() != null) {
1212
            	tItem.setExpectedDelay(item.getExpectedDelay());
1210
            	tItem.setExpectedDelay(item.getExpectedDelay());
1213
            
1211
            
1214
	            long rItemId;
1212
	            long rItemId;
1215
	            if((rItemId = catalogClient_Prod.updateItem(tItem)) != item.getId()) {
1213
	            if((rItemId = catalogClient_Prod.updateItem(tItem)) != item.getId()) {
1216
	                logger.error("Error updating item on production, returned Item Id: " + rItemId);
1214
	                logger.error("Error updating item on production, returned Item Id: " + rItemId);
1217
	                return "Error updating expected delay on production";
1215
	                return "Error updating expected delay on production";
1218
	            }
1216
	            }
-
 
1217
	            InventoryClient inventoryServiceClient= new InventoryClient();
-
 
1218
	            InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
1219
	            inventoryClient.clearItemAvailabilityCacheForItem(rItemId);
1219
	            inventoryClient.clearItemAvailabilityCacheForItem(rItemId);
1220
	            logger.info("Successfully updated item: " + item.getId());
1220
	            logger.info("Successfully updated item: " + item.getId());
1221
	            return "Expected delay successfully updated on prod"; 
1221
	            return "Expected delay successfully updated on prod"; 
1222
            } else {
1222
            } else {
1223
            	return "Error:expected delay should not be null";
1223
            	return "Error:expected delay should not be null";