Subversion Repositories SmartDukaan

Rev

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

Rev 26176 Rev 27770
Line 15... Line 15...
15 
	private Integer lastMonthSaleMap;
 15 
	private Integer lastMonthSaleMap;
16 
	private String brand;
 16 
	private String brand;
17 
	private String modelName;
 17 
	private String modelName;
18 
	private String modelNumber;
 18 
	private String modelNumber;
19 
	private int remaining;
 19 
	private int remaining;
- 
 
 20 
	private int ourStockQty;
- 
 
 21 
 
- 
 
 22 
	public int getOurStockQty() {
- 
 
 23 
		return ourStockQty;
- 
 
 24 
	}
- 
 
 25 
 
- 
 
 26 
	public void setOurStockQty(int ourStockQty) {
- 
 
 27 
		this.ourStockQty = ourStockQty;
- 
 
 28 
	}
20 
 
 29 
 
21 
	public int getRemaining() {
 30 
	public int getRemaining() {
22 
		return remaining;
 31 
		return remaining;
23 
	}
 32 
	}
24 
 
 33 
 
Line 119... Line 128...
119 
 
 128 
 
120 
	@Override
 129 
	@Override
121 
	public String toString() {
 130 
	public String toString() {
122 
		return "CatalogListingModel [stockInHand=" + stockInHand + ", inTransitQuantity=" + inTransitQuantity
 131 
		return "CatalogListingModel [stockInHand=" + stockInHand + ", inTransitQuantity=" + inTransitQuantity
123 
				+ ", toBeOrdered=" + toBeOrdered + ", allocatedQuantity=" + allocatedQuantity + ", catalogId="
 132 
				+ ", toBeOrdered=" + toBeOrdered + ", allocatedQuantity=" + allocatedQuantity + ", catalogId="
124 
				+ catalogId + ", itemDescription=" + itemDescription + ", dp=" + dp + ", mop=" + mop + ", brand="
 133 
				+ catalogId + ", itemDescription=" + itemDescription + ", recommendedQty=" + recommendedQty
- 
 
 134 
				+ ", minimumQty=" + minimumQty + ", dp=" + dp + ", mop=" + mop + ", last15DaysSale=" + last15DaysSale
- 
 
 135 
				+ ", lastMonthSaleMap=" + lastMonthSaleMap + ", brand=" + brand + ", modelName=" + modelName
125 
				+ brand + ", modelName=" + modelName + ", modelNumber=" + modelNumber + ", fofoId=" + fofoId
 136 
				+ ", modelNumber=" + modelNumber + ", remaining=" + remaining + ", ourStockQty=" + ourStockQty
126 
				+ ", last30DaysSale=" + last30DaysSale + ", categoryId=" + categoryId + "]";
 137 
				+ ", fofoId=" + fofoId + ", last30DaysSale=" + last30DaysSale + ", categoryId=" + categoryId + "]";
127 
	}
 138 
	}
128 
 
 139 
 
129 
	public int getStockInHand() {
 140 
	public int getStockInHand() {
130 
		return stockInHand;
 141 
		return stockInHand;
131 
	}
 142 
	}
Line 200... Line 211...
200 
		result = prime * result + categoryId;
 211 
		result = prime * result + categoryId;
201 
		result = prime * result + Float.floatToIntBits(dp);
 212 
		result = prime * result + Float.floatToIntBits(dp);
202 
		result = prime * result + fofoId;
 213 
		result = prime * result + fofoId;
203 
		result = prime * result + inTransitQuantity;
 214 
		result = prime * result + inTransitQuantity;
204 
		result = prime * result + ((itemDescription == null) ? 0 : itemDescription.hashCode());
 215 
		result = prime * result + ((itemDescription == null) ? 0 : itemDescription.hashCode());
205 
		result = prime * result + last15DaysSale;
 216 
		result = prime * result + ((last15DaysSale == null) ? 0 : last15DaysSale.hashCode());
206 
		result = prime * result + last30DaysSale;
 217 
		result = prime * result + last30DaysSale;
- 
 
 218 
		result = prime * result + ((lastMonthSaleMap == null) ? 0 : lastMonthSaleMap.hashCode());
207 
		result = prime * result + minimumQty;
 219 
		result = prime * result + minimumQty;
208 
		result = prime * result + ((modelName == null) ? 0 : modelName.hashCode());
 220 
		result = prime * result + ((modelName == null) ? 0 : modelName.hashCode());
209 
		result = prime * result + ((modelNumber == null) ? 0 : modelNumber.hashCode());
 221 
		result = prime * result + ((modelNumber == null) ? 0 : modelNumber.hashCode());
210 
		result = prime * result + Float.floatToIntBits(mop);
 222 
		result = prime * result + Float.floatToIntBits(mop);
- 
 
 223 
		result = prime * result + ourStockQty;
211 
		result = prime * result + recommendedQty;
 224 
		result = prime * result + recommendedQty;
- 
 
 225 
		result = prime * result + remaining;
212 
		result = prime * result + stockInHand;
 226 
		result = prime * result + stockInHand;
213 
		result = prime * result + toBeOrdered;
 227 
		result = prime * result + toBeOrdered;
214 
		return result;
 228 
		return result;
215 
	}
 229 
	}
216 
 
 230 
 
Line 243... Line 257...
243 
		if (itemDescription == null) {
 257 
		if (itemDescription == null) {
244 
			if (other.itemDescription != null)
 258 
			if (other.itemDescription != null)
245 
				return false;
 259 
				return false;
246 
		} else if (!itemDescription.equals(other.itemDescription))
 260 
		} else if (!itemDescription.equals(other.itemDescription))
247 
			return false;
 261 
			return false;
- 
 
 262 
		if (last15DaysSale == null) {
- 
 
 263 
			if (other.last15DaysSale != null)
- 
 
 264 
				return false;
248 
		if (last15DaysSale != other.last15DaysSale)
 265 
		} else if (!last15DaysSale.equals(other.last15DaysSale))
249 
			return false;
 266 
			return false;
250 
		if (last30DaysSale != other.last30DaysSale)
 267 
		if (last30DaysSale != other.last30DaysSale)
251 
			return false;
 268 
			return false;
- 
 
 269 
		if (lastMonthSaleMap == null) {
- 
 
 270 
			if (other.lastMonthSaleMap != null)
- 
 
 271 
				return false;
- 
 
 272 
		} else if (!lastMonthSaleMap.equals(other.lastMonthSaleMap))
- 
 
 273 
			return false;
252 
		if (minimumQty != other.minimumQty)
 274 
		if (minimumQty != other.minimumQty)
253 
			return false;
 275 
			return false;
254 
		if (modelName == null) {
 276 
		if (modelName == null) {
255 
			if (other.modelName != null)
 277 
			if (other.modelName != null)
256 
				return false;
 278 
				return false;
Line 261... Line 283...
261 
				return false;
 283 
				return false;
262 
		} else if (!modelNumber.equals(other.modelNumber))
 284 
		} else if (!modelNumber.equals(other.modelNumber))
263 
			return false;
 285 
			return false;
264 
		if (Float.floatToIntBits(mop) != Float.floatToIntBits(other.mop))
 286 
		if (Float.floatToIntBits(mop) != Float.floatToIntBits(other.mop))
265 
			return false;
 287 
			return false;
- 
 
 288 
		if (ourStockQty != other.ourStockQty)
- 
 
 289 
			return false;
266 
		if (recommendedQty != other.recommendedQty)
 290 
		if (recommendedQty != other.recommendedQty)
267 
			return false;
 291 
			return false;
- 
 
 292 
		if (remaining != other.remaining)
- 
 
 293 
			return false;
268 
		if (stockInHand != other.stockInHand)
 294 
		if (stockInHand != other.stockInHand)
269 
			return false;
 295 
			return false;
270 
		if (toBeOrdered != other.toBeOrdered)
 296 
		if (toBeOrdered != other.toBeOrdered)
271 
			return false;
 297 
			return false;
272 
		return true;
 298 
		return true;