Subversion Repositories SmartDukaan

Rev

Rev 27770 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 27770 Rev 29667
Line 16... Line 16...
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;
 20 
	private int ourStockQty;
- 
 
 21 
	private int obsRecommendedQty;
- 
 
 22 
 
- 
 
 23 
	private int obsMinimumQty;
- 
 
 24 
 
- 
 
 25 
	public int getObsRecommendedQty() {
- 
 
 26 
		return obsRecommendedQty;
- 
 
 27 
	}
- 
 
 28 
 
- 
 
 29 
	public void setObsRecommendedQty(int obsRecommendedQty) {
- 
 
 30 
		this.obsRecommendedQty = obsRecommendedQty;
- 
 
 31 
	}
- 
 
 32 
 
- 
 
 33 
	public int getObsMinimumQty() {
- 
 
 34 
		return obsMinimumQty;
- 
 
 35 
	}
- 
 
 36 
 
- 
 
 37 
	public void setObsMinimumQty(int obsMinimumQty) {
- 
 
 38 
		this.obsMinimumQty = obsMinimumQty;
- 
 
 39 
	}
21 
 
 40 
 
22 
	public int getOurStockQty() {
 41 
	public int getOurStockQty() {
23 
		return ourStockQty;
 42 
		return ourStockQty;
24 
	}
 43 
	}
25 
 
 44 
 
Line 132... Line 151...
132 
				+ ", toBeOrdered=" + toBeOrdered + ", allocatedQuantity=" + allocatedQuantity + ", catalogId="
 151 
				+ ", toBeOrdered=" + toBeOrdered + ", allocatedQuantity=" + allocatedQuantity + ", catalogId="
133 
				+ catalogId + ", itemDescription=" + itemDescription + ", recommendedQty=" + recommendedQty
 152 
				+ catalogId + ", itemDescription=" + itemDescription + ", recommendedQty=" + recommendedQty
134 
				+ ", minimumQty=" + minimumQty + ", dp=" + dp + ", mop=" + mop + ", last15DaysSale=" + last15DaysSale
 153 
				+ ", minimumQty=" + minimumQty + ", dp=" + dp + ", mop=" + mop + ", last15DaysSale=" + last15DaysSale
135 
				+ ", lastMonthSaleMap=" + lastMonthSaleMap + ", brand=" + brand + ", modelName=" + modelName
 154 
				+ ", lastMonthSaleMap=" + lastMonthSaleMap + ", brand=" + brand + ", modelName=" + modelName
136 
				+ ", modelNumber=" + modelNumber + ", remaining=" + remaining + ", ourStockQty=" + ourStockQty
 155 
				+ ", modelNumber=" + modelNumber + ", remaining=" + remaining + ", ourStockQty=" + ourStockQty
- 
 
 156 
				+ ", obsRecommendedQty=" + obsRecommendedQty + ", obsMinimumQty=" + obsMinimumQty + ", fofoId=" + fofoId
137 
				+ ", fofoId=" + fofoId + ", last30DaysSale=" + last30DaysSale + ", categoryId=" + categoryId + "]";
 157 
				+ ", last30DaysSale=" + last30DaysSale + ", categoryId=" + categoryId + "]";
138 
	}
 158 
	}
139 
 
 159 
 
140 
	public int getStockInHand() {
 160 
	public int getStockInHand() {
141 
		return stockInHand;
 161 
		return stockInHand;
142 
	}
 162 
	}
Line 218... Line 238...
218 
		result = prime * result + ((lastMonthSaleMap == null) ? 0 : lastMonthSaleMap.hashCode());
 238 
		result = prime * result + ((lastMonthSaleMap == null) ? 0 : lastMonthSaleMap.hashCode());
219 
		result = prime * result + minimumQty;
 239 
		result = prime * result + minimumQty;
220 
		result = prime * result + ((modelName == null) ? 0 : modelName.hashCode());
 240 
		result = prime * result + ((modelName == null) ? 0 : modelName.hashCode());
221 
		result = prime * result + ((modelNumber == null) ? 0 : modelNumber.hashCode());
 241 
		result = prime * result + ((modelNumber == null) ? 0 : modelNumber.hashCode());
222 
		result = prime * result + Float.floatToIntBits(mop);
 242 
		result = prime * result + Float.floatToIntBits(mop);
- 
 
 243 
		result = prime * result + obsMinimumQty;
- 
 
 244 
		result = prime * result + obsRecommendedQty;
223 
		result = prime * result + ourStockQty;
 245 
		result = prime * result + ourStockQty;
224 
		result = prime * result + recommendedQty;
 246 
		result = prime * result + recommendedQty;
225 
		result = prime * result + remaining;
 247 
		result = prime * result + remaining;
226 
		result = prime * result + stockInHand;
 248 
		result = prime * result + stockInHand;
227 
		result = prime * result + toBeOrdered;
 249 
		result = prime * result + toBeOrdered;
Line 283... Line 305...
283 
				return false;
 305 
				return false;
284 
		} else if (!modelNumber.equals(other.modelNumber))
 306 
		} else if (!modelNumber.equals(other.modelNumber))
285 
			return false;
 307 
			return false;
286 
		if (Float.floatToIntBits(mop) != Float.floatToIntBits(other.mop))
 308 
		if (Float.floatToIntBits(mop) != Float.floatToIntBits(other.mop))
287 
			return false;
 309 
			return false;
- 
 
 310 
		if (obsMinimumQty != other.obsMinimumQty)
- 
 
 311 
			return false;
- 
 
 312 
		if (obsRecommendedQty != other.obsRecommendedQty)
- 
 
 313 
			return false;
288 
		if (ourStockQty != other.ourStockQty)
 314 
		if (ourStockQty != other.ourStockQty)
289 
			return false;
 315 
			return false;
290 
		if (recommendedQty != other.recommendedQty)
 316 
		if (recommendedQty != other.recommendedQty)
291 
			return false;
 317 
			return false;
292 
		if (remaining != other.remaining)
 318 
		if (remaining != other.remaining)