Changes made to generate wave task from distribution order

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@182677 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/ibase/webitm/ejb/wms/WaveGenerationIC.java

@@ -240,8 +240,8 @@ etc
 						{
 							valueXmlString.append( "<Detail1 domID='1' >\r\n" );
 							valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\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_ser__from protect='0'><![CDATA[" ).append( "00" ).append( "]]></item_ser__from>\r\n" );
+							valueXmlString.append( "<item_ser__to protect='0'><![CDATA[" ).append( "ZZ" ).append( "]]></item_ser__to>\r\n" );
 							valueXmlString.append( "<sort_order><![CDATA[" ).append( "Default" ).append( "]]></sort_order>\r\n" );
 							valueXmlString.append( "<product_style__from><![CDATA[" ).append( "00" ).append( "]]></product_style__from>\r\n" );
 							valueXmlString.append( "<product_style__to><![CDATA[" ).append( "ZZ" ).append( "]]></product_style__to>\r\n" );
@@ -266,10 +266,8 @@ etc
 							valueXmlString.append( "<print_label protect ='1'><![CDATA[" ).append( "N" ).append( "]]></print_label>\r\n" );
 							valueXmlString.append( "<printer_name protect ='1'><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" );
 							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("<ship_type><![CDATA[").append("A").append("]]></ship_type>\r\n");
-							valueXmlString.append("<consolidate_repl><![CDATA[").append("N").append("]]></consolidate_repl>\r\n");
+							valueXmlString.append("<order_type protect='0'><![CDATA[]]></order_type>\r\n");
 							valueXmlString.append( "</Detail1>\r\n" );
 						}
 						else if("D".equalsIgnoreCase(columnValue))
@@ -302,10 +300,7 @@ etc
 							valueXmlString.append("<print_label><![CDATA[" ).append( "N" ).append( "]]></print_label>\r\n" );
 							valueXmlString.append("<printer_name><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" );
 							valueXmlString.append("<parcelpack_allow><![CDATA[N]]></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("<ship_type><![CDATA[").append("A").append("]]></ship_type>\r\n");
-							valueXmlString.append("<consolidate_repl><![CDATA[").append("N").append("]]></consolidate_repl>\r\n");
 							valueXmlString.append("<order_type protect='1'><![CDATA[]]></order_type>\r\n");
 							valueXmlString.append("</Detail1>\r\n" );
 						}

webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java

@@ -404,24 +404,34 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			//Added by Santosh on 19/02/2018 to generate wave from dist_order[End]
 			
 			System.out.println("postOrderFg ::["+ postOrderFg + "] waveOn["+waveOn+"]");
-			itemSerFr = genericUtility.getColumnValue("item_ser__from",headerDom);
-			if ( itemSerFr == null || itemSerFr.trim().length() == 0 )
+			//Added and changed by Santosh on 26/03/2018 to generate wave task on dist order[Start]
+			if("S".equalsIgnoreCase(waveOn))
 			{
-				itemSerFr = "";
-				System.out.println("Item Series From is Null...");
-				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
-				return errString;
+				itemSerFr = genericUtility.getColumnValue("item_ser__from",headerDom);
+				if ( itemSerFr == null || itemSerFr.trim().length() == 0 )
+				{
+					itemSerFr = "";
+					System.out.println("Item Series From is Null...");
+					errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+					return errString;
+				}
+				System.out.println("Item Ser FR "+ itemSerFr);
+				itemSerTo = genericUtility.getColumnValue("item_ser__to",headerDom);
+				if ( itemSerTo == null || itemSerTo.trim().length() == 0 )
+				{
+					itemSerTo = "";
+					System.out.println("Item Series To is Null...");
+					errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+					return errString;
+				}
+				System.out.println("Item Ser To"+itemSerTo);
 			}
-			System.out.println("Item Ser FR "+ itemSerFr);
-			itemSerTo = genericUtility.getColumnValue("item_ser__to",headerDom);
-			if ( itemSerTo == null || itemSerTo.trim().length() == 0 )
+			else if("D".equalsIgnoreCase(waveOn))
 			{
-				itemSerTo = "";
-				System.out.println("Item Series To is Null...");
-				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
-				return errString;
+				itemSerFr = "00";
+				itemSerTo = "ZZ";
 			}
-			System.out.println("Item Ser To"+itemSerTo);
+			//Added and changed by Santosh on 26/03/2018 to generate wave task on dist order[End]
 			custCodeFr = genericUtility.getColumnValue("cust_code__from",headerDom);
 			if ( custCodeFr == null || custCodeFr.trim().length() == 0 )
 			{