Skip to content

B
business-java
Commit 56ccae6f 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@101716 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 17bc5669
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 47 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationIC.java
View file @ 56ccae6f
...@@ -304,21 +304,14 @@ etc ...@@ -304,21 +304,14 @@ etc
" FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " + " FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE " + " AND C.CUST_CODE = S.CUST_CODE " +
" AND C.WAVE_TYPE = W.WAVE_TYPE ";*/ " AND C.WAVE_TYPE = W.WAVE_TYPE ";*/
//Changed By Sankara 02/aug/13 to take single lot from saleorder[WM3DESUN002] //Changed By Sankara 02/aug/13 to take single lot from saleorder[WM3DESUN002]
//sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," + //sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," +
/*sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, S.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," + sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, S.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," +
" W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW "+ " W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW "+
" FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " + " FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE__DLV " + " AND C.CUST_CODE = S.CUST_CODE__DLV " +
" AND C.WAVE_TYPE = W.WAVE_TYPE ";*/ " AND C.WAVE_TYPE = W.WAVE_TYPE ";
//Changed by Sneha on 16-05-2016 for tran code fliter [Start]
sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, S.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," +
" W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW, S.TRAN_CODE "+
" FROM SORDER S, CUSTOMER C, WAVE_TYPE W, TRANSPORTER T WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE__DLV " +
" AND C.WAVE_TYPE = W.WAVE_TYPE AND S.TRAN_CODE = T.TRAN_CODE ";
//Changed by Sneha on 16-05-2016 for tran code fliter [End]
//Changed by sumit on 14/05/13 modified sql and join end. //Changed by sumit on 14/05/13 modified sql and join end.
System.out.println("queryString="+sSQL); System.out.println("queryString="+sSQL);
pstmt = conn.prepareStatement(sSQL); pstmt = conn.prepareStatement(sSQL);
...@@ -337,10 +330,6 @@ etc ...@@ -337,10 +330,6 @@ etc
parcelPackAllow = rs.getString("PARCELPACK_ALLOW"); parcelPackAllow = rs.getString("PARCELPACK_ALLOW");
//Changed by sumit on 13/05/13 add cust code delivery //Changed by sumit on 13/05/13 add cust code delivery
custCodeDlv = rs.getString("CUST_CODE__DLV").trim(); custCodeDlv = rs.getString("CUST_CODE__DLV").trim();
//Changed by Sneha on 16-05-2016 for tran code fliter [Start]
tranCode = rs.getString("TRAN_CODE").trim();
//Changed by Sneha on 16-05-2016 for tran code fliter [End]
} }
if(dateFrom != null) if(dateFrom != null)
...@@ -362,11 +351,7 @@ etc ...@@ -362,11 +351,7 @@ etc
valueXmlString.append("<cust_code__dlv__from><![CDATA[").append(checkNull(custCodeDlv)).append("]]></cust_code__dlv__from>\r\n"); valueXmlString.append("<cust_code__dlv__from><![CDATA[").append(checkNull(custCodeDlv)).append("]]></cust_code__dlv__from>\r\n");
valueXmlString.append("<cust_code__dlv__to><![CDATA[").append(checkNull(custCodeDlv)).append("]]></cust_code__dlv__to>\r\n"); valueXmlString.append("<cust_code__dlv__to><![CDATA[").append(checkNull(custCodeDlv)).append("]]></cust_code__dlv__to>\r\n");
//Changed by sumit on 14/05/13 adding cust_code__dlv end. //Changed by sumit on 14/05/13 adding cust_code__dlv end.
//Changed by Sneha on 16-05-2016 for tran code fliter [Start]
valueXmlString.append("<carrier_code><![CDATA[").append(checkNull(tranCode)).append("]]></carrier_code>\r\n");
//Changed by Sneha on 16-05-2016 for tran code fliter [End]
valueXmlString.append( "<single_lot protect ='0' ><![CDATA[" ).append( checkNull(singleLotSl) ).append( "]]></single_lot>\r\n" ); valueXmlString.append( "<single_lot protect ='0' ><![CDATA[" ).append( checkNull(singleLotSl) ).append( "]]></single_lot>\r\n" );
valueXmlString.append( "<master_pack_allow protect ='0' ><![CDATA[" ).append( checkNull(masterPackAllow) ).append( "]]></master_pack_allow>\r\n" ); valueXmlString.append( "<master_pack_allow protect ='0' ><![CDATA[" ).append( checkNull(masterPackAllow) ).append( "]]></master_pack_allow>\r\n" );
valueXmlString.append( "<active_pick_allow protect ='0' ><![CDATA[" ).append( checkNull(activePickAllow) ).append( "]]></active_pick_allow>\r\n" ); valueXmlString.append( "<active_pick_allow protect ='0' ><![CDATA[" ).append( checkNull(activePickAllow) ).append( "]]></active_pick_allow>\r\n" );
...@@ -487,21 +472,13 @@ etc ...@@ -487,21 +472,13 @@ etc
" AND C.WAVE_TYPE = W.WAVE_TYPE ";*/ " AND C.WAVE_TYPE = W.WAVE_TYPE ";*/
//Changed By Sankara 02/aug/13 to take single lot from saleorder[WM3DESUN002] //Changed By Sankara 02/aug/13 to take single lot from saleorder[WM3DESUN002]
//sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," + //sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," +
/*sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, S.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," + sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, S.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," +
" W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW "+ " W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW "+
" FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " + " FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE__DLV " + " AND C.CUST_CODE = S.CUST_CODE__DLV " +
" AND C.WAVE_TYPE = W.WAVE_TYPE ";*/ " AND C.WAVE_TYPE = W.WAVE_TYPE ";
//Changed by sumit on 14/05/13 modified sql and join end. //Changed by sumit on 14/05/13 modified sql and join end.
//Changed by Sneha on 16-05-2016 for tran code fliter [Start]
sSQL = " SELECT S.DUE_DATE,S.CUST_CODE,S.CUST_CODE__DLV, S.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW," +
" W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW, S.TRAN_CODE "+
" FROM SORDER S, CUSTOMER C, WAVE_TYPE W, TRANSPORTER T WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE__DLV AND S.TRAN_CODE = T.TRAN_CODE " +
" AND C.WAVE_TYPE = W.WAVE_TYPE ";
//Changed by Sneha on 16-05-2016 for tran code fliter [End]
System.out.println("queryString="+sSQL); System.out.println("queryString="+sSQL);
pstmt = conn.prepareStatement(sSQL); pstmt = conn.prepareStatement(sSQL);
pstmt.setString(1,columnValue); pstmt.setString(1,columnValue);
...@@ -519,10 +496,6 @@ etc ...@@ -519,10 +496,6 @@ etc
parcelPackAllow = rs.getString("PARCELPACK_ALLOW"); parcelPackAllow = rs.getString("PARCELPACK_ALLOW");
//Changed by sumit on 13/05/13 add cust code delivery //Changed by sumit on 13/05/13 add cust code delivery
custCodeDlv = rs.getString("CUST_CODE__DLV").trim(); custCodeDlv = rs.getString("CUST_CODE__DLV").trim();
//Changed by Sneha on 16-05-2016 for tran code fliter [Start]
tranCode = rs.getString("TRAN_CODE").trim();
//Changed by Sneha on 16-05-2016 for tran code fliter [End]
} }
if(dateFrom != null) if(dateFrom != null)
{ {
...@@ -546,10 +519,6 @@ etc ...@@ -546,10 +519,6 @@ etc
valueXmlString.append("<cust_code__dlv__to><![CDATA[").append(checkNull(custCodeDlv)).append("]]></cust_code__dlv__to>\r\n"); valueXmlString.append("<cust_code__dlv__to><![CDATA[").append(checkNull(custCodeDlv)).append("]]></cust_code__dlv__to>\r\n");
//Changed by sumit on 14/05/13 adding cust_code__dlv end. //Changed by sumit on 14/05/13 adding cust_code__dlv end.
//Changed by Sneha on 16-05-2016 for tran code fliter [Start]
valueXmlString.append("<carrier_code><![CDATA[").append(checkNull(tranCode)).append("]]></carrier_code>\r\n");
//Changed by Sneha on 16-05-2016 for tran code fliter [End]
valueXmlString.append( "<single_lot protect ='0' ><![CDATA[" ).append( checkNull(singleLotSl) ).append( "]]></single_lot>\r\n" ); valueXmlString.append( "<single_lot protect ='0' ><![CDATA[" ).append( checkNull(singleLotSl) ).append( "]]></single_lot>\r\n" );
valueXmlString.append( "<master_pack_allow protect ='0' ><![CDATA[" ).append( checkNull(masterPackAllow) ).append( "]]></master_pack_allow>\r\n" ); valueXmlString.append( "<master_pack_allow protect ='0' ><![CDATA[" ).append( checkNull(masterPackAllow) ).append( "]]></master_pack_allow>\r\n" );
valueXmlString.append( "<active_pick_allow protect ='0' ><![CDATA[" ).append( checkNull(activePickAllow) ).append( "]]></active_pick_allow>\r\n" ); valueXmlString.append( "<active_pick_allow protect ='0' ><![CDATA[" ).append( checkNull(activePickAllow) ).append( "]]></active_pick_allow>\r\n" );
...@@ -650,7 +619,7 @@ etc ...@@ -650,7 +619,7 @@ etc
} }
//Changed sumit on 24/11/12 item_changed for print label start. //Changed sumit on 24/11/12 item_changed for print label start.
//Changed by Sneha on 16-05-2016 for tran code fliter [Start] //Changed by Sneha on 16-05-2016 for carrier code fliter [Start]
else if(currentColumn.trim().equalsIgnoreCase("carrier_code")) else if(currentColumn.trim().equalsIgnoreCase("carrier_code"))
{ {
valueXmlString.append( "<item_ser__from><![CDATA[" ).append("00").append( "]]></item_ser__from>\r\n" ); valueXmlString.append( "<item_ser__from><![CDATA[" ).append("00").append( "]]></item_ser__from>\r\n" );
...@@ -674,7 +643,7 @@ etc ...@@ -674,7 +643,7 @@ etc
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" ); valueXmlString.append( "</Detail1>\r\n" );
} }
//Changed by Sneha on 16-05-2016 for tran code fliter [End] //Changed by Sneha on 16-05-2016 for carrier code fliter [End]
else if ( currentColumn.trim().equalsIgnoreCase( "print_label")) else if ( currentColumn.trim().equalsIgnoreCase( "print_label"))
{ {
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 56ccae6f
...@@ -501,6 +501,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -501,6 +501,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
//Changed by Sneha on 16-05-2016 [Start] //Changed by Sneha on 16-05-2016 [Start]
carrierCodeInput = genericUtility.getColumnValue("carrier_code",headerDom); carrierCodeInput = genericUtility.getColumnValue("carrier_code",headerDom);
if ( carrierCodeInput == null || carrierCodeInput.trim().length() == 0 )
{
carrierCodeInput = "";
}
//System.out.println(" carrier_code =========>> " + carrierCodeInput); //System.out.println(" carrier_code =========>> " + carrierCodeInput);
//Changed by Sneha on 16-05-2016 [End] //Changed by Sneha on 16-05-2016 [End]
...@@ -607,13 +611,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -607,13 +611,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+" ITEM.ITEM_CODE <=? "; +" ITEM.ITEM_CODE <=? ";
//changed by manish on 02/09/15 for Ms sql server databse[end] //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] //Changed by Sneha on 16-05-2016 for carrier code fliter in sql [Start]
projectName = distCommon.getDisparams("999999","PROJECT",conn); projectName = distCommon.getDisparams("999999","PROJECT",conn);
if("DDUK".equals(projectName.trim())) if("DDUK".equals(projectName.trim()))
{ {
getDataSql = getDataSql +" AND SORDER.TRAN_CODE = '"+carrierCodeInput+"' "; if (carrierCodeInput.trim().length() > 0)
{
getDataSql = getDataSql + " AND SORDER.TRAN_CODE = '"+carrierCodeInput+"' ";
}
} }
//Changed by Sneha on 16-05-2016 for tran code fliter in sql [End] //Changed by Sneha on 16-05-2016 for carrier code fliter in sql [End]
System.out.println("new batch id is ---"+ batchID); System.out.println("new batch id is ---"+ batchID);
if(batchID.trim().length() > 0) if(batchID.trim().length() > 0)
...@@ -7113,10 +7120,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -7113,10 +7120,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
dueDateFrom = genericUtility.getValidDateString(dueDateFrom, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); dueDateFrom = genericUtility.getValidDateString(dueDateFrom, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
dueDateTo = genericUtility.getValidDateString(dueDateTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); dueDateTo = genericUtility.getValidDateString(dueDateTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
//Changed by Sneha on 16-05-2016 for tran code fliter [Start] //Changed by Sneha on 16-05-2016 for carrier code fliter [Start]
carrierCodeInput = checkNull(genericUtility.getColumnValue("carrier_code",headerDom)); carrierCodeInput = checkNull(genericUtility.getColumnValue("carrier_code",headerDom)).trim();
//System.out.println("carrier_code ============>> " + carrierCodeInput); //System.out.println("carrier_code ============>> " + carrierCodeInput);
//Changed by Sneha on 16-05-2016 for tran code fliter [End] //Changed by Sneha on 16-05-2016 for carrier code fliter [End]
shipType = genericUtility.getColumnValue("ship_type",headerDom); shipType = genericUtility.getColumnValue("ship_type",headerDom);
directPickLoc = genericUtility.getColumnValue("direct_pick_loc",headerDom); directPickLoc = genericUtility.getColumnValue("direct_pick_loc",headerDom);
...@@ -7175,9 +7182,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -7175,9 +7182,9 @@ 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,REMARKS)" + //"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)" +
//Changed by Sneha on 16-05-2016 for tran code fliter [Start] //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 " ;
//Changed by Sneha on 16-05-2016 for tran code fliter [End] //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. // Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing.
//Changes by Dadaso pawar on 17/03/15 [Start] //Changes by Dadaso pawar on 17/03/15 [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