Update by sumit on 05/04/13 against issue tracker point 180, and visible no_art

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

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

@@ -284,6 +284,27 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 						pstmt = null;						
 						//Changed by sumit on 28/02/13 adding validation where pick deallocated end
 						
+						//Changed by sumit on 05/04/13 adding validation where pick deallocated start							
+						sql =   "SELECT STATUS FROM WAVE_TASK_DET WHERE REF_ID = ? ";					    
+						pstmt = conn.prepareStatement( sql );
+						pstmt.setString( 1, pickOrder );
+						rs = pstmt.executeQuery();
+						if( rs.next() )
+						{				
+							status = rs.getString("STATUS");
+							System.out.println(" status ["+status+"]");
+							if("Y".equalsIgnoreCase(status))
+							{
+								errList.add( "VTPKORDC" );
+								errFields.add( childNodeName.toLowerCase() );
+							}
+						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;						
+						//Changed by sumit on 05/04/13 adding validation where pick deallocated end
+						
 
 						// added by cpatil on 11-sept-12 start for pick_id validate
 						sql = "SELECT count(1) FROM PICK_ORD_HDR WHERE PICK_ORDER = ?";
@@ -604,7 +625,24 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 							rs.close(); rs = null;
 							pstmt.close(); pstmt = null;
 
-
+							//Changed by sumit on 04/04/13 adding validation , user can asign same pallet_no to other pick of same ptcn start.
+							sql = "SELECT DISTINCT PTCN FROM WAVE_TASK_DET WHERE REF_ID IN (SELECT DISTINCT PICK_ORDER FROM PICK_ISS_HDR WHERE PALLET_NO = ?)";
+							pstmt = conn.prepareStatement( sql );
+							pstmt.setString(1, palletNoDom.trim());
+							rs = pstmt.executeQuery();
+							while( rs.next())
+							{
+								String tempPTCN = "";
+								tempPTCN = rs.getString("PTCN");
+								if( !tempPTCN.equalsIgnoreCase(ptcn))
+								{
+									errList.add( "INVPALLFPI" );
+									errFields.add( childNodeName.toLowerCase() );
+								}								
+							}
+							rs.close(); rs = null;
+							pstmt.close(); pstmt = null;
+							//Changed by sumit on 04/04/13 adding validation , user can asign same pallet_no to other pick of same ptcn  end.
 
 							// added by cpatil for validate pallet_no from pallet_no on 10-Jun-12  start
 							//if (!"M".equals(pickType))
@@ -647,7 +685,7 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 								//{
 									//palletNoDb = checkNull(rs.getString("PALLET_NO"));
 									//System.out.println("pallet no db ="+palletNoDb);
-									//if(palletNoDb.trim().length() > 0)
+									//if(palletNoDb.trim().length() > 0)									
 									if( palletNoDom != null )
 									{
 										sql1="select status from pallet_no where pallet_no =  ? ";//change by Kunal M on 30/07/12 as per S Manoharan Sir intruction
@@ -672,7 +710,7 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 										//errList.add( "INVPLTNOU" );
 										errList.add( "INVPLTNUS" );
 										errFields.add( childNodeName.toLowerCase() );
-									}
+									}									
 									/*else if ( (palletNoDom.trim().length() > 0 &&  ! palletNoDom.trim().equalsIgnoreCase(palletNoDb))  )
 									{
 										System.out.println("Unmatch PALLET NO ");

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

@@ -37901,6 +37901,37 @@ VALUES (
 -- changed by sumit on 03/apr/13 
 	UPDATE obj_forms SET SCAN_METADATA = '<SCAN_INFO><MAPPING_SCAN ORDER="1"><SCAN_LABEL>Location From:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD>loc_code</FIELD></FIELDS></MAPPING_SCAN><MAPPING_SCAN ORDER="2"><SCAN_LABEL>LPN Number:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD>lot_sl</FIELD></FIELDS></MAPPING_SCAN><MAPPING_SCAN ORDER="3"><SCAN_LABEL>Item Code:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD ORDER="0" start="6" end="15" >item_code</FIELD></FIELDS></MAPPING_SCAN><MAPPING_SCAN ORDER="4"><SCAN_LABEL>Lot Number:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD ORDER="0" start="13" end="22" >lot_no</FIELD></FIELDS></MAPPING_SCAN><INPUT_SCAN ORDER="1"><SCAN_LABEL>New LPN:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD>lot_sl__new</FIELD></FIELDS></INPUT_SCAN><INPUT_SCAN ORDER="2"><SCAN_LABEL>No of CASE</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD>no_art</FIELD></FIELDS></INPUT_SCAN><SCAN_CONDITION field="lot_sl__new">order_type == "Q" || order_type == "E" || order_type == "P"</SCAN_CONDITION></SCAN_INFO>'
  WHERE win_name ='w_active_repl_iss' AND FORM_NO = 3;
+ 
+ 
+ -- update by sumit on 05-apr-13 
+ 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 (
+	'INVPALLFPI',
+	'Invalid Pallet number',
+	'Scan pallet number already asign to other pick order of different PTCN',
+	'E',
+	'E',
+	NULL,
+	NULL,
+	NULL,
+	TO_DATE('13-02-2008 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+	'BASE',
+	'BASE',
+	NULL,
+	NULL);
 	
 commit;