Skip to content

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

adding supp_code 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92418 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 37b20fcd
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 12 deletions
webitm-dis/ibase/webitm/ejb/dis/StockUpdate.java
View file @ 0f5a2f66
......@@ -34,6 +34,7 @@ public class StockUpdate
String suppCodeMfg="",grade="",batchNo="",unitAlt="",remarks="",refIdFor="",refSerFor="";
Timestamp creaDateStr=null,date=null,mfgDate=null,expDate = null,currDate=null,retestDateDate=null;
Timestamp lastPhycDate=null,tranDate= null,retestDate =null;
String suppCode=""; // added by cpatil
//
String considerAllocate = "", partialUsed = "";
//
......@@ -2428,7 +2429,7 @@ public class StockUpdate
Timestamp expDate=null , mfgDate=null, retestDate=null;
//Date today=null;
double grossrate=0;
String packCode="",siteCodeMfg="",acctCodeInv="",cctrCodeInv="",batchNo="",suppCodeMfg="";
String packCode="",siteCodeMfg="",acctCodeInv="",cctrCodeInv="",batchNo="",suppCodeMfg="",suppCode="";
double potencyPerc=0 , grossRate=0 , rate=0 , batchSize=0;
java.util.Date retestDate3=null,expDate3=null,mfgDate3=null;
Calendar currentDate = Calendar.getInstance();
......@@ -2681,8 +2682,13 @@ public class StockUpdate
}
if(updateStockMap.get("batch_size")!=null)
{
this.batchSize = Double.parseDouble(updateStockMap.get("batch_size").toString());
this.batchSize = Double.parseDouble(updateStockMap.get("batch_size").toString());
}
if(updateStockMap.get("supp_code")!=null)
{
this.suppCode = updateStockMap.get("supp_code").toString();
}
stkOpt = checkStkOpt(this.itemCode,this.siteCode,conn);
System.out.println("@@@@@ stkOpt[gfChkStkOpt] :::- ["+stkOpt+"]");
......@@ -2722,7 +2728,7 @@ public class StockUpdate
if( cnt > 0 )
{
sql = " select item_code,lot_no,grade,exp_date,mfg_date,retest_date,pack_code,potency_perc,site_code__mfg,rate," +
" gross_rate,acct_code__inv,cctr_code__inv,batch_no,batch_size,supp_code__mfg,shelf_life_type " +
" gross_rate,acct_code__inv,cctr_code__inv,batch_no,batch_size,supp_code__mfg,shelf_life_type,supp_code " +
" from item_lot_info where item_code = ? and lot_no = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,this.itemCode);
......@@ -2747,6 +2753,8 @@ public class StockUpdate
batchSize = rs.getDouble("batch_size");
suppCodeMfg = rs.getString("supp_code__mfg");
shelfLifeType = rs.getString("shelf_life_type");
suppCode = rs.getString("supp_code");
}
rs.close();
rs = null;
......@@ -2833,6 +2841,10 @@ public class StockUpdate
{
updateStockMap.put("supp_code__mfg", suppCodeMfg);
}
if(updateStockMap.get("supp_code")== null)
{
updateStockMap.put("supp_code", suppCode);
}
//int mapsize = updateStockMap.size();
......@@ -2854,8 +2866,8 @@ public class StockUpdate
System.out.println("cctrCodeInv["+updateStockMap.get("cctr_code_inv")+"]");
System.out.println("batchNo["+updateStockMap.get("batch_no")+"]");
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("suppCode["+updateStockMap.get("supp_code")+"]");
/*
......@@ -2929,7 +2941,7 @@ public class StockUpdate
pstmt.setString(12,updateStockMap.get("batch_no")==null?null:updateStockMap.get("batch_no").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(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("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(18,updateStockMap.get("site_code")==null?null:updateStockMap.get("site_code").toString());
......@@ -2968,13 +2980,14 @@ public class StockUpdate
System.out.println("cctrCodeInv["+updateStockMap.get("cctr_code_inv")+"]");
System.out.println("batchNo["+updateStockMap.get("batch_no")+"]");
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 value ["+shelfLifeType+"]");
System.out.println("suppCode ["+suppCode+"]");
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," +
" cctr_code__inv,batch_no,batch_size,supp_code__mfg,shelf_life_type) " +
" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
" cctr_code__inv,batch_no,batch_size,supp_code__mfg,shelf_life_type,supp_code) " +
" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
pstmt=conn.prepareStatement(sql);
......@@ -3019,8 +3032,9 @@ public class StockUpdate
pstmt.setString(14,updateStockMap.get("cctr_code_inv")==null?null:updateStockMap.get("cctr_code_inv").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(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,shelfLifeType);
pstmt.setString(19,updateStockMap.get("supp_code")==null?null:updateStockMap.get("supp_code").toString());
cnt1 = pstmt.executeUpdate();
pstmt.close();
......@@ -3131,7 +3145,7 @@ public class StockUpdate
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(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());
......
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