updated

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95631 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/StockUpdate.java

@@ -987,7 +987,7 @@ public class StockUpdate
     					+"and site_code = '"+this.siteCode +"'"
     					+"and loc_code = '"+this.locationCode +"'"
     					+"and lot_no = '"+this.lotNo+"'"
-    					+"and lot_sl = '"+this.lotSl+"' and no_art<=0 and quantity > 0 ";
+    					+"and lot_sl = '"+this.lotSl+"' and no_art<=0 and quantity > 0 ";    // change by ritesh on 15/07/14
     				System.out.println("sql---"+sql);
     				pstmt=conn.prepareStatement(sql);
     				rs=pstmt.executeQuery();
@@ -1007,7 +1007,7 @@ public class StockUpdate
     					+"and site_code = '"+this.siteCode +"'"
     					+"and loc_code = '"+this.locationCode +"'"
     					+"and lot_no = '"+this.lotNo+"'"
-    					+"and lot_sl = '"+this.lotSl+"' and no_art=0";
+    					+"and lot_sl = '"+this.lotSl+"' and no_art <= 0";   
     					System.out.println("sql---"+sql);
     					pstmt=conn.prepareStatement(sql);
     					pstmt.executeUpdate();
@@ -1751,7 +1751,20 @@ public class StockUpdate
     		if(updateStockMap.get("no_art")!=null)
     		{
     			this.noArt = Double.parseDouble(updateStockMap.get("no_art").toString());
+    			double partialArt= noArt;   // ADDED BY RITESH ON 15/07/14 START
+				if(partialArt  == 0)
+				{
+					partialArt = 1;
+				}else
+				{
+					partialArt = 0;
 				}
+				if( "XFRX".equalsIgnoreCase(itemSer))
+				{
+					noArt = noArt + partialArt;
+				}	
+				System.out.println("partialArt ::["+partialArt+"] noArt::["+noArt+"]");
+    		}						 // ADDED BY RITESH ON 15/07/14 END
     		if(updateStockMap.get("last_phyc_date")!=null)
     		{
     			this.lastPhycDate = (Timestamp)updateStockMap.get("last_phyc_date");
@@ -1802,6 +1815,7 @@ public class StockUpdate
 			}
     		
 			
+
         }catch(Exception e){
             System.out.println("Exception "+e);
             e.printStackTrace();

webitm-dis/ibase/webitm/ejb/dis/adv/StockTransferConf.java

@@ -551,17 +551,18 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 					}
 					int calcnoArt=(int) (quantity/qtyPerArt);
 					// ADDED BY RITESH ON 08/07/14 START
-					int partialArt=(int) (quantity/qtyPerArt);
-					if(partialArt  == 0)
-					{
-						partialArt = 1;
-					}else
-					{
-						partialArt = 0;
-					}
+//					int partialArt=(int) (quantity/qtyPerArt);
+//					if(partialArt  == 0)
+//					{
+//						partialArt = 1;
+//					}else
+//					{
+//						partialArt = 0;
+//					}
 					System.out.println("quantity["+quantity+"]--qtyPerArt["+qtyPerArt+"]--calcnoArt["+calcnoArt+"]--partnoArt["+partnoArt+"]");
-					System.out.println("partialArt -- "+partialArt);
-					updateRowMap.put("no_art", calcnoArt + partialArt);
+//					System.out.println("partialArt -- "+partialArt);
+//					updateRowMap.put("no_art", calcnoArt + partialArt);
+					updateRowMap.put("no_art", calcnoArt);
 					// ADDED BY RITESH ON 08/07/14 END
 
 					/* Added by Ashish Sonawane on 07-sep-12 as per Manoharan Sir in case of partial GRL no_art to be set as 0 for issue [END] */