changed by sankara on 09/10/14 updated source of transporter code

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

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

@@ -2471,6 +2471,136 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
 					valueXmlString.append( "<freight_amt_add><![CDATA[" ).append(freightamount).append( "]]></freight_amt_add>\r\n" );
 					//changed by sankara on 03/01/14 display despatch freight_amt_add in ship_docs end.
 				}
+				//changed by sankara on 08/10/14 for set tran_code in case of D-ISS and C-ISS start.
+				else if( currentColumn.trim().equalsIgnoreCase( "ref_id" ) )
+				{				
+					columnValue = genericUtility.getColumnValue("ref_ser",dom);
+					columnValue1 = genericUtility.getColumnValue("ref_id",dom);
+					System.out.println("refid::::::::::"+columnValue);
+					System.out.println("refseries::::::::::"+columnValue1);
+					
+					if(columnValue1 != null && columnValue1.trim().length() > 0 )
+					{						
+						if("C-ISS".equalsIgnoreCase(columnValue))
+						{
+							sql = " SELECT TRAN_CODE FROM CONSUME_ISS WHERE CONS_ISSUE = ? ";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, columnValue1);
+							rs = pstmt.executeQuery();
+							if( rs.next() )
+							{
+								tranCode = checkNull(rs.getString("TRAN_CODE"));
+								System.out.println("tranCodeconsissue:::::::"+tranCode);
+							}
+							rs.close();
+							rs = null;
+							pstmt.close();
+							pstmt = null;
+						}
+						if("D-ISS".equalsIgnoreCase(columnValue))
+						{
+							sql = "SELECT TRAN_CODE FROM DISTORD_ISS WHERE TRAN_ID = ? ";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, columnValue1);
+							rs = pstmt.executeQuery();
+							if( rs.next() )
+							{
+								tranCode = checkNull(rs.getString("TRAN_CODE"));
+								System.out.println("tranCodedistbution:::::::"+tranCode);
+							}
+							rs.close();
+							rs = null;
+							pstmt.close();
+							pstmt = null;
+						}
+						if("S-DSP".equalsIgnoreCase(columnValue))
+						{
+							sql = "SELECT TRAN_CODE FROM DESPATCH WHERE DESP_ID = ? ";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, columnValue1);
+							rs = pstmt.executeQuery();
+							if( rs.next() )
+							{
+								tranCode = checkNull(rs.getString("TRAN_CODE"));
+								System.out.println("tranCodemanualdespatch:::::::"+tranCode);
+							}
+							rs.close();
+							rs = null;
+							pstmt.close();
+							pstmt = null;
+						}
+						
+						if(tranCode != null && tranCode.trim().length() >0)
+						{		
+							valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
+
+							sql = "SELECT TRAN_NAME FROM TRANSPORTER WHERE TRAN_CODE = ? ";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, tranCode);
+							rs = pstmt.executeQuery();
+							if( rs.next() )
+							{
+								tranName=rs.getString(1);
+							}
+							rs.close();
+							rs = null;
+							pstmt.close();
+							pstmt = null;
+
+							tranCodeHdr = genericUtility.getColumnValue("tran_code", dom1);
+							System.out.println("Header tran code:"+tranCodeHdr);
+
+							if(tranCodeHdr != null && tranCodeHdr.trim().length() > 0 )
+							{
+								if( tranCodeHdr.equalsIgnoreCase(tranCode))
+								{
+									System.out.println("18/06/14 checked in if");								
+									valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
+									valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( checkNull( tranName) ).append( "]]></transporter_tran_name>\r\n" );													
+								}
+								else
+								{
+									System.out.println("18/06/14 checked in else");
+									System.out.println("@@@@@ tran_code of detail is different from header tran_code");
+									valueXmlString.append( "</Detail2>\r\n" );
+									valueXmlString.append( "<Detail1>\r\n" );
+									valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
+									valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( checkNull( tranName) ).append( "]]></transporter_tran_name>\r\n" );
+									valueXmlString.append( "</Detail1>\r\n" );
+									valueXmlString.append( "<Detail2>\r\n" );
+									valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
+									valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( checkNull( tranName) ).append( "]]></transporter_tran_name>\r\n" );
+								}
+							}
+							else
+							{
+								valueXmlString.append( "</Detail2>\r\n" );
+								valueXmlString.append( "<Detail1>\r\n" );
+								valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
+								valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( checkNull( tranName) ).append( "]]></transporter_tran_name>\r\n" );
+								valueXmlString.append( "</Detail1>\r\n" );
+								valueXmlString.append( "<Detail2>\r\n" );
+								valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
+								valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( checkNull( tranName) ).append( "]]></transporter_tran_name>\r\n" );
+							}
+						} //if(tranCode != null && tranCode.trim().length() >0)
+						else
+						{
+							//valueXmlString.append( "<ref_id><![CDATA[" ).append( "" ).append( "]]></ref_id>\r\n" );
+							valueXmlString.append( "<tran_code><![CDATA[" ).append( "" ).append( "]]></tran_code>\r\n" );
+							valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( "").append( "]]></transporter_tran_name>\r\n" );
+						}
+
+					} //if( rs.next() )
+					else
+					{
+						valueXmlString.append( "<ref_id><![CDATA[" ).append( "" ).append( "]]></ref_id>\r\n" );
+						valueXmlString.append( "<tran_code><![CDATA[" ).append( "" ).append( "]]></tran_code>\r\n" );
+						valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( "").append( "]]></transporter_tran_name>\r\n" );
+
+					}
+				}
+				//changed by sankara on 08/10/14 for set tran_code in case of D-ISS and C-ISS end.
 				//changed by sankara on 26/06/14 for transporter code in shipment detail end.		
 				else if( currentColumn.trim().equalsIgnoreCase( "curr_code" ) )
 				{

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

@@ -239,6 +239,39 @@ public class ShipmentPos extends ValidatorEJB implements ShipmentPosLocal, Shipm
 			pstmt = null;*/
 			//changed by sankara on 07/jun/14 this code is excuted in side despatch case only 
 			//Changed by Rohan to update gross weight in shipment content from shipment header.end
+			
+			//changed by sankara on 08/10/14 for update tran_code in C-ISS AND D-ISS if tran_code is changed in shipment start.		
+			if("C-ISS".equalsIgnoreCase(refSeries.trim()) || "D-ISS".equalsIgnoreCase(refSeries.trim())  )
+			{
+				NodeList detail2List = dom.getElementsByTagName("Detail2");
+				parentNodeListLength = detail2List.getLength();			
+				for(int row = 0; row < parentNodeListLength; row++)
+				{				
+					refid = GenericUtility.getInstance().getColumnValueFromNode("ref_id", dom.getElementsByTagName("Detail2").item(row));
+				    System.out.println("refid:::::::"+refid);
+				}
+			}		
+			if("C-ISS".equalsIgnoreCase(refSeries.trim()) )
+			{
+				sql = " UPDATE CONSUME_ISS SET TRAN_CODE = ? WHERE CONS_ISSUE = ? ";  //C-ISS
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, transporterCode);
+				pstmt.setString(2, refid);
+				desupdCnt = pstmt.executeUpdate();
+				pstmt.close();
+				pstmt = null;
+			}	
+			if("D-ISS".equalsIgnoreCase(refSeries.trim()) )
+			{
+				sql = " UPDATE DISTORD_ISS SET TRAN_CODE = ? WHERE TRAN_ID = ? ";  //D-ISS
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, transporterCode);
+				pstmt.setString(2, refid);
+				desupdCnt = pstmt.executeUpdate();
+				pstmt.close();
+				pstmt = null;	
+			}	
+			//changed by sankara on 08/10/14 for update tran_code in C-ISS AND D-ISS if tran_code is changed in shipment end.		
 		}
 		catch(Exception e)
 		{

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

@@ -101,7 +101,13 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 	        	if(!"D".equalsIgnoreCase(updateFlag))
 	        	{
 	        		tempPtcn = GenericUtility.getInstance().getColumnValueFromNode("ptcn", dom.getElementsByTagName("Detail2").item(row));
-	        		ptcn.add(tempPtcn);	     
+	        		//changed by sankara on 08/10/14 if ptcn found null start.
+	        		//ptcn.add(tempPtcn);	     
+	        		if( tempPtcn != null && tempPtcn.trim().length() > 0 )
+	        		{
+	        			ptcn.add(tempPtcn);	     
+	        		}
+	        		//changed by sankara on 08/10/14 if ptcn found null end.    
 	        		tranCode = GenericUtility.getInstance().getColumnValueFromNode("tran_code", dom.getElementsByTagName("Detail2").item(row));
 	        		tranCodeSet.add(tranCode);
 	        		

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

@@ -49885,7 +49885,7 @@ INSERT INTO genmst VALUES (
 	'VTSHLFLTYP',
 	'N',
 	'C',
-	'select count(*) from dual where ''E'' not in (''E'',''R'')' ,
+	'select count(*) from dual where ? not in (''E'',''R'')' ,
 	'0',
 	'Q',
 	TO_DATE('22-09-2014 23:57:20','DD-MM-YYYY HH24:MI:SS'),
@@ -49972,7 +49972,28 @@ values ('TRAN_TYPE','W_RMPM_PORCP_WIZ','CW','CAPITAL WORK IN PROGRESS','CAPITAL
  
   
   commit;
- --End  Dhanraj on 08-SEP-14 
+ --End  Dhanraj on 08-SEP-14
+  --changed by sankara on 09/10/14updated sql
+ update obj_forms set disp_metadata ='checkedImage@img<item_code>, <lot_no__fr>, <lot_sl__fr>, <quantity>, <unit>'
+where win_name ='w_stocktransfer_multi_wiz'
+and form_no ='3'; 
+
+update obj_forms set disp_metadata ='checkedImage@img<lot_no__to>, <lot_sl__to>, <quantity>, <unit> = <loc_code__sys>'
+where win_name ='w_stocktransfer_multi_wiz'
+and form_no ='4'; 
+
+INSERT INTO obj_itemchange (
+	obj_name ,
+	form_no ,
+	field_name ,
+	mandatory )
+ VALUES (
+	'shipment',
+	'2  ',
+	'ref_id',
+	NULL);
+commit;
+