Skip to content

B
business-java
Commit 531752ef 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@101717 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 56ccae6f
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 19 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationIC.java
View file @ 531752ef
......@@ -138,9 +138,9 @@ etc
//changed by sankara on 14/08/14 for transporter item change start.
String transporterName = "";
//Changed by Sneha on 16-05-2016 [Start]
String tranCode = "";
//Changed by Sneha on 16-05-2016 [End]
String carrierName = ""; //Changed by Sneha
try
{
String applDateFmt = genericUtility.getApplDateFormat();
......@@ -622,7 +622,23 @@ etc
//Changed by Sneha on 16-05-2016 for carrier code fliter [Start]
else if(currentColumn.trim().equalsIgnoreCase("carrier_code"))
{
valueXmlString.append( "<item_ser__from><![CDATA[" ).append("00").append( "]]></item_ser__from>\r\n" );
columnValue = checkNull(genericUtility.getColumnValue("carrier_code",currDom));
if( columnValue != null && columnValue.trim().length() > 0 )
{
sSQL = " SELECT TRAN_NAME FROM TRANSPORTER WHERE TRAN_CODE = ? ";
pstmt = conn.prepareStatement(sSQL);
pstmt.setString(1, columnValue);
rs = pstmt.executeQuery();
if(rs.next())
{
carrierName = checkNull(rs.getString(1));
//System.out.println("carrierName:::::::"+carrierName);
}
rs.close();rs = null;
pstmt.close();pstmt = null;
}
valueXmlString.append( "<Detail1>\r\n" );
/* valueXmlString.append( "<item_ser__from><![CDATA[" ).append("00").append( "]]></item_ser__from>\r\n" );
valueXmlString.append( "<item_ser__to><![CDATA[" ).append("ZZ").append( "]]></item_ser__to>\r\n" );
valueXmlString.append( "<item_code__from><![CDATA[" ).append("00").append( "]]></item_code__from>\r\n" );
valueXmlString.append( "<item_code__to><![CDATA[" ).append("ZZ").append( "]]></item_code__to>\r\n" );
......@@ -634,14 +650,18 @@ etc
valueXmlString.append("<cust_code__dlv__to><![CDATA[").append("ZZ").append("]]></cust_code__dlv__to>\r\n");
valueXmlString.append( "<due_date__from><![CDATA[" ).append("").append( "]]></due_date__from>\r\n" );
valueXmlString.append( "<due_date__to><![CDATA[" ).append("").append( "]]></due_date__to>\r\n" );
valueXmlString.append( "<due_date__to><![CDATA[" ).append("").append( "]]></due_date__to>\r\n" );*/
valueXmlString.append( "<carrier_name><![CDATA[" ).append( carrierName ).append( "]]></carrier_name>\r\n" );
valueXmlString.append( "<single_lot protect ='1' ><![CDATA[" ).append( "" ).append( "]]></single_lot>\r\n" );
valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
valueXmlString.append( "</Detail1>\r\n" );
}
//Changed by Sneha on 16-05-2016 for carrier code fliter [End]
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 531752ef
......@@ -612,14 +612,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//changed by manish on 02/09/15 for Ms sql server databse[end]
//Changed by Sneha on 16-05-2016 for carrier code fliter in sql [Start]
projectName = distCommon.getDisparams("999999","PROJECT",conn);
if("DDUK".equals(projectName.trim()))
if (carrierCodeInput.trim().length() > 0)
{
if (carrierCodeInput.trim().length() > 0)
{
getDataSql = getDataSql + " AND SORDER.TRAN_CODE = '"+carrierCodeInput+"' ";
}
}
getDataSql = getDataSql + " AND SORDER.TRAN_CODE = '"+carrierCodeInput+"' ";
}
//Changed by Sneha on 16-05-2016 for carrier code fliter in sql [End]
System.out.println("new batch id is ---"+ batchID);
......@@ -7184,6 +7180,7 @@ 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 Sneha on 16-05-2016 for carrier code fliter [End]
// Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing.
......@@ -7191,20 +7188,19 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if("DDUK".equalsIgnoreCase(projectName))
{
//Changed by Sneha on 16-05-2016 for insert into carrier code [Start]
//Changed by Sneha on 16-05-2016 for carrier code fliter [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]
//Changed by Sneha on 16-05-2016 for carrier code fliter [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 " ;
//Changed by Sneha on 16-05-2016 for carrier code fliter [Start]
//insertSql = insertSql + ") VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,? ,?)";
insertSql = insertSql + ") VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,? ,?)";
//Changed by Sneha on 16-05-2016 for carrier code fliter [End]
}
//Changes by Dadaso pawar on 17/03/15 [End]
//"VALUES (?,?,?,?,?,?,?,?,?,?,?)";
......
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