Skip to content

B
business-java
Commit aec604cb authored by smestry's avatar smestry
Browse files
Options

W16BKAT001, Updated the carrier code for wave generation filters. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101688 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 15ca3805
Expand all Show whitespace changes
Inline Side-by-side
Showing with 139 additions and 16 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ aec604cb
......@@ -233,6 +233,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
DistCommon distCommon = new DistCommon();
String projectName = "";
//Changed by Dadaso pawar on 05/06/15 [End]
public String process() throws RemoteException,ITMException
{
return "";
......@@ -340,6 +341,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String siteCodeShip = "";
//chnaged by pragyan on 15/10/14 for cold chain
String locTypeParent = "";
//Changed by Sneha on 16-05-2016 [Start]
String carrierCodeInput = "";
//Changed by Sneha on 16-05-2016 [End]
retTabSepStrBuff = new StringBuffer( "<?xml version='1.0' encoding='UTF-8'?>\r\n<DocumentRoot>\r\n<description>Datawindow Root</description>\r\n<group0>\r\n" +
"<description>Group0 description</description>\r\n<Header0>\r\n<description>Header0 members</description>\r\n");
......@@ -493,6 +499,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
return errString;
}
//Changed by Sneha on 16-05-2016 [Start]
carrierCodeInput = genericUtility.getColumnValue("carrier_code",headerDom);
//System.out.println(" carrier_code =========>> " + carrierCodeInput);
//Changed by Sneha on 16-05-2016 [End]
globalSingleLot = checkNull(genericUtility.getColumnValue("single_lot",headerDom));
globalMasterPackAllow = checkNull(genericUtility.getColumnValue("master_pack_allow",headerDom));
......@@ -509,9 +519,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//changed by sankara on 04/02/14 for getting sale order type
saleOrdertype = genericUtility.getColumnValue("order_type",headerDom);
//Changed By Pragyan 14/08/14 for tran code argumnet and loc type parent start.
tranCodeInput = checkNull(genericUtility.getColumnValue("tran_code",headerDom));
locTypeParentInput = checkNull(genericUtility.getColumnValue("loc_type_parent",headerDom));
System.out.println("saleOrdertype:::"+saleOrdertype);
//Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing..start
......@@ -597,6 +607,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+" ITEM.ITEM_CODE <=? ";
//changed by manish on 02/09/15 for Ms sql server databse[end]
//Changed by Sneha on 16-05-2016 for tran code fliter in sql [Start]
projectName = distCommon.getDisparams("999999","PROJECT",conn);
if("DDUK".equals(projectName.trim()))
{
getDataSql = getDataSql +" AND SORDER.TRAN_CODE = '"+carrierCodeInput+"' ";
}
//Changed by Sneha on 16-05-2016 for tran code fliter in sql [End]
System.out.println("new batch id is ---"+ batchID);
if(batchID.trim().length() > 0)
{
......@@ -698,6 +716,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("ordtypeGetData::::::::"+saleOrdertype);
pstmt.setString(14,saleOrdertype);
}*/
if(batchID.trim().length() > 0 )
{
System.out.println("+batch id is :+" +batchID);
......@@ -1484,8 +1504,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
retTabSepStrBuff.append( "<alloc_flag><![CDATA[" ).append(allocFlag).append( "]]></alloc_flag>\r\n" );
retTabSepStrBuff.append( "<tran_code><![CDATA[" ).append(tranCod).append( "]]></tran_code>\r\n" );
retTabSepStrBuff.append( "<tran_name><![CDATA[" ).append(tranName).append( "]]></tran_name>\r\n" );
retTabSepStrBuff.append( "<lock_code__dock><![CDATA[" ).append(docLocation).append( "]]></lock_code__dock>\r\n" );
packInstr = rs.getString(11);
......@@ -7064,6 +7087,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String consoliRepl = "";
//Changes by Dadaso pawar on 17/03/15 [End]
//Changed by Sneha on 16-05-2016 [Start]
String carrierCodeInput = "";
//Changed by Sneha on 16-05-2016 [End]
try
{
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
......@@ -7085,6 +7112,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
dueDateTo = genericUtility.getColumnValue("due_date__to",headerDom);
dueDateFrom = genericUtility.getValidDateString(dueDateFrom, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
dueDateTo = genericUtility.getValidDateString(dueDateTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
//Changed by Sneha on 16-05-2016 for tran code fliter [Start]
carrierCodeInput = checkNull(genericUtility.getColumnValue("carrier_code",headerDom));
//System.out.println("carrier_code ============>> " + carrierCodeInput);
//Changed by Sneha on 16-05-2016 for tran code fliter [End]
shipType = genericUtility.getColumnValue("ship_type",headerDom);
directPickLoc = genericUtility.getColumnValue("direct_pick_loc",headerDom);
//changed by pragyan on 14/08/14 for tran_code and loc type argumnet.
......@@ -7111,6 +7144,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("consoliRepl::::::::["+consoliRepl+"]");
}
//Changes by Dadaso pawar on 17/03/15 [End]
/*
if("Y".equalsIgnoreCase(frmDomMasterPackAllow))
{
......@@ -7129,8 +7163,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
waveId = "";
pickType = "";
waveId = getTranId("w_wave_task", conn);
insertSql="INSERT INTO WAVE_TASK(WAVE_ID,TRAN_DATE, " +
"SALE_ORDER__FROM, SALE_ORDER__TO, CUST_CODE__FROM, " +
"SALE_ORDER__FROM, SALE_ORDER__TO, CUST_CODE__FROM, " ;
// Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing.
//Changed By Pragyan 22/08/12 To add Hold Status
//"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE)" +
......@@ -7139,16 +7174,28 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE)" +
//"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS)" +
//"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS,TRAN_CODE,LOC_TYPE__PARENT)" +
"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS,TRAN_CODE,LOC_TYPE__PARENT,BATCH_ID " ;
//Changed by Sneha on 16-05-2016 for tran code fliter [Start]
//insertSql = insertSql + "CUST_CODE__TO,DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS,TRAN_CODE,LOC_TYPE__PARENT,BATCH_ID " ;
//Changed by Sneha on 16-05-2016 for tran code fliter [End]
// Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing.
//Changes by Dadaso pawar on 17/03/15 [Start]
if("DDUK".equalsIgnoreCase(projectName))
{
insertSql = insertSql + ") VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,? )";
//Changed by Sneha on 16-05-2016 for insert into carrier code [Start]
//insertSql = insertSql + ") VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,? )";
insertSql = insertSql + "CUST_CODE__TO,DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS,TRAN_CODE,LOC_TYPE__PARENT,BATCH_ID,CARRIER_CODE " ;
insertSql = insertSql + ") VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,? )";
//Changed by Sneha on 16-05-2016 for insert into carrier code [End]
}
else
{
//Changed by Sneha on 16-05-2016 [Start]
insertSql = insertSql + "CUST_CODE__TO,DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS,TRAN_CODE,LOC_TYPE__PARENT,BATCH_ID " ;
//Changed by Sneha on 16-05-2016 [End]
insertSql = insertSql + ",CONSOLIDATE_REPL " ;
insertSql = insertSql + ") VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,? ,?)";
}
......@@ -7192,6 +7239,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
pstmt.setString(19,consoliRepl);
}
//Changed by Sneha on 16-05-2016 [Start]
else
{
pstmt.setString(19,carrierCodeInput);
}
//Changed by Sneha on 16-05-2016 [Start]
//Changes by Dadaso pawar on 17/03/15 [End]
pstmt.executeUpdate();
//Changes by Manish on 21/04/16 [start]
......@@ -7818,7 +7872,6 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(errString == null || errString.trim().length() == 0)
{
if(itemHazSortList.size() > 0)
{
long startTime10 = System.currentTimeMillis();
......
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