Skip to content

B
business-java
Commit 0beb9dce authored by cpatil's avatar cpatil
Browse files
Options

removing stock amd condition 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92326 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3b24a348
Show whitespace changes
Inline Side-by-side
Showing with 156 additions and 108 deletions
webitm-dis/ibase/webitm/ejb/dis/StockUpdate.java
View file @ 0beb9dce
...@@ -929,12 +929,13 @@ public class StockUpdate ...@@ -929,12 +929,13 @@ public class StockUpdate
} }
else if(this.tranType.equalsIgnoreCase("R")) else if(this.tranType.equalsIgnoreCase("R"))
{ {
errString = updateLotInfo( updateStockMap , conn); // added by cpatil calling function updateStockMap = updateLotInfo( updateStockMap , conn); // added by cpatil calling function
//if( errString != null && errString.trim().length() > 0)
//{
// return errString;
//}
if( errString != null && errString.trim().length() > 0)
{
return errString;
}
if (count > 0) if (count > 0)
{ {
sql ="select (case when acct_code__inv is null then ' ' else acct_code__inv end), (case when cctr_code__inv is null then ' ' else cctr_code__inv end), qty_per_art" sql ="select (case when acct_code__inv is null then ' ' else acct_code__inv end), (case when cctr_code__inv is null then ' ' else cctr_code__inv end), qty_per_art"
...@@ -2417,7 +2418,7 @@ public class StockUpdate ...@@ -2417,7 +2418,7 @@ public class StockUpdate
} }
// added by cpatil on 16/11/12 start adding stock update function // added by cpatil on 16/11/12 start adding stock update function
private String updateLotInfo(HashMap updateStockMap ,Connection conn) throws ITMException, Exception private HashMap updateLotInfo(HashMap updateStockMap ,Connection conn) throws ITMException, Exception
{ {
String sql="",errCode=""; String sql="",errCode="";
ResultSet rs=null; ResultSet rs=null;
...@@ -2688,65 +2689,7 @@ public class StockUpdate ...@@ -2688,65 +2689,7 @@ public class StockUpdate
if( "2".equalsIgnoreCase(stkOpt)) 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 = ? "; sql = " select shelf_life_type from item where item_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,this.itemCode); pstmt.setString(1,this.itemCode);
...@@ -2890,17 +2833,12 @@ public class StockUpdate ...@@ -2890,17 +2833,12 @@ public class StockUpdate
{ {
updateStockMap.put("supp_code__mfg", suppCodeMfg); updateStockMap.put("supp_code__mfg", suppCodeMfg);
} }
//if isnull(s_updatestock.shelf_life_type) then s_updatestock.shelf_life_type = ls_shelf_life__type
if(updateStockMap.get("shelf_life_type")== null)
{
updateStockMap.put("shelf_life_type", shelfLifeType);
}
int mapsize = updateStockMap.size(); //int mapsize = updateStockMap.size();
// for(int i=0;i<mapsize;i++) // for(int i=0;i<mapsize;i++)
{ {
System.out.println("@@@@@ for update.........."); System.out.println("@@@@@ for update map ..........");
System.out.println("itemCode::["+updateStockMap.get("item_code")+"]"); System.out.println("itemCode::["+updateStockMap.get("item_code")+"]");
System.out.println("lotNo["+updateStockMap.get("lot_no") +"]"); System.out.println("lotNo["+updateStockMap.get("lot_no") +"]");
System.out.println("grade["+updateStockMap.get("grade")+"]"); System.out.println("grade["+updateStockMap.get("grade")+"]");
...@@ -2917,10 +2855,31 @@ public class StockUpdate ...@@ -2917,10 +2855,31 @@ public class StockUpdate
System.out.println("batchNo["+updateStockMap.get("batch_no")+"]"); System.out.println("batchNo["+updateStockMap.get("batch_no")+"]");
System.out.println("batchSize["+updateStockMap.get("batch_size")+"]"); System.out.println("batchSize["+updateStockMap.get("batch_size")+"]");
System.out.println("suppCodeMfg["+updateStockMap.get("supp_code_mfg")+"]"); System.out.println("suppCodeMfg["+updateStockMap.get("supp_code_mfg")+"]");
System.out.println("shelfLifeType["+updateStockMap.get("shelf_life_type")+"]");
System.out.println("shelfLife__Type["+updateStockMap.get("shelf_life_type")+"]");
System.out.println("shelfLifeType value ["+shelfLifeType+"]");
/* /*
sql = " select count(1) from stock where item_code = ? and lot_no = ? and site_code= ? and loc_code = ? and lot_sl = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,this.itemCode);
pstmt.setString(2,this.lotNo);
pstmt.setString(3,this.siteCode);
pstmt.setString(4,this.lotCode);
pstmt.setString(5,this.lotSl);
rs = pstmt.executeQuery();
if(rs.next())
{
cnt6 = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(cnt6 > 0 )
{
sql = " update stock set " + sql = " update stock set " +
" mfg_date = ?,potency_perc = ?,exp_date = ?,retest_date = ?,lot_no = ?,grade = ?,pack_code = ?," + " mfg_date = ?,potency_perc = ?,exp_date = ?,retest_date = ?,lot_no = ?,grade = ?,pack_code = ?," +
" site_code__mfg = ?,rate = ?,acct_code__inv = ?," + " site_code__mfg = ?,rate = ?,acct_code__inv = ?," +
...@@ -2928,7 +2887,7 @@ public class StockUpdate ...@@ -2928,7 +2887,7 @@ public class StockUpdate
" batch_size = ? , supp_code__mfg = ? " + " batch_size = ? , supp_code__mfg = ? " +
" where item_code = ? and lot_no = ? and site_code= ? and loc_code = ? and lot_sl = ? "; " where item_code = ? and lot_no = ? and site_code= ? and loc_code = ? and lot_sl = ? ";
// , shelf_life_type = ?
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
String mfgDate2 = updateStockMap.get("mfg_date")==null?null:updateStockMap.get("mfg_date").toString(); String mfgDate2 = updateStockMap.get("mfg_date")==null?null:updateStockMap.get("mfg_date").toString();
...@@ -2971,7 +2930,6 @@ public class StockUpdate ...@@ -2971,7 +2930,6 @@ public class StockUpdate
pstmt.setString(13,updateStockMap.get("gross_rate ")==null?null:updateStockMap.get("gross_rate").toString()); pstmt.setString(13,updateStockMap.get("gross_rate ")==null?null:updateStockMap.get("gross_rate").toString());
pstmt.setString(14,updateStockMap.get("batch_size")==null?null:updateStockMap.get("batch_size").toString()); pstmt.setString(14,updateStockMap.get("batch_size")==null?null:updateStockMap.get("batch_size").toString());
pstmt.setString(15,updateStockMap.get("supp_code_mfg")==null?null:updateStockMap.get("supp_code_mfg").toString()); pstmt.setString(15,updateStockMap.get("supp_code_mfg")==null?null:updateStockMap.get("supp_code_mfg").toString());
//pstmt.setString(16,updateStockMap.get("shelf_life_type")==null?null:updateStockMap.get("shelf_life_type").toString());
pstmt.setString(16,updateStockMap.get("item_code")==null?null:updateStockMap.get("item_code").toString()); pstmt.setString(16,updateStockMap.get("item_code")==null?null:updateStockMap.get("item_code").toString());
pstmt.setString(17,updateStockMap.get("lot_no")==null?null:updateStockMap.get("lot_no").toString()); pstmt.setString(17,updateStockMap.get("lot_no")==null?null:updateStockMap.get("lot_no").toString());
pstmt.setString(18,updateStockMap.get("site_code")==null?null:updateStockMap.get("site_code").toString()); pstmt.setString(18,updateStockMap.get("site_code")==null?null:updateStockMap.get("site_code").toString());
...@@ -2988,6 +2946,7 @@ public class StockUpdate ...@@ -2988,6 +2946,7 @@ public class StockUpdate
errString = itmDBAccessEJB.getErrorString("",errString,"","",conn); errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
return errString; return errString;
} }
} // if cnt6
*/ */
} }
} }
...@@ -3010,34 +2969,15 @@ public class StockUpdate ...@@ -3010,34 +2969,15 @@ public class StockUpdate
System.out.println("batchNo["+updateStockMap.get("batch_no")+"]"); System.out.println("batchNo["+updateStockMap.get("batch_no")+"]");
System.out.println("batchSize["+updateStockMap.get("batch_size")+"]"); System.out.println("batchSize["+updateStockMap.get("batch_size")+"]");
System.out.println("suppCodeMfg["+updateStockMap.get("supp_code_mfg")+"]"); System.out.println("suppCodeMfg["+updateStockMap.get("supp_code_mfg")+"]");
System.out.println("shelfLifeType["+updateStockMap.get("shelf_life_type")+"]");
System.out.println("shelfLifeType value ["+shelfLifeType+"]"); System.out.println("shelfLifeType value ["+shelfLifeType+"]");
sql = " insert into item_lot_info (item_code,lot_no,grade,crea_date,exp_date,mfg_date,retest_date,pack_code," + sql = " insert into item_lot_info (item_code,lot_no,grade,crea_date,exp_date,mfg_date,retest_date,pack_code," +
"potency_perc,site_code__mfg,rate,gross_rate,acct_code__inv," + " potency_perc,site_code__mfg,rate,gross_rate,acct_code__inv," +
" cctr_code__inv,batch_no,batch_size,supp_code__mfg,shelf_life_type) " + " cctr_code__inv,batch_no,batch_size,supp_code__mfg,shelf_life_type) " +
"values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) "; " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
/* pstmt.setString(1,this.itemCode);
pstmt.setString(2,this.lotNo );
pstmt.setString(3,this.grade);
pstmt.setTimestamp(4,today);
pstmt.setTimestamp(5,this.expDate);
pstmt.setTimestamp(6,this.mfgDate );
pstmt.setTimestamp(7,this.retestDate );
pstmt.setString(8,this.packCode );
pstmt.setDouble(9,this.potencyPerc );
pstmt.setString(10,this.siteCodeMfg);
pstmt.setDouble(11,this.rate );
pstmt.setDouble(12,this.grossRate );
pstmt.setString(13,this.acctCodeInv );
pstmt.setString(14,this.cctrCodeInv);
pstmt.setString(15,this.batchNo);
pstmt.setDouble(16,this.batchSize);
pstmt.setString(17,this.suppCodeMfg);
pstmt.setString(18,shelfLifeType);
*/
pstmt.setString(1,updateStockMap.get("item_code")==null?null:updateStockMap.get("item_code").toString()); pstmt.setString(1,updateStockMap.get("item_code")==null?null:updateStockMap.get("item_code").toString());
pstmt.setString(2,updateStockMap.get("lot_no")==null?null:updateStockMap.get("lot_no").toString()); pstmt.setString(2,updateStockMap.get("lot_no")==null?null:updateStockMap.get("lot_no").toString());
pstmt.setString(3,updateStockMap.get("grade")==null?null:updateStockMap.get("grade").toString()); pstmt.setString(3,updateStockMap.get("grade")==null?null:updateStockMap.get("grade").toString());
...@@ -3080,20 +3020,20 @@ public class StockUpdate ...@@ -3080,20 +3020,20 @@ public class StockUpdate
pstmt.setString(15,updateStockMap.get("batch_no")==null?null:updateStockMap.get("batch_no").toString()); pstmt.setString(15,updateStockMap.get("batch_no")==null?null:updateStockMap.get("batch_no").toString());
pstmt.setString(16,updateStockMap.get("batch_size")==null?null:updateStockMap.get("batch_size").toString()); pstmt.setString(16,updateStockMap.get("batch_size")==null?null:updateStockMap.get("batch_size").toString());
pstmt.setString(17,updateStockMap.get("supp_code_mfg")==null?null:updateStockMap.get("supp_code_mfg").toString()); pstmt.setString(17,updateStockMap.get("supp_code_mfg")==null?null:updateStockMap.get("supp_code_mfg").toString());
pstmt.setString(18,updateStockMap.get("shelf_life_type")==null?shelfLifeType:updateStockMap.get("shelf_life_type").toString()); pstmt.setString(18,shelfLifeType);
cnt1 = pstmt.executeUpdate(); cnt1 = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if ( cnt1 == 0) // if ( cnt1 == 0)
{ // {
errCode = "VINSERT5"; // errCode = "VINSERT5";
errString = itmDBAccessEJB.getErrorString("",errString,"","",conn); // errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
return errString; // return errString;
} // }
} }
} //adddedddd //} //add
} }
} }
catch(Exception e) catch(Exception e)
...@@ -3101,9 +3041,117 @@ public class StockUpdate ...@@ -3101,9 +3041,117 @@ public class StockUpdate
System.out.println("Exception "+e); System.out.println("Exception "+e);
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
}
return updateStockMap;
}
/*
private String updateStockAmd(HashMap updateStockMap ,Connection conn) throws ITMException, Exception
{
String stkOpt="", sql = "",errCode="",errString="";
PreparedStatement pstmt = null;
ResultSet rs = null;
java.util.Date retestDate3=null,expDate3=null,mfgDate3=null;
int cnt1=0,cnt=0;
if ( updateStockMap.get("item_code") != null )
{
this.itemCode = updateStockMap.get("item_code").toString();
}
if ( updateStockMap.get("lot_no") != null )
{
this.lotNo = updateStockMap.get("lot_no").toString();
}
if ( updateStockMap.get("lot_no") != null )
{
this.siteCode = updateStockMap.get("site_code").toString();
}
if ( updateStockMap.get("tran_ser") != null )
{
this.tranSer = updateStockMap.get("tran_ser").toString();
}
stkOpt = checkStkOpt(this.itemCode,this.siteCode,conn);
System.out.println("@@@@@ stkOpt[gfChkStkOpt] :::- ["+stkOpt+"]");
if( "2".equalsIgnoreCase(stkOpt) )
{
System.out.println("tran_ser::::::::["+this.tranSer+"]");
if( "STKAMD".equalsIgnoreCase( this.tranSer ))
{
sql = " select count(1) from item_lot_info where item_code = ? and lot_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,this.itemCode);
pstmt.setString(2,this.lotNo);
rs = pstmt.executeQuery();
if(rs.next())
{
cnt = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if( cnt > 0)
{
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;
}
}
}
} }
return errString; return errString;
} }
*/ //for amm end
// added by cpatil end // added by cpatil end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment