changed by sankara on 20/01/2014 updated wavegeneprc,shipmentconf,replissic...

changed by sankara on 20/01/2014 updated wavegeneprc,shipmentconf,replissic and messages sql given by pragyan


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

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

@@ -410,14 +410,15 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 									}
 									else
 									{
-										errList.add( "ACTIVEPICK" );
+										errList.add( "VTACTREPLO" );
 										errFields.add( childNodeName.toLowerCase() );
 									}
 								}
 								//Changed By Pragyan 
 								//else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") &&  ! orderType.trim().equalsIgnoreCase("M") &&  ! orderType.trim().equalsIgnoreCase("E")  &&  ! orderType.trim().equalsIgnoreCase("F")  &&  ! orderType.trim().equalsIgnoreCase("G")  &&  ! orderType.trim().equalsIgnoreCase("H")  &&  ! orderType.trim().equalsIgnoreCase("J")  &&  ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") )//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if
 								//Changed by Rohan on 05-09-12 for stock to dock replanishment
-								else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") &&  ! orderType.trim().equalsIgnoreCase("M") &&  ! orderType.trim().equalsIgnoreCase("E")  &&  ! orderType.trim().equalsIgnoreCase("F")  &&  ! orderType.trim().equalsIgnoreCase("G")  &&  ! orderType.trim().equalsIgnoreCase("H")  &&  ! orderType.trim().equalsIgnoreCase("J")  &&  ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") && ! orderType.trim().equalsIgnoreCase("Q")  && ! orderType.trim().equalsIgnoreCase("D") && ! orderType.trim().equalsIgnoreCase("L"))//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if		
+								//else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") &&  ! orderType.trim().equalsIgnoreCase("M") &&  ! orderType.trim().equalsIgnoreCase("E")  &&  ! orderType.trim().equalsIgnoreCase("F")  &&  ! orderType.trim().equalsIgnoreCase("G")  &&  ! orderType.trim().equalsIgnoreCase("H")  &&  ! orderType.trim().equalsIgnoreCase("J")  &&  ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") && ! orderType.trim().equalsIgnoreCase("Q")  && ! orderType.trim().equalsIgnoreCase("D") && ! orderType.trim().equalsIgnoreCase("L"))//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if		
+								else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") &&  ! orderType.trim().equalsIgnoreCase("M") &&  ! orderType.trim().equalsIgnoreCase("E")  &&  ! orderType.trim().equalsIgnoreCase("F")  &&  ! orderType.trim().equalsIgnoreCase("G")  &&  ! orderType.trim().equalsIgnoreCase("H")  &&  ! orderType.trim().equalsIgnoreCase("J")  &&  ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") &&  ! orderType.trim().equalsIgnoreCase("D") && ! orderType.trim().equalsIgnoreCase("L"))//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if
 								{
 									/*System.out.println("equals ignores case");
 									errList.add( "CASEPICK" );
@@ -433,7 +434,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 									else
 									{
 										System.out.println("equals ignores case");
-										errList.add( "CASEPICK" );
+										errList.add( "VTCASREPLO" );
 										errFields.add( childNodeName.toLowerCase() );
 									}
 								}

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

@@ -302,7 +302,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 						pstmt.close();
 						pstmt = null;
 											
-					}
+					}//if(("".equalsIgnoreCase(refSer.trim())) || ("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) ))
 					
 					sql = "SELECT COUNT(*) as COUNT FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ?";
 					pstmt = conn.prepareStatement(sql);
@@ -3065,7 +3065,10 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 		ResultSet rs = null;
 		//changed by sankara on 03/01/14 for update pro_no
 		String shiprono = "";
+		String adsiFlag = "N";
 		System.out.println(" sumit inside update shipment ");
+		
+		
 		try
 		{
 			
@@ -3086,7 +3089,50 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 			{
 				pstmt.close();
 				pstmt = null;
-			}				
+			}
+			
+			
+			//changed by sankara on 03/01/14 for update pro_no end.
+			sql = "SELECT tran_name, PRONO_LAST , PRONO_FROM, PREFIX,ADSI_FLAG FROM transporter WHERE tran_code = ? ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, tranCode);
+			rs = pstmt.executeQuery();
+			if( rs.next() )
+			{				
+				descr = rs.getString(1);
+				descr1 = rs.getString(2);
+				prefix = rs.getString(4);
+				adsiFlag = rs.getString(5);
+				if(descr1 == null || descr1.trim().length() == 0)
+				{
+					descr1 = checkNull(rs.getString(3));
+				}
+			}
+			if( rs != null)
+			{
+				rs.close();
+				rs = null;
+			}
+			if( pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}
+			
+			if("Y".equalsIgnoreCase(adsiFlag))
+			{
+				return 0;
+			}
+		
+			if(descr1.trim().length() > 0)
+			{
+				pronoLast = Long.parseLong(descr1) + 1;				
+			}
+		
+			
+			
+			
+			
 			//changed by sankara on 03/01/14 for update pro_no start.
 			sql = " SELECT PRO_NO FROM SHIPMENT WHERE SHIPMENT_ID = ? ";
 			pstmt = conn.prepareStatement(sql);
@@ -3106,7 +3152,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 				pstmt.close();
 				pstmt = null;
 			}			
-			//changed by sankara on 03/01/14 for update pro_no end.
+			/*//changed by sankara on 03/01/14 for update pro_no end.
 			sql = "SELECT tran_name, PRONO_LAST , PRONO_FROM, PREFIX FROM transporter WHERE tran_code = ? ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranCode);
@@ -3136,7 +3182,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 			{
 				pronoLast = Long.parseLong(descr1) + 1;				
 			}
-			// changed by sankara on 03/01/14 for update pro_no 	
+		*/	// changed by sankara on 03/01/14 for update pro_no 	
 			//if(pronoLast != 0)
 			//{
 				//valueXmlString.append( "<lr_no><![CDATA[" ).append( pronoLast ).append( "]]></lr_no>\r\n" ); // commented to generate SSCC18 complaint number

webitm-wms/module-resource/sql/update.sql

@@ -44991,4 +44991,64 @@ commit;
         'Base ',
         NULL,
         NULL);
-  commit;      
\ No newline at end of file
+  commit;      
+  -- changed by sankara on 20/01/2014 update messages sql given by pragyan.
+   INSERT INTO messages (
+	msg_no ,
+	msg_str ,
+	msg_descr ,
+	msg_type ,
+	msg_opt ,
+	msg_time ,
+	alarm ,
+	err_source ,
+	chg_date ,
+	chg_user ,
+	chg_term ,
+	override_input ,
+	mail_option )
+ VALUES (
+        'VTACTREPLO',
+        'Invalid Replineshment Order',
+        'Entered Replenishment order is not an Active Replenishment Order',
+        'E',
+        'Y',
+        NULL,
+        NULL,
+        NULL,
+        fn_sysdate(),
+        'Base ',
+        'Base ',
+        NULL,
+        NULL);
+		
+INSERT INTO messages (
+	msg_no ,
+	msg_str ,
+	msg_descr ,
+	msg_type ,
+	msg_opt ,
+	msg_time ,
+	alarm ,
+	err_source ,
+	chg_date ,
+	chg_user ,
+	chg_term ,
+	override_input ,
+	mail_option )
+ VALUES (
+        'VTCASREPLO',
+        'Invalid Replenishment Order',
+        'Entered Replenishment order is an Active Replenishment Order',
+        'E',
+        'Y',
+        NULL,
+        NULL,
+        NULL,
+        fn_sysdate(),
+        'Base ',
+        'Base ',
+        NULL,
+        NULL);
+		
+commit;
\ No newline at end of file