Skip to content

B
business-java
Commit 35b83878 authored by steurwadkar's avatar steurwadkar
Browse files
Options

Changes made to run wavegeneation process screen GWT wizard 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103377 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2920a919
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 14 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 35b83878
......@@ -358,6 +358,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
connDriver = null;*/
conn = getConnection();
//Changed and Commented By Santosh on 14-06-2016 :[END]
//Added by Santosh on 19-09-2016 for date parsing issue in GWT process screen [Start]
E12GenericUtility genericUtility = new E12GenericUtility();
String applDateFmt = genericUtility.getApplDateFormat();
String dbDateFmt = genericUtility.getDBDateFormat();
//Added by Santosh on 19-09-2016 for date parsing issue in GWT process screen [End]
siteCode = genericUtility.getColumnValue("site_code",headerDom);
if ( siteCode == null || siteCode.trim().length() == 0 )
......@@ -1385,7 +1391,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
retTabSepStrBuff.append( "<line_no><![CDATA[" ).append(rs.getString(3)).append( "]]></line_no>\r\n" );
retTabSepStrBuff.append( "<sale_order><![CDATA[" ).append(rs.getString(4)).append( "]]></sale_order>\r\n" );
System.out.println("Due Date Format===>>>>>>>>=="+rs.getDate(5));
retTabSepStrBuff.append( "<due_date><![CDATA[" ).append(rs.getDate(5)).append( "]]></due_date>\r\n" );
//Changed by Santosh on 19-09-2016 to append formated date for GWT process screen
//retTabSepStrBuff.append( "<due_date><![CDATA[" ).append(rs.getDate(5)).append( "]]></due_date>\r\n" );
retTabSepStrBuff.append( "<due_date><![CDATA[" ).append(genericUtility.getValidDateString( rs.getDate(5).toString() , dbDateFmt, applDateFmt )).append( "]]></due_date>\r\n" );
dueDate = rs.getTimestamp(5);
retTabSepStrBuff.append( "<item_code><![CDATA[" ).append(rs.getString(6)).append( "]]></item_code>\r\n" );
retTabSepStrBuff.append( "<item_descr><![CDATA[" ).append(rs.getString(7)).append( "]]></item_descr>\r\n" );
......@@ -3384,8 +3392,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
Set saleOrderSet = new java.util.HashSet();
String salesOrder ="";
//changed by sankara on 24/09/13 for update status in sorddet end.
//Commented by Santosh on 19-09-2016 GWT Process screen
//Changed by Samadhan on 28/01/2016 for galaxy theme checkbox
boolean processFlag = false;
//boolean processFlag = false;
try
{
//Changed By Pragyan 30JUN14 to take the connection above
......@@ -3564,14 +3573,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
int count = 0;
parentNode = parentNodeList.item(selectedRow);
//Changed by samadhan on 28/01/2016 for galaxy theme check box start
if(commonWmsUtility.getColumnValue(parentNode, "is_selected").equalsIgnoreCase("false"))
//Commented by Santosh on 19-09-2016 GWT Process screen [Start]
/*if(commonWmsUtility.getColumnValue(parentNode, "is_selected").equalsIgnoreCase("false"))
{
continue;
}
else
{
processFlag = true;
}
}*/
//Commented by Santosh on 19-09-2016 GWT Process screen [End]
//Changed by samadhan W15JKAT001 on 28/01/2016 for galaxy theme check box start
manualStock = false;
waveFlag = "";
......@@ -4421,12 +4432,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} // out for loop
//Changed by samadhan on 28/01/2016 for galaxy theme check box start
System.out.println("process flag->>>>>>>>>>:"+processFlag);
//Commented by Santosh on 19-09-2016 GWT Process screen [Start]
/*System.out.println("process flag->>>>>>>>>>:"+processFlag);
if(processFlag == false)
{
errString = itmDBAccessEJB.getErrorString("", "VTNOROSSEL", "");
return errString;
}
}*/
//Commented by Santosh on 19-09-2016 GWT Process screen [End]
//Changed by samadhan W15JKAT001 on 28/01/2016 for galaxy theme check box start
long endTime5 = System.currentTimeMillis();
......@@ -7273,13 +7286,15 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Sneha on 16-05-2016 for carrier 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 " ;
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 " ;
//changed by Santosh on 19-09-2016 to merge carrier code and consoldated replineshment changes in single qurey
//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 + "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, CONSOLIDATE_REPL " ;
//Changed by Sneha on 16-05-2016 for carrier 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))
//changed by Santosh on 19-09-2016 to merge carrier code and consoldated replineshment changes in single qurey [Start]
/*if("DDUK".equalsIgnoreCase(projectName))
{
//Changed by Sneha on 16-05-2016 for carrier code fliter [Start]
//insertSql = insertSql + ") VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,? )";
......@@ -7294,7 +7309,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//insertSql = insertSql + ") VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,? ,?)";
insertSql = insertSql + ") VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,? ,?)";
//Changed by Sneha on 16-05-2016 for carrier code fliter [End]
}
}*/
insertSql = insertSql + ") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
//changed by Santosh on 19-09-2016 to merge carrier code and consoldated replineshment changes in single qurey [End]
//Changes by Dadaso pawar on 17/03/15 [End]
//"VALUES (?,?,?,?,?,?,?,?,?,?,?)";
//"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
......@@ -7331,17 +7348,22 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
// Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing.
pstmt.setString(18,batchID);
//Changes by Dadaso pawar on 17/03/15 [Start]// merge by Manish
if(!"DDUK".equalsIgnoreCase(projectName))
//Added and changed by Santosh on 19-09-2016 [Start]
pstmt.setString(19,carrierCodeInput);
pstmt.setString(20,consoliRepl);
/*if(!"DDUK".equalsIgnoreCase(projectName))
{
pstmt.setString(19,consoliRepl);
pstmt.setString(19,carrierCodeInput);
//pstmt.setString(19,consoliRepl);
pstmt.setString(20,consoliRepl);
}
//Changed by Sneha on 16-05-2016 [Start]
else
{
pstmt.setString(19,carrierCodeInput);
}
}*/
//Changed by Sneha on 16-05-2016 [Start]
//Added and changed by Santosh on 19-09-2016 [End]
//Changes by Dadaso pawar on 17/03/15 [End]
pstmt.executeUpdate();
//Changes by Manish on 21/04/16 [start]
......
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