Subversion Repositories SmartDukaan

Rev

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

Rev 27670 Rev 27676
Line 865... Line 865...
865 
							.selectUnbilledActivateStockGroupByBrand();
 865 
							.selectUnbilledActivateStockGroupByBrand();
866 
					for (BrandWiseUnbilledActivateStockModel un : unbilledActivatedStock) {
 866 
					for (BrandWiseUnbilledActivateStockModel un : unbilledActivatedStock) {
867 
						BrandWisePartnerSaleModel bpt = partnersBrandSaleMap.get(un.getBrand());
 867 
						BrandWisePartnerSaleModel bpt = partnersBrandSaleMap.get(un.getBrand());
868 
						if (bpt != null) {
 868 
						if (bpt != null) {
869 
							bpt.setAmtd(un.getUnbilledMtd());
 869 
							bpt.setAmtd(un.getUnbilledMtd());
- 
 
 870 
							bpt.setUamtdQty(un.getUnbilledMTDQty());
870 
						} else {
 871 
						} else {
871 
							bpt = new BrandWisePartnerSaleModel();
 872 
							bpt = new BrandWisePartnerSaleModel();
872 
							bpt.setBrand(un.getBrand());
 873 
							bpt.setBrand(un.getBrand());
873 
							bpt.setAmtd(un.getUnbilledMtd());
 874 
							bpt.setAmtd(un.getUnbilledMtd());
874 
							bpt.setLms(0);
 875 
							bpt.setLms(0);
Line 1230... Line 1231...
1230 
 
 1231 
 
1231 
		for (WarehouseWiseBrandUnbilledActivatedModel un : unbilledStock) {
 1232 
		for (WarehouseWiseBrandUnbilledActivatedModel un : unbilledStock) {
1232 
			WarehouseWiseBrandSaleModel bpt = warehouseWiseBrandPartnerSales.get(un.getWarehouseId());
 1233 
			WarehouseWiseBrandSaleModel bpt = warehouseWiseBrandPartnerSales.get(un.getWarehouseId());
1233 
			if (bpt != null) {
 1234 
			if (bpt != null) {
1234 
				bpt.setAmtd(un.getUnbilledMtd());
 1235 
				bpt.setAmtd(un.getUnbilledMtd());
- 
 
 1236 
				bpt.setUamtdQty(un.getUnbilledQty());
1235 
			} else {
 1237 
			} else {
1236 
				bpt = new WarehouseWiseBrandSaleModel();
 1238 
				bpt = new WarehouseWiseBrandSaleModel();
1237 
				bpt.setWarehouseId(un.getWarehouseId());
 1239 
				bpt.setWarehouseId(un.getWarehouseId());
1238 
				bpt.setAmtd(un.getUnbilledMtd());
 1240 
				bpt.setAmtd(un.getUnbilledMtd());
1239 
				bpt.setLms(0);
 1241 
				bpt.setLms(0);
Line 1284... Line 1286...
1284 
 
 1286 
 
1285 
		for (WarehouseBrandItemUnbilledActivatedModel un : unbilledItems) {
 1287 
		for (WarehouseBrandItemUnbilledActivatedModel un : unbilledItems) {
1286 
			WarehouseBrandWiseItemSaleModel bpt = branditemSalesMap.get(un.getItemId());
 1288 
			WarehouseBrandWiseItemSaleModel bpt = branditemSalesMap.get(un.getItemId());
1287 
			if (bpt != null) {
 1289 
			if (bpt != null) {
1288 
				bpt.setAmtd(un.getAmtd());
 1290 
				bpt.setAmtd(un.getAmtd());
- 
 
 1291 
				bpt.setUamtdQty(un.getUnmtdQty());
1289 
			} else {
 1292 
			} else {
1290 
				bpt = new WarehouseBrandWiseItemSaleModel();
 1293 
				bpt = new WarehouseBrandWiseItemSaleModel();
1291 
				bpt.setWarehouseId(un.getWarehouseId());
 1294 
				bpt.setWarehouseId(un.getWarehouseId());
1292 
				bpt.setItemId(un.getItemId());
 1295 
				bpt.setItemId(un.getItemId());
1293 
				bpt.setAmtd(un.getAmtd());
 1296 
				bpt.setAmtd(un.getAmtd());