Sales order confirmation - In case of item_flag = 'B' even if line_tupe is...

Sales order confirmation - In case of item_flag = 'B'  even if line_tupe is "I", column values are set as null in the columns due_date, conv_qty__stdqty, consume_fc, cust_code__dlv

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

webitm-dis/ibase/webitm/ejb/dis/adv/SorderConf.java

@@ -2561,12 +2561,13 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 		String munit="",mreqtype="",mnature="",mexptype="",merrstr="",itemStru="";
 		String custCode="",orderType="",nearExpShelfLife="",round="",roundToStr="";
 		String mlevel = "";
+		String consumeFc = "", custCodeDlv = ""; // variable declared by mahesh saggam on 09/07/2019
 		int incrmlevel=0;
 		int mcnt=0,insertCnt=0;
 		double mbatqty=0.0,mqtyper=0.0,mminqty=0.0,aminqty=0.0,amaxqty=0.0;
-		double quantity=0.0,qtyOrd=0.0,rate=0.0,mqty=0.0;
+		double quantity=0.0,qtyOrd=0.0,rate=0.0,mqty=0.0, convQtyStd = 0; // convQtyStd variable added by mahesh saggam on 09/07/2019
 		double minShelfLife=0.0,maxLife=0.0,temp=0.0,roundTo=0.0;
-		Timestamp orderDate=null,dspDate=null;
+		Timestamp orderDate=null,dspDate=null, dueDate = null; // dueDate variable added by Mahesh Saggam on 09/07/2019
 		int returnValue=0;
 		PreparedStatement pstmt = null ,pstmt1=null,pstmt2=null;
 		ResultSet rs = null,rs1=null,rs2=null;
@@ -2593,7 +2594,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				
 
 				sql1 = "select site_code,unit,quantity,item_code__ord,item_flag,unit__ord, " +
-						" qty_ord,order_date,dsp_date ,rate from sorditem where sale_order=? and exp_lev=? and line_no=? ";
+						" qty_ord,order_date,dsp_date ,rate, "
+						+ "due_date, conv__qty_stdqty, consume_fc, cust_code__dlv " // Added by Mahesh Saggam on 09/07/2019
+						+ " from sorditem where sale_order=? and exp_lev=? and line_no=? ";
 				pstmt1 = conn.prepareStatement(sql1);
 				pstmt1.setString(1, saleOrder);
 				pstmt1.setString(2, expLev);
@@ -2611,8 +2614,12 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					orderDate = rs1.getTimestamp("order_date");
 					dspDate = rs1.getTimestamp("dsp_date");
 					rate = rs1.getDouble("rate");
-
-					
+					// added by mahesh saggam on 09/07/2019 start
+					dueDate = rs1.getTimestamp("due_date");
+					convQtyStd = rs1.getDouble("conv__qty_stdqty");
+					consumeFc = rs1.getString("consume_fc");
+					custCodeDlv = rs1.getString("cust_code__dlv");
+					// added by mahesh saggam on 09/07/2019 end
 
 					if("B".equalsIgnoreCase(lineType))
 					{
@@ -2916,10 +2923,11 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 								+ "quantity,unit, line_type,min_shelf_life,max_shelf_life,nature," +
 								"order_date,order_type,dsp_date,rate , "
 								//Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[start]
-								+" qty_alloc, qty_desp,tax_chap ,discount )"//discount column added by nandkumar gadkari on 28/02/19
+								+" qty_alloc, qty_desp,tax_chap ,discount, "//discount column added by nandkumar gadkari on 28/02/19
 								//Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[start]
+								+ "due_date, conv__qty_stdqty, consume_fc, cust_code__dlv )" // columns on this line added by Mahesh Saggam on 09/07/2019
 								+ " values "
-								+ "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+								+ "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, ?,?,?,?)";
 						pstmt2=conn.prepareStatement(sql);
 						pstmt2.setString(1,expLev+mlevel);
 						pstmt2.setString(2,saleOrder);
@@ -2950,6 +2958,12 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 						//Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[end]
 						pstmt2.setString(26,taxChap);
 						pstmt2.setDouble(27,mdiscPerc);//mdiscPerc column set by nandkumar gadkari on 28/02/19 
+						// columns set by mahesh saggam on 09/07/2019 start
+						pstmt2.setTimestamp(28, dueDate);
+						pstmt2.setDouble(29, convQtyStd);
+						pstmt2.setString(30, consumeFc);
+						pstmt2.setString(31, custCodeDlv);
+						// columns set by mahesh saggam on 09/07/2019 end
 						insertCnt= pstmt2.executeUpdate();
 						pstmt2.close();
 						pstmt2=null;