removing error from sql

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

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

@@ -1148,8 +1148,8 @@ public class StockUpdate
 					}
     	
 					//
-					 sql="select count(1) from stock where  item_code= ? ,site_code = ? ,loc_code= ?  ,lot_no = ? ,lot_sl = ? ";
-    					System.out.println("Query :::- ["+sql+"]");
+					 sql="select count(1) from stock where  item_code= ? and site_code = ? and loc_code= ?  and lot_no = ? and  lot_sl = ? ";
+    					
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,this.itemCode);
 					pstmt.setString(2,this.siteCode);
@@ -2706,7 +2706,65 @@ public class StockUpdate
     		
 			if( "2".equalsIgnoreCase(stkOpt))
 			{	
+				System.out.println("updateStockMap.get(tran_ser)::::::::["+updateStockMap.get("tran_ser")+"]");
+				if( "STKAMD".equalsIgnoreCase(updateStockMap.get("tran_ser").toString() ))
+				{
+				
+					sql = " update item_lot_info set " +
+                		  " mfg_date = ?,exp_date = ? , site_code__mfg = ?, retest_date = ? , potency_perc = ?, " +
+                		  " supp_code__mfg = ?  where item_code = ? and lot_no = ? ";
+
+					pstmt=conn.prepareStatement(sql);
+                	
+					String mfgDate2 = updateStockMap.get("mfg_date")==null?null:updateStockMap.get("mfg_date").toString();
+                	if( mfgDate2 != null )
+                	{
+                		SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
+                        mfgDate3 = simpleDateFormat1.parse(mfgDate2);
+                    }
+                	pstmt.setDate(1,mfgDate3 ==null?null:new java.sql.Date(mfgDate3.getTime()));
+            		System.out.println("@@@@ mfgDate3---::"+mfgDate3);
+                	
+            		String expDate2 = updateStockMap.get("exp_date")==null?null:updateStockMap.get("exp_date").toString();
+                	if( expDate2 != null )
+                	{
+                		SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
+                        expDate3 = simpleDateFormat1.parse(expDate2);
+                    }
+                	pstmt.setDate(2,expDate3 ==null?null:new java.sql.Date(expDate3.getTime()));
+            		System.out.println("@@@@ expDate3------::"+expDate3);
+            	          		
+            		pstmt.setString(3,updateStockMap.get("site_code__mfg")==null?null:updateStockMap.get("site_code__mfg").toString());
+            		
+                	String retestDate2 = updateStockMap.get("retest_date")==null?null:updateStockMap.get("retest_date").toString();
+                	if( retestDate2 != null )
+                	{
+                		SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
+                        retestDate3 = simpleDateFormat1.parse(retestDate2);
+                    }
+                	pstmt.setDate(4,retestDate3 ==null?null:new java.sql.Date(retestDate3.getTime()));
+            		System.out.println("@@@@ retestDate3::"+retestDate3);
+                	
+            		pstmt.setString(5,updateStockMap.get("potency_perc")==null?null:updateStockMap.get("potency_perc").toString());            		
+            		pstmt.setString(6,updateStockMap.get("supp_code_mfg")==null?null:updateStockMap.get("supp_code_mfg").toString());
+ 					pstmt.setString(7,updateStockMap.get("item_code")==null?null:updateStockMap.get("item_code").toString());
+ 					pstmt.setString(8,updateStockMap.get("lot_no")==null?null:updateStockMap.get("lot_no").toString());
+ 					
+     				cnt1 = pstmt.executeUpdate();
+    				pstmt.close();
+    		     	pstmt = null;
+    		     	System.out.println("@@@@ cnt1-----:::"+cnt1);
+    					
+    		     		if ( cnt1 == 0)
+    					{
+    						 errCode = "VTUPDDET";
+    						 errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
+    						 return errString;
+    					}
+    			}
 				
+				else
+				{
 				 sql = " select shelf_life_type from item where item_code = ?  ";
 		           pstmt = conn.prepareStatement(sql);
 		   		   pstmt.setString(1,this.itemCode);
@@ -3052,6 +3110,7 @@ public class StockUpdate
 					}
 			
            }
+			} //adddedddd
 		 } 
         }
         catch(Exception e)