Changes in setting net amount

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

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

@@ -523,6 +523,7 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 		HashMap commissionMap = null;
 		ArrayList sordLineNo = new ArrayList();
 		DistCommon distCommom = new DistCommon();
+		double billBackAmt=0,offInvAmt=0,netTotAmtDet=0,netTotAmtHdr=0,ordBillBackAmt=0,ordOffInvAmt=0,lineBillBackAmt=0,lineOffInvAmt=0; //// added by nandkumar gadkari on 09/07/19
 		//start implement
 		try 
         {
@@ -622,7 +623,9 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 			pstmt.close();pstmt = null;
 			
 			sql = "SELECT CUST_CODE__DLV , DLV_TO, DUE_DATE, CONSUME_FC, CUST_CODE, ITEM_SER, PRICE_LIST__DISC,  " +
-					"ORDER_TYPE, PRICE_LIST, TOT_AMT FROM SORDER WHERE  SALE_ORDER = ? ";
+					"ORDER_TYPE, PRICE_LIST, TOT_AMT, "
+					+ "ORD_BILLBACK_AMT,ORD_OFFINV_AMT, LINE_BILLBACK_AMT,LINE_OFFINV_AMT  "// added by nandkumar gadkari on 09/07/19
+					+ "FROM SORDER WHERE  SALE_ORDER = ? ";
 			pstmt= conn.prepareStatement(sql);
 			pstmt.setString(1, saleOrd);
 			rs= pstmt.executeQuery();
@@ -639,6 +642,14 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 				ordType = checkNull(rs.getString("ORDER_TYPE"));
 				prcList = checkNull(rs.getString("PRICE_LIST"));
 				totsAmt = rs.getDouble("TOT_AMT");
+				//// added by nandkumar gadkari on 09/07/19-------start-----------
+				ordBillBackAmt=rs.getDouble("ORD_BILLBACK_AMT");
+				ordOffInvAmt=rs.getDouble("ORD_OFFINV_AMT");
+				lineBillBackAmt=rs.getDouble("LINE_BILLBACK_AMT");
+				lineOffInvAmt=rs.getDouble("LINE_OFFINV_AMT");
+				netTotAmtHdr=totAmt-ordBillBackAmt-ordOffInvAmt-lineBillBackAmt-lineOffInvAmt;
+				//// added by nandkumar gadkari on 09/07/19-----------end--------------
+				
 				
 			}
 			rs.close();rs = null;
@@ -669,7 +680,8 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 					"EXCH_RATE__INS	= ?, INS_AMT = ?, TRANS_MODE = ?, FRT_TERM = ?,	" +
 					"DLV_TERM = ?, UDF__STR1 = ?, REMARKS = ?,REMARKS2 = ?, " +
 					"REMARKS3 = ?,STAN_CODE__INIT= ?,DLV_TO	= ?, UDF__DATE1	= ?	, " +
-					"ACCT_CODE__SAL = ? , CCTR_CODE__SAL = ?  " +
+					"ACCT_CODE__SAL = ? , CCTR_CODE__SAL = ?  "
+					+ ", NET_TOT_AMT= ? " + // added by nandkumar gadkari on 09/07/19
 					"WHERE SALE_ORDER = ?  ";
 			
 			
@@ -720,7 +732,8 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 			pstmt.setTimestamp(44, udfDate1);
 			pstmt.setString(45, acctCodeSal);
 			pstmt.setString(46, cctrCodeSal);
-			pstmt.setString(47, saleOrd);
+			pstmt.setDouble(47, netTotAmtHdr);// added by nandkumar gadkari on 09/07/19
+			pstmt.setString(48, saleOrd);
 			
 			int updtCnt = pstmt.executeUpdate();
 			System.out.println("updtCnt SORDER :::["+updtCnt+"]");
@@ -839,7 +852,61 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 					prcListType = distCommom.getPriceListType(prcList, conn);
 					
 					//lc_max_rate = lnvo_discount.gbf_pick_rate_refno_wise(ls_price_list,ldt_amd_date,ls_item_code__ord,ls_ref_no,'L',lc_quantity)
+					// ADDED BY NANDKUMAR GADKARI ON 09/07/19------------------------------------START-----------------------------------------
+					sql = "select count(1)  as llPlcount from pricelist where price_list=?"
+							+ " and item_code= ? and unit= ? and list_type=? and eff_from<=? and valid_upto  >=? and min_qty<=? and max_qty>= ?"
+							+ " and (ref_no is not null)";
+					pstln = conn.prepareStatement(sql);
+					pstln.setString(1, prcList);
+					pstln.setString(2, itemCodeOrd);
+					pstln.setString(3, unit);
+					pstln.setString(4, prcListType);
+					pstln.setTimestamp(5, amdDate);
+					pstln.setTimestamp(6, amdDate);
+					pstln.setDouble(7, qty);
+					pstln.setDouble(8, qty);
+					rsln = pstln.executeQuery();
+					if (rsln.next()) {
+						cnt = rsln.getInt("llPlcount");
+					}
+					rsln.close();
+					rsln = null;
+					pstln.close();
+					pstln = null;
+
+					if (cnt >= 1) {
+						sql = "select max(ref_no)from pricelist where price_list  =? and item_code= ? and unit=? and list_type= ?"
+								+ " and eff_from<=? and valid_upto>=? and min_qty<=? and max_qty>=? and (ref_no is not null)";
+						pstln = conn.prepareStatement(sql);
+						pstln.setString(1, prcList);
+						pstln.setString(2, itemCodeOrd);
+						pstln.setString(3, unit);
+						pstln.setString(4, prcListType);
+						pstln.setTimestamp(5, amdDate);
+						pstln.setTimestamp(6, amdDate);
+						pstln.setDouble(7, qty);
+						pstln.setDouble(8, qty);
+						rsln = pstln.executeQuery();
+						if (rsln.next()) {
+							rfNo = rsln.getString(1);
+						}
+						rsln.close();
+						rsln = null;
+						pstln.close();
+						pstln = null;
+
+						maxRate = distCommon.pickRateRefnoWise(prcList, amdDateStr, itemCodeOrd, rfNo, prcListType, qty,conn);
+					}
+					if (maxRate <= 0) {
 						maxRate = distCommom.pickRateRefnoWise( prcList, amdDateStr, itemCodeOrd, rfNo,"L", qty, conn);
+
+					}
+				
+				
+				if (maxRate < 0) {
+					maxRate = 0;
+				}
+				// ADDED BY NANDKUMAR GADKARI ON 09/07/19------------------------------------END-----------------------------------------
 					System.out.println("maxRate::::::["+maxRate+"]");
 					
 					ordValue = qty * maxRate;
@@ -900,7 +967,7 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 				if(llCnt > 0)
 				{
 					
-					sql = "SELECT ITEM_CODE__ORD,ITEM_DESCR FROM SORDDET WHERE SALE_ORDER = ? AND LINE_NO = ? ";
+					sql = "SELECT ITEM_CODE__ORD,ITEM_DESCR,billback_amt,offinv_amt FROM SORDDET WHERE SALE_ORDER = ? AND LINE_NO = ? ";//billback_amt,offinv_amt added by nandkumar gadkari on 09/07/19
 					
 					pstln= conn.prepareStatement(sql);
 					pstln.setString(1, saleOrd);
@@ -910,6 +977,8 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 					{
 						itemCodeOrdt = checkNull(rsln.getString("ITEM_CODE__ORD"));
 						itemDesr = checkNull(rsln.getString("ITEM_DESCR"));
+						billBackAmt=rsln.getDouble(3); 
+						offInvAmt=rsln.getDouble(4);
 					}
 					rsln.close();rsln = null;
 					pstln.close();pstln = null;
@@ -955,7 +1024,7 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 						System.out.println("updtQu SALES_QUOTDET :::["+updtQu+"]");
 						pstln.close();pstln = null;
 					}
-					
+					netTotAmtDet=netAmt-billBackAmt-offInvAmt;//added by nandkumar gadkari on 09/07/19
 					updtSql = "UPDATE SORDDET SET SITE_CODE = ? , QUANTITY = ? , RATE = ? , DISCOUNT = ? , " +
 							"TAX_AMT = ? , TAX_CLASS = ? , TAX_CHAP	= ? , TAX_ENV = ? , NET_AMT = ? , " +
 							"QUANTITY__STDUOM	= ? , RATE__STDUOM = ? , PACK_INSTR = ? , NO_ART = ? , " +
@@ -963,7 +1032,8 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 							"UNIT = ? , UNIT__RATE = ? ,  CONV__QTY_STDUOM = ? ,  CONV__RTUOM_STDUOM = ? , " +
 							"UNIT__STD	= ? , ORD_VALUE	= ? , ITEM_CODE__ORD = ? , ITEM_CODE = ? , " +
 							"ITEM_DESCR	= ?  , MIN_SHELF_LIFE = ? , CUST_SPEC__NO = ? , NATURE  = ? , " +
-							"MAX_SHELF_LIFE	 = ?  " +
+							"MAX_SHELF_LIFE	 = ?  "
+							+ ", NET_TOT_AMT =? " + //added by nandkumar gadkari on 09/07/19
 							"WHERE SALE_ORDER	= ? 	" +
 							"AND LINE_NO	 = ?   ";
 					
@@ -998,8 +1068,9 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 					pstln.setString(28, custSpNo);
 					pstln.setString(29, nature);
 					pstln.setDouble(30, maxShLif);
-					pstln.setString(31, saleOrd);
-					pstln.setString(32, lineNoSo);
+					pstln.setDouble(31, netTotAmtDet);// added by nandkumar gadkari on 09/07/19
+					pstln.setString(32, saleOrd);
+					pstln.setString(33, lineNoSo);
 					
 					int updtSodt = pstln.executeUpdate();
 					System.out.println("updtSodt SORDDET:::["+updtSodt+"]");