Added changes to the sordNo variable

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

webitm-dis/ibase/webitm/ejb/dis/DespatchConfirm.java

@@ -173,7 +173,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 		String confirm = "", ledgPostConf = "";
 		String errString = "",holdFlag = "",holdFlagNew = "",invStat = "",grade = "",tranSer = "",gpSer = "",gpNo = "",siteCodeExc = ""; 
 		String statusDesp = "",channelPartner = "",lockLevel = "",isAllocated = "",varValue = "",disLink = "";
-		String availableYN = "",tranid = "",siteCode = "",disparmVal = "",sordNo = "",lineNo = "",lineNoSord = "",expLev = "",itemCodeOrd = "",itemCode = "",lotNo = "",lotSl = "",locCode = "",unitStd = "";
+		String availableYN = "",tranid = "",siteCode = "",disparmVal = "",sordNoDet = "",lineNo = "",lineNoSord = "",expLev = "",itemCodeOrd = "",itemCode = "",lotNo = "",lotSl = "",locCode = "",unitStd = "";
 		double quantityStduom = 0.0,quantity = 0.0,rateStduom = 0.0,hldQty = 0.0,qtyAlloc = 0.0,OrderQty = 0.0,mQtyCheck = 0.0;
 		double mCancperc = 0.0,bondTaxAmt = 0.0,bondValue = 0.0,bankGuarantee = 0.0;
 		double grossWeight = 0.0,tareWeight = 0.0,netweight = 0.0;
@@ -338,8 +338,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 					despDate = rs.getTimestamp("desp_date");
 					availableYN = checkNull(rs.getString("available_yn"));
 					tranid = checkNull(rs.getString("desp_id"));
-					siteCode = checkNull(rs.getString("site_code"));
-					sordNo = checkNull(rs.getString("sord_no"));
+					siteCode = checkNull(rs.getString("site_code"));					
+					//sordNo = checkNull(rs.getString("sord_no"));
+					sordNoDet = checkNull(rs.getString("sord_no"));
 					custCode = checkNull(rs.getString("cust_code"));
 					custCodeDlv = checkNull(rs.getString("cust_code__dlv"));
 					gpDate = rs.getTimestamp("gp_date");
@@ -395,13 +396,13 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 					if(	varValue.contains(siteCodeExc))
 					{
-
-						gpNo = generateGPNO(xmlValues,siteCodeExc+gpSer,sordNo,conn);//Code need to be migrated
+						//gpNo = generateGPNO(xmlValues,siteCodeExc+gpSer,sordNo,conn);
+						gpNo = generateGPNO(xmlValues,siteCodeExc+gpSer,sordNoDet,conn);//Code need to be migrated
 
 					}
 					else{
-
-						gpNo = generateGPNO(xmlValues,siteCodeExc,sordNo,conn);//Code need to be migrated
+                        //gpNo = generateGPNO(xmlValues,siteCodeExc,sordNo,conn);
+						gpNo = generateGPNO(xmlValues,siteCodeExc,sordNoDet,conn);//Code need to be migrated
 
 					}
 
@@ -446,6 +447,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 				pstmt3 = conn.prepareStatement(sql3);
 				pstmt3.setString(1,tranId);
 				rs3 = pstmt3.executeQuery();
+				
+				//mayur kalidas nair -25-12-17-------start
 				while ( rs3.next() )
 				{
 					if(statusDesp != "X") 
@@ -702,7 +705,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 							+" and 	 loc_code 			= ? ";
 
 						pstmt = conn.prepareStatement(sql);
-						pstmt.setString(1,sordNo);
+						//pstmt.setString(1,sordNo);
+						pstmt.setString(1,sordNoDet);
 						pstmt.setString(2,lineNo);
 						pstmt.setString(3,expLev);
 						pstmt.setString(4,itemCodeOrd);
@@ -737,7 +741,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 								+"	and lot_no 			 = ? and lot_sl 			 = ? and loc_code 		 = ? ";
 
 							pstmt = conn.prepareStatement(sql);
-							pstmt.setString(1,sordNo);
+							//pstmt.setString(1,sordNo);
+							pstmt.setString(1,sordNoDet);
 							pstmt.setString(2,lineNo);
 							pstmt.setString(3,expLev);
 							pstmt.setString(4,itemCodeOrd);
@@ -762,7 +767,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 									+" and lot_no = ? and lot_sl = ? and loc_code  = ? ";
 
 								pstmt = conn.prepareStatement(sql);
-								pstmt.setString(1,sordNo);
+								//pstmt.setString(1,sordNo);
+								pstmt.setString(1,sordNoDet);
 								pstmt.setString(2,lineNo);
 								pstmt.setString(3,expLev);
 								pstmt.setString(4,itemCodeOrd);
@@ -785,7 +791,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 								pstmt = conn.prepareStatement(sql);
 								//pstmt.setDouble(1,qtyAlloc - quantityStduom);
 								pstmt.setDouble(1,quantityStduom);
-								pstmt.setString(2,sordNo);
+								//pstmt.setString(2,sordNo);
+								pstmt.setString(2,sordNoDet);
 								pstmt.setString(3,lineNo);
 								pstmt.setString(4,expLev);
 								pstmt.setString(5,itemCodeOrd);
@@ -815,7 +822,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						pstmt.setDouble(1, quantityStduom);
 						pstmt.setDouble(2,quantity);
 						pstmt.setTimestamp(3,despDate);
-						pstmt.setString(4,sordNo);
+						
+						//pstmt.setString(4,sordNo);
+						pstmt.setString(4,sordNoDet);
 						
 						//changes lineNo to lineNoSord By Pavan Rane on 30/05/17 START
 						pstmt.setString(5, lineNoSord);						
@@ -861,7 +870,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						sql = "   select order_type, item_ser, pending_order  from sorder  "
 							+" where  sale_order = ?";
 						pstmt = conn.prepareStatement(sql);
-						pstmt.setString(1,sordNo);
+						//pstmt.setString(1,sordNo);
+						pstmt.setString(1,sordNoDet);
 
 						rs = pstmt.executeQuery();
 						if(rs.next())
@@ -904,7 +914,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						updDesp.put("tran_id", tranId);
 						updDesp.put("tran_type", "ID");
 						updDesp.put("line_no", lineNo);
-						updDesp.put("sorder_no",sordNo);
+						//updDesp.put("sorder_no",sordNo);
+						updDesp.put("sorder_no",sordNoDet);
 						updDesp.put("item_code", itemCode);
 						updDesp.put("site_code", siteCode);
 						updDesp.put("loc_code", locCode);
@@ -1098,7 +1109,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						sql = "select sum(quantity) as lc_order_qty , sum(quantity) - sum(qty_desp) as mqty_chk from sorditem "
 							+ "where sale_order = ?  and line_type = 'I'";
 						pstmt = conn.prepareStatement(sql);
-						pstmt.setString(1,sordNo);
+						//pstmt.setString(1,sordNo);
+						pstmt.setString(1,sordNoDet);
 						rs = pstmt.executeQuery();
 						if(rs.next())
 						{
@@ -1130,7 +1142,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						pstmt.setString(2,status);
 						pstmt.setTimestamp(3,despDate);
 						pstmt.setString(4,allocFlag);
-						pstmt.setString(5,sordNo);
+						//pstmt.setString(5,sordNo);
+						pstmt.setString(5,sordNoDet);
 
 						pstmt.executeUpdate();
 
@@ -1180,7 +1193,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 								{
 									sql = "	update sorditem	set status  = 'C' where sale_order = ? and line_no = ?  and exp_lev= ? ";
 									pstmt = conn.prepareStatement(sql);
-									pstmt.setString(1,sordNo);
+									//pstmt.setString(1,sordNo);
+									pstmt.setString(1,sordNoDet);
 									pstmt.setString(2,lineNoSord);
 									pstmt.setString(3,expLev);
 									pstmt.executeUpdate();
@@ -1192,7 +1206,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 									sql = "update sorddet	set status  = 'C' where  sale_order = ?	and line_no    = ? ";
 
 									pstmt = conn.prepareStatement(sql);
-									pstmt.setString(1,sordNo);
+									//pstmt.setString(1,sordNo);
+									pstmt.setString(1,sordNoDet);
 									pstmt.setString(2,lineNoSord);
 
 									pstmt.executeUpdate();
@@ -1207,7 +1222,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 								sql = "select count(1) as ll_cnt from sorddet	where sale_order = ? and status  <> 'C'";	
 								pstmt = conn.prepareStatement(sql);
-								pstmt.setString(1,sordNo);
+								//pstmt.setString(1,sordNo);
+								pstmt.setString(1,sordNoDet);
 								rs = pstmt.executeQuery();
 								while(rs.next())
 								{
@@ -1224,7 +1240,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 									pstmt = conn.prepareStatement(sql);
 									pstmt.setTimestamp(1,despDate);
-									pstmt.setString(2,sordNo);
+									//pstmt.setString(2,sordNo);
+									pstmt.setString(2,sordNoDet);
 
 									pstmt.executeUpdate();
 
@@ -1244,7 +1261,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setTimestamp(1,despDate);
-							pstmt.setString(2,sordNo);
+							//pstmt.setString(2,sordNo);
+							pstmt.setString(2,sordNoDet);
 
 							pstmt.executeUpdate();
 
@@ -1342,6 +1360,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						}
 					}//status not cancelled		
 				}
+				//mayur kalidas nair -25-12-17-------end
 				pstmt3.close();
 				pstmt3 = null;					
 				rs3.close();