update on 13/03/13 if req.id [WM3ASUN007] pro_no not update properly

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

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

@@ -57,6 +57,8 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 		String confirmed = "";
 		String newErro = "";
 		//Changed by sumit on 05/10/12 created ref_ser variable 
+		//Changed by sumit on 13/03/13 of Req.Id [WM3ASUN007] adding variable for CHK_DIGIT_YN
+		String chDigitYn = "";
 		String refSer = "", refSerNew = "";
 		int noOfPallet = 0, count = 0;
 		ArrayList<String> errList = new ArrayList<String>();
@@ -144,13 +146,17 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 			
 						//Changed by sumit on 28/09/12 wrong sql
 						//sql = "SELECT PRONO_LASTe FROM transporter WHERE tran_code = ? ";
-						sql = "SELECT PRONO_LAST FROM transporter WHERE tran_code = ? ";
+						//sql = "SELECT PRONO_LAST FROM transporter WHERE tran_code = ? ";
+						//Changed by sumit on 13/03/13 of Req.Id [WM3ASUN007] adding columns
+						sql = "SELECT PRONO_LAST,CHK_DIGIT_YN FROM transporter WHERE tran_code = ? ";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, tranCode);
 						rs = pstmt.executeQuery();
 						if( rs.next() )
 						{
 							tranProNo = rs.getString(1);
+							//Changed by sumit on 13/03/13 of Req.Id [WM3ASUN007] getting CHK_DIGIT_YN
+							chDigitYn = rs.getString("CHK_DIGIT_YN");
 						}
 						rs.close();
 						rs = null;
@@ -191,10 +197,13 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 								//errList.add(errString);
 								// check digit to be removed from pro_no before update
 								//if(proNo.length() > tranProNo.length())
-								if((tranProNo != null && proNo != null) && proNo.length() > tranProNo.length())
+								//Changed by sumit on 13/03/13 of Req.Id [WM3ASUN007] commenting this, as not required for despatch start
+								/*if((tranProNo != null && proNo != null) && proNo.length() > tranProNo.length())
 								{
 									proNo = proNo.substring(0,tranProNo.length());
-								}
+								}*/
+								//Changed by sumit on 13/03/13 of Req.Id [WM3ASUN007] commenting this, as not required for despatch end
+									
 								sql = "UPDATE DESPATCH SET LORRY_NO = ?, SHIPMENT_ID = ?, TRAN_CODE = ?, LR_NO  = ?, LR_DATE = ?, pro_no = ? WHERE DESP_ID = ?";
 								pstmt1 = conn.prepareStatement(sql);
 								pstmt1.setString(1, lorryNo);
@@ -209,6 +218,28 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 								pstmt1 = null;
 								//conn.commit();
 								
+								//changed by sumit on 12/04/13 of Req>ID [WM3ASUN007] updating lr number in invoice against desp_id start.
+								sql = "UPDATE INVOICE SET LR_NO  = ? WHERE DESP_ID = ?";
+								pstmt1 = conn.prepareStatement(sql);
+								pstmt1.setString(1, lrNo);
+								pstmt1.setString(2, refId);
+								pstmt1.executeUpdate();
+								pstmt1.close();
+								pstmt1 = null;
+								
+								//Removing check digit number from pro_no and then updating in PRONO_LAST of TRANSPORTER.
+								
+								if((tranProNo != null && proNo != null) && proNo.length() > tranProNo.length())
+								{
+									proNo = proNo.substring(0,tranProNo.length());
+								}
+								else if( tranProNo == null && "Y".equalsIgnoreCase(chDigitYn))
+								{
+									proNo = proNo.substring(0,proNo.length() - 1);
+								}
+								System.out.println(" pro_no ["+proNo+"]");
+								//changed by sumit on 12/04/13 of Req>ID [WM3ASUN007] updating lr number in invoice against desp_id end.
+								
 								sql = "UPDATE TRANSPORTER SET PRONO_LAST  = ? WHERE TRAN_CODE = ?";
 								pstmt1 = conn.prepareStatement(sql);
 								pstmt1.setString(1, proNo);
@@ -593,13 +624,13 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 	{
 		String sql = "";
 		String descr = "";
-		String descr1 = "";
+		String descr1 = "";		
 		String prefix = "";
 		String sProno = "";
 		String lrNo = "";
 		String tranCode = "";
 		long pronoLast = 0;
-		int update = 0;
+		int update = 0;		
 		
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
@@ -631,7 +662,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 			pstmt.setString(1, tranCode);
 			rs = pstmt.executeQuery();
 			if( rs.next() )
-			{
+			{				
 				descr = rs.getString(1);
 				descr1 = rs.getString(2);
 				prefix = rs.getString(4);
@@ -653,7 +684,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 		
 			if(descr1.trim().length() > 0)
 			{
-				pronoLast = Long.parseLong(descr1) + 1;
+				pronoLast = Long.parseLong(descr1) + 1;				
 			}
 			if(pronoLast != 0)
 			{
@@ -825,7 +856,8 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 			TransIDGenerator tg = new TransIDGenerator(xmlValues.toString(), "BASE",CommonConstants.DB_NAME);
 			
 			runNumber = Long.parseLong(tg.generateTranSeqID(refSer, tranIDCol, keyString, conn));
-			conn.commit();
+			//Changed by sumit on 12/04/13 of Req.ID [WM3ASUN007] commenting commit from here.
+			//conn.commit();
 			System.out.println("runNumber:["+runNumber+"]");
 	
 			padLen = 16 - mfgCode.length(); // total length should be 16 excluding extension digit and check digit
@@ -842,7 +874,5 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 		return lrNo;
 	
 	}
-	//Changed by sumit on 10/11/12 generating LrNo ( Copied from shipmentIC, as per manoharan sir) end.
-	
-	
+		
 }

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

@@ -37933,6 +37933,9 @@ VALUES (
 	NULL,
 	NULL);
 	
+	-- changed by sumit on 13/03/13 
+	alter table transporter add chk_digit_yn char(1) default 'N';
+	
 commit;