Commit f42561eb authored by ppatro's avatar ppatro

Parcel Picking


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92477 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6b4b01d9
......@@ -127,8 +127,7 @@ etc
String saleOrderTo = "";
String printLabel = "";//Added by sumit on 24/11/12
String waveMode = ""; //Added by sumit 06/12/12
String parcelPackAllow = "";//Addded by sumit 20/12/12
String parcelPackAllow = "";//Added by sumit 29/12/12
try
{
String applDateFmt = genericUtility.getApplDateFormat();
......@@ -179,14 +178,13 @@ etc
//Changed by sumit on 18/09/12 for single lot and Packing allow end.
//Changed by sumit on 18/09/12 adding print_label and printer name start.
valueXmlString.append( "<print_label protect ='1'><![CDATA[" ).append( "" ).append( "]]></print_label>\r\n" );
valueXmlString.append( "<printer_name protect ='1'><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" );
valueXmlString.append( "<printer_name protect ='1'><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" );
//Changed by sumit on 18/09/12 adding print_label and printer name end.
//Changed by sumit on 29/12/12 adding parcel packing start.
valueXmlString.append( "<parcelpack_allow protect ='1'><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
valueXmlString.append( "<master_override><![CDATA[" ).append( "N" ).append( "]]></master_override>\r\n" );
valueXmlString.append( "<parcel_override><![CDATA[" ).append( "N" ).append( "]]></parcel_override>\r\n" );
//Changed by sumit on 29/12/12 adding parcel packing end.
valueXmlString.append("<parcelpack_allow protect ='1'><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
valueXmlString.append("<master_override><![CDATA[").append("N").append("]]></master_override>\r\n");
valueXmlString.append("<parcel_override><![CDATA[").append("N").append("]]></parcel_override>\r\n");
valueXmlString.append( "</Detail1>\r\n" );
}
//Changed By Pragyan 21/06/12 Statrt
......@@ -205,6 +203,8 @@ etc
System.out.println("Hello sale_order__from2");
//Changed by sumit 20/09/12 getting cust code start.
//sSQL = "SELECT DUE_DATE FROM SORDER WHERE SALE_ORDER = ?";
//Changed by sumit on 29/12/12 changing sql for parcel picking
//sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW" +
sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW " +
" FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE " +
......@@ -242,7 +242,8 @@ etc
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( "<stock_to_dock_allow protect ='0' ><![CDATA[" ).append( checkNull(stockToDockAllow) ).append( "]]></stock_to_dock_allow>\r\n" );
valueXmlString.append( "<parcelpack_allow protect ='0' ><![CDATA[" ).append( checkNull(parcelPackAllow) ).append( "]]></parcelpack_allow>\r\n" );
//Changed by sumit on 29/12/12 display parcel pick allow
valueXmlString.append("<parcelpack_allow protect ='0' ><![CDATA[").append(checkNull(parcelPackAllow)).append("]]></parcelpack_allow>\r\n");
}
else
{
......@@ -251,8 +252,9 @@ etc
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( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
//Changed by sumit on 29/12/12 display parcel pick allow
valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
}
System.out.println("Hello sale_order__from4");
if(pstmt!=null)
......@@ -276,7 +278,8 @@ etc
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" );
//Changed by sumit on 29/12/12 display parcel pick allow
valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
}
}
else
......@@ -289,8 +292,9 @@ etc
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" );
//Changed by sumit on 20/09/12 setting value of cust_code__to in case of no data.
valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
//Changed by sumit on 20/09/12 setting value of cust_code__to in case of no data.
//Changed by sumit on 29/12/12 display parcel pick allow
valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
}
valueXmlString.append( "</Detail1>\r\n" );
......@@ -311,9 +315,9 @@ etc
System.out.println("Hello sale_order__from2");
//Changed by sumit 20/09/12 getting cust code start.
//sSQL = "SELECT DUE_DATE FROM SORDER WHERE SALE_ORDER = ?";
//Changed by sumit 20/09/12 getting cust code start.
//sSQL = "SELECT DUE_DATE FROM SORDER WHERE SALE_ORDER = ?";
sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW " +
//
//sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW " +
sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW "+
" FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE " +
" AND C.WAVE_TYPE = W.WAVE_TYPE ";
......@@ -348,7 +352,8 @@ etc
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( "<stock_to_dock_allow protect ='0' ><![CDATA[" ).append( checkNull(stockToDockAllow) ).append( "]]></stock_to_dock_allow>\r\n" );
valueXmlString.append( "<parcelpack_allow protect ='0' ><![CDATA[" ).append( checkNull(parcelPackAllow) ).append( "]]></parcelpack_allow>\r\n" );
//Changed by sumit on 29/12/12 display parcel pick allow
valueXmlString.append("<parcelpack_allow protect ='0' ><![CDATA[").append(checkNull(parcelPackAllow)).append("]]></parcelpack_allow>\r\n");
}
else
{
......@@ -357,8 +362,9 @@ etc
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( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
//Changed by sumit on 29/12/12 display parcel pick allow
valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
}
//System.out.println("Hello sale_order__from4");
}
......@@ -372,7 +378,8 @@ etc
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" );
//Changed by sumit on 29/12/12 display parcel pick allow
valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
}
......@@ -399,7 +406,8 @@ etc
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" );
//Changed by sumit on 29/12/12 display parcel pick allow
valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
}
valueXmlString.append( "</Detail1>\r\n" );
......@@ -849,39 +857,6 @@ etc
}
}
}
else if ( "parcelpack_allow".equalsIgnoreCase( childNodeName ) )
{
stockToDockAllow = checkNull(genericUtility.getColumnValue( "parcelpack_allow", currFormDataDom ));
custCode = genericUtility.getColumnValue( "cust_code__from", currFormDataDom );
if(stockToDockAllow.trim().length() > 0 )
{
sql = "SELECT C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW " +
"FROM CUSTOMER C, WAVE_TYPE W WHERE C.WAVE_TYPE = W.WAVE_TYPE AND C.CUST_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
rs = pstmt.executeQuery();
if( rs.next())
{
if( !stockToDockAllow.equalsIgnoreCase(rs.getString("PARCELPACK_ALLOW")))
{
//errList.add( "STOCK2DOC" );
errFields.add( childNodeName.toLowerCase() );
errList.add( "CHSINGLELT" );
//errFields.add( "" );
}
}
if( rs != null )
{
rs.close();
rs = null;
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
}
}
//Changed by sumit on 03/10/12 validating printer service name with existing printer in system start.
//Changed by sumit on 24/11/12 changing field name
//else if ( "printer".equalsIgnoreCase( childNodeName ) )
......
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