changd by sankara on 13/10/14 updated shipmentconf for is loading condition

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

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

@@ -178,6 +178,11 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 			conn = connDriver.getConnectDB( "DriverITM" );
 			String userID = genericUtility.getValueFromXTRA_PARAMS( xtraParam, "LoginCode" );
 			System.out.println(" forced flag:::>>>>:: ["+forcedFlag+"]");
+			//changed by sankara on 10/10/14 for adeded condition isLoading
+			String isLoading = genericUtility.getValueFromXTRA_PARAMS( xtraParam, "isLoading" );
+			//Changed by Pragyan
+			isLoading = isLoading == null?"N":isLoading;
+			System.out.println("isLoading:::::"+isLoading);
 			ITMDBAccessLocal itmDBAccessLocal = new ITMDBAccessEJB();
 			
 			//changed by sankara on 22/09/14 for site transporter start.
@@ -252,7 +257,9 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 			
 					if(("".equalsIgnoreCase(refSer.trim())) || ("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) ))
 					{
-						
+						//changed by sankara on 10/10/14 for added isloading condition
+						if( !"Y".equalsIgnoreCase(isLoading) )
+						{
 							if(noOfPallet <= 0 && !refSer.trim().equalsIgnoreCase("S-DSP"))
 							{
 							
@@ -336,7 +343,33 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 							rs = null;
 							pstmt.close();
 							pstmt = null;
+						} //changed by sankara on 10/10/14 for added isloading condition end	
+						//changed by sankara on 10/10/14 for added isloading condition start. 
+						else
+						{
+							sql = "SELECT CONSIGNEE_NAME,ADDR1,ADDR2,ADDR3,LORRY_NO,TRAN_CODE,LR_NO,LR_DATE, PRO_NO  FROM SHIPMENT WHERE SHIPMENT_ID = ? ";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, tranId);
+							rs = pstmt.executeQuery();
+							if( rs.next() )
+							{
 							
+								custName = checkNull(rs.getString("CONSIGNEE_NAME")).trim();
+								shipAdd1 = checkNull(rs.getString("ADDR3")).trim();
+								shipAdd2 = checkNull(rs.getString("ADDR2")).trim();
+								shipAdd3 = checkNull(rs.getString("ADDR1")).trim();
+								lorryNo = checkNull(rs.getString("LORRY_NO"));
+								tranCode = checkNull(rs.getString("TRAN_CODE"));
+								lrNo = checkNull(rs.getString("LR_NO"));
+								lrDate = rs.getTimestamp("LR_DATE");
+								proNo = checkNull(rs.getString("PRO_NO"));
+							}
+							rs.close();
+							rs = null;
+							pstmt.close();
+							pstmt = null;
+						}
+						//changed by sankara on 10/10/14 for added isloading condition end. 
 					}//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 = ?";
@@ -349,7 +382,10 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 					}
 					rs.close();rs = null;
 					pstmt.close();pstmt = null;
-					if( noOfPallet != count && !("S-DSP".equalsIgnoreCase(refSer.trim())))
+					
+				//  changed by sankara on 10/10/14 for added loading condition	
+				//	if( noOfPallet != count && !("S-DSP".equalsIgnoreCase(refSer.trim()))
+					if( noOfPallet != count && !("S-DSP".equalsIgnoreCase(refSer.trim())) && !"Y".equalsIgnoreCase(isLoading) )
 					{
 						errString = itmDBAccessLocal.getErrorString("","NOOFPALLET","");
 					}