Skip to content

B
business-java
Commit 25f2c393 authored by sankara.rao's avatar sankara.rao
Browse files
Options

changed by sankara on 14/10/13 updated wavegenerationprc source for insert... 

changed by sankara on 14/10/13 updated wavegenerationprc source for insert licenceno and licence date in despatch


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93770 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6f6fdcf6
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 4 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 25f2c393
......@@ -14080,7 +14080,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
double exchRateIns = 0d;
//End changes by gulzar on 12/28/2011
//changed by sankara on 11/10/13 for getting licence_no and licence_date start.
String licenceNo = "";
java.sql.Date lincenceDate = null;
String licenceNo2 = "";
java.sql.Date lincenceDate2 = null;
//changed by sankara on 11/10/13 for getting licence_no and licence_date end.
try
{
......@@ -14167,14 +14172,30 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+"(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
*/
//changed by sankara on 11/10/13 for getting licence_no and licence_date start.
HashMap sordMap = getSordInfo(saleOrder,conn);
licenceNo = (String)sordMap.get("DRUG_LIC_NO_1");
System.out.println("licenceNo:"+licenceNo);
lincenceDate =(java.sql.Date)sordMap.get("DRUG_LICNO1_UPTO");
System.out.println("lincenceDate:"+lincenceDate);
licenceNo2 = (String)sordMap.get("DRUG_LIC_NO_2");
lincenceDate2 =(java.sql.Date)sordMap.get("DRUG_LICNO2_UPTO");
//changed by sankara on 11/10/13 for getting licence_no and licence_date end.
insertSql="INSERT INTO DESPATCH(DESP_ID,DESP_DATE, SITE_CODE, SORD_NO, SORD_DATE,"
+ " CUST_CODE, CUST_CODE__DLV, DLV_ADD1, DLV_ADD2, COUNT_CODE__DLV, "
+ " TRANS_MODE, STAN_CODE, CONFIRMED, STATUS, CHG_USER, CHG_DATE, CHG_TERM,"
+ " DLV_ADD3, STATE_CODE__DLV, EXCH_RATE, WAVE_ID, EFF_DATE, DLV_CITY, DLV_PIN, TRAN_CODE, "
/*+ " CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, CURR_CODE,GP_NO )"
+ " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";*/
+ " CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, CURR_CODE,GP_NO,PTCN )"
+ " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
//changed by sankara on 11/10/13 for insert licence_no and licence_date start.
/*+ " CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, CURR_CODE,GP_NO,PTCN )"
+ " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";*/
+ " CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, CURR_CODE,GP_NO,PTCN,LICENCE_NO_1,LICENCE_DATE_1, "
+ " LICENCE_NO_2, LICENCE_DATE_2 )"
+ " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? ) ";
//changed by sankara on 11/10/13 for insert licence_no and licence_date end.
//End changes by gulzar on 12/28/2011
pstmt = conn.prepareStatement(insertSql);
......@@ -14241,6 +14262,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By Pragyan according to manohran sir as in future it will change .
pstmt.setString(33,"G");
pstmt.setString(34,PTCN);
//changed by sankara on 11/10/13 for insert licence_no_1, and licence_date_1,licence_no_2,licence_date_2 start.
pstmt.setString(35,licenceNo);
pstmt.setDate(36,lincenceDate);
pstmt.setString(37,licenceNo2);
pstmt.setDate(38,lincenceDate2);
//changed by sankara on 11/10/13 for insert licence_no_1, and licence_date_1,licence_no_2,licence_date_2 end.
//End changes by gulzar on 12/28/2011
pstmt.executeUpdate();
......@@ -16956,7 +16983,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By Rekha to get additional fields for ADSI
,custName="",custShName = "",shipCity="",shipCountry = "",shipAdd1 = "",shipAdd2 = "",shipAdd3 = "",
shipPh="",shipFax ="",shipMailId = "",custPord = "",dlvPin = "";
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto start.
String licenceNo = "";
java.sql.Date lincenceUpto = null;
String licenceNo2 = "";
java.sql.Date lincenceUpto2 = null;
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto end.
try
{
......@@ -17004,6 +17036,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+" S.TEL1__DLV AS PHONE,"
+" S.FAX__DLV AS FAX,"
+" C.EMAIL_ADDR AS EMAIL_ID,"
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto start.
+" C.DRUG_LIC_NO_1 AS DRUG_LIC_NO_1,"
+" C.DRUG_LICNO1_UPTO AS DRUG_LICNO1_UPTO, "
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto end.
+" S.DLV_PIN AS DLV_PIN"
+" FROM SORDER S,CUSTOMER C"
+" WHERE S.CUST_CODE__DLV = C.CUST_CODE "
......@@ -17032,7 +17068,56 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
shipFax = rs.getString("FAX");
custPord = rs.getString("CUST_PORD");
dlvPin = rs.getString("DLV_PIN");
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto start.
licenceNo = rs.getString("DRUG_LIC_NO_1");
lincenceUpto = rs.getDate("DRUG_LICNO1_UPTO");
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto end.
}
//changed by sankara on 14/10/13 for getting drug_lic_no_1 and drug_licno1_upto start.
if( rs != null )
{
rs.close();
rs = null;
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
sql = " SELECT S.CUST_CODE__DLV AS CUST_CODE,"
+" S.STAN_CODE AS STAN_CODE,"
+" S.SITE_CODE__SHIP AS SHIP_CODE,"
+" S.CUST_PORD AS CUST_PORD,"
+" S.STATE_CODE__DLV AS STATE_DLV,"
+" C.SHIP_CONS_GRP AS SHIP_CONS_GRP,"
+" S.DLV_TO AS CUST_NAME,"
+" C.SH_NAME AS SH_NAME,"
+" S.DLV_ADD1 AS ADDR1,"
+" S.DLV_ADD2 AS ADDR2,"
+" S.DLV_ADD3 AS ADDR3,"
+" S.DLV_CITY AS CITY,"
+" S.COUNT_CODE__DLV AS COUNT_CODE,"
+" S.TEL1__DLV AS PHONE,"
+" S.FAX__DLV AS FAX,"
+" C.EMAIL_ADDR AS EMAIL_ID,"
+" C.DRUG_LIC_NO_1 AS DRUG_LIC_NO_2,"
+" C.DRUG_LICNO1_UPTO AS DRUG_LICNO2_UPTO, "
+" S.DLV_PIN AS DLV_PIN"
+" FROM SORDER S,CUSTOMER C"
+" WHERE S.CUST_CODE__BIL = C.CUST_CODE "
+" AND S.SALE_ORDER = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
rs = pstmt.executeQuery();
if(rs.next())
{
licenceNo2 = rs.getString("DRUG_LIC_NO_2");
lincenceUpto2 = rs.getDate("DRUG_LICNO2_UPTO");
}
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto end.
sordInfoMap.put("CUST_CODE", custCode);
sordInfoMap.put("STAN_CODE", stanCode);
......@@ -17050,6 +17135,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
sordInfoMap.put("FAX", shipFax);
sordInfoMap.put("CUST_PORD", custPord);
sordInfoMap.put("DLV_PIN", dlvPin);
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto start.
sordInfoMap.put("DRUG_LIC_NO_1", licenceNo);
sordInfoMap.put("DRUG_LICNO1_UPTO", lincenceUpto);
sordInfoMap.put("DRUG_LIC_NO_2", licenceNo2);
sordInfoMap.put("DRUG_LICNO2_UPTO", lincenceUpto2);
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto end.
if(shipConsGrp != null && shipConsGrp.length() > 0 )
{
......
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