STATUS flag added in min_rate_history for active and close doc key

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

webitm-dis/src/ibase/webitm/ejb/dis/PostOrderActivity.java

@@ -4717,8 +4717,8 @@ public class PostOrderActivity {
 								if (cnt == 0)
 								{
 									sql = "insert into min_rate_history (doc_key, eff_cost, scheme_code, invoice_id, invoice_date, cust_code, item_code,"
-											+ " site_code, lot_no, returnable,reas_code, chg_date, chg_user, chg_term, quantity, quantity_adj )"
-											+ " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+											+ " site_code, lot_no, returnable,reas_code, chg_date, chg_user, chg_term, quantity, quantity_adj,status )"//status added by nandkumar gadkari on 08/01/20
+											+ " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 									pstmt2 = conn.prepareStatement(sql);
 									pstmt2.setString(1, lsDocValue);
 									pstmt2.setDouble(2, ldEffCost);
@@ -4738,6 +4738,7 @@ public class PostOrderActivity {
 									pstmt2.setDouble(15, invQty);
 									pstmt2.setDouble(16, 0.0);
 									//Added by Santosh on 04/01/17 to insert qty and qty_adj End]
+									pstmt2.setString(17,"A");//status added by nandkumar gadkari on 08/01/20
 									cnt = pstmt2.executeUpdate();
 
 									pstmt2.close();
@@ -4799,8 +4800,8 @@ public class PostOrderActivity {
 									if (ldEffCost != 0)
 									{
 										sql = "insert into min_rate_history (doc_key, eff_cost, scheme_code, invoice_id, invoice_date, cust_code,"
-												+ " item_code, site_code, lot_no, returnable,reas_code, chg_date, chg_user, chg_term, quantity, quantity_adj )"
-												+ " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+												+ " item_code, site_code, lot_no, returnable,reas_code, chg_date, chg_user, chg_term, quantity, quantity_adj,status )"//status added by nandkumar gadkari on 08/01/20
+												+ " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 										pstmt2 = conn.prepareStatement(sql);
 										pstmt2.setString(1, lsDocValue);
 										pstmt2.setDouble(2, ldEffCost);
@@ -4820,6 +4821,7 @@ public class PostOrderActivity {
 										pstmt2.setDouble(15, invQty);
 										pstmt2.setDouble(16, 0.0);
 										//Added by Santosh on 04/01/17 to insert qty and qty_adj End]
+										pstmt2.setString(17,"A");//status added by nandkumar gadkari on 08/01/20
 										cnt = pstmt2.executeUpdate();
 
 										pstmt2.close();

webitm-dis/src/ibase/webitm/ejb/dis/SReturnForm.java

@@ -3145,6 +3145,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 										+ " AND MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?"
 										+ " AND MRH.SITE_CODE = ? AND MRH.QUANTITY - CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END >= ?  "
 										+ " AND MRH.QUANTITY IS NOT NULL"
+										+ " AND CASE WHEN MRH.STATUS IS NULL THEN 'A' ELSE MRH.STATUS END <> 'X' "// added by nandkumar gadkari on 30/12/19
 										+ " GROUP BY MRH.INVOICE_ID,  MRH.QUANTITY,  MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,MRH.QUANTITY_ADJ,MRH.DOC_KEY "
 										+ orderByStr;
 									pstmt = conn.prepareStatement(sql);
@@ -3251,7 +3252,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 													adjQty=adjQty+srDQuantity+domTotalQty;
 													//ADDED BY NANDKUMAR GADKARI ON 26/07/19------------end
 													//sql1 = "SELECT COUNT(*) FROM MIN_RATE_HISTORY WHERE DOC_KEY =? AND QUANTITY - CASE WHEN QUANTITY_ADJ IS NULL THEN 0 ELSE QUANTITY_ADJ END > 0 ";commented and sql changed by nandkumar gadkari on 26/07/19
-													sql1 = "SELECT COUNT(*) FROM MIN_RATE_HISTORY WHERE DOC_KEY =? AND QUANTITY - (CASE WHEN QUANTITY_ADJ IS NULL THEN 0 ELSE QUANTITY_ADJ END  + ? ) > 0 ";
+													sql1 = "SELECT COUNT(*) FROM MIN_RATE_HISTORY WHERE DOC_KEY =? AND QUANTITY - (CASE WHEN QUANTITY_ADJ IS NULL THEN 0 ELSE QUANTITY_ADJ END  + ? ) > 0 "
+															+ " AND CASE WHEN STATUS IS NULL THEN 'A' ELSE STATUS END <> 'X' ";// added by nandkumar gadkari on 30/12/19
 													pstmt1 = conn.prepareStatement(sql1);
 													pstmt1.setString(1, minRateDocKey);
 													pstmt1.setDouble(2, srDQuantity);
@@ -3316,6 +3318,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 											
 											//	+ " AND MRH.SITE_CODE = ? "commented by nandkumar gadkari on 26/07/19
 											//	+ " AND MRH.QUANTITY IS NOT NULL" //COMMENTED BY NANDKUMAR GADKARI ON 28/01/19
+												+ " AND CASE WHEN MRH.STATUS IS NULL THEN 'A' ELSE MRH.STATUS END <> 'X' "// added by nandkumar gadkari on 30/12/19
 												+ " GROUP BY MRH.INVOICE_ID,  MRH.QUANTITY,  MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE "
 												
 												+ orderByStr;
@@ -3363,7 +3366,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 															System.out.println( "cnt :: " + cnt );
 														if(cnt !=5)
 														{
-														sql1 = "SELECT COUNT(*) FROM MIN_RATE_HISTORY WHERE DOC_KEY =? ";
+														sql1 = "SELECT COUNT(*) FROM MIN_RATE_HISTORY WHERE DOC_KEY =? "
+																+ " AND CASE WHEN STATUS IS NULL THEN 'A' ELSE STATUS END <> 'X' ";// added by nandkumar gadkari on 30/12/19
 														pstmt1 = conn.prepareStatement(sql1);
 														pstmt1.setString(1, minRateDocKey);
 														
@@ -3429,7 +3433,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 										if(docKey.trim().length() > 0 || docKey != null )
 										{
 											System.out.println("inside dok key1 : " +docKey);
-											sqlStr = " select INVOICE_ID , INVOICE_DATE ,EFF_COST   from MIN_RATE_HISTORY where DOC_KEY = ? "; //trim(:ls_itemcode);
+											sqlStr = " select INVOICE_ID , INVOICE_DATE ,EFF_COST   from MIN_RATE_HISTORY where DOC_KEY = ? " //trim(:ls_itemcode);
+													+ " AND CASE WHEN STATUS IS NULL THEN 'A' ELSE STATUS END <> 'X' ";// added by nandkumar gadkari on 30/12/19
 											pstmt = conn.prepareStatement( sqlStr );
 											pstmt.setString( 1, docKey );
 											rs = pstmt.executeQuery();
@@ -3597,6 +3602,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 											+ " AND MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?"
 											+ " AND MRH.SITE_CODE = ? AND MRH.QUANTITY - CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END > 0"
 											+ " AND MRH.QUANTITY IS NOT NULL AND MRH.DOC_KEY = ? "
+											+ " AND CASE WHEN MRH.STATUS IS NULL THEN 'A' ELSE MRH.STATUS END <> 'X' "// added by nandkumar gadkari on 30/12/19
 											+ " GROUP BY MRH.INVOICE_ID,  MRH.QUANTITY,  MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,MRH.QUANTITY_ADJ "
 											+ orderByStr;
 									pstmt = conn.prepareStatement(sql);
@@ -3642,7 +3648,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 
 								}
 								
-									sql = "SELECT DOC_KEY,EFF_COST FROM MIN_RATE_HISTORY WHERE DOC_KEY = ?";
+									sql = "SELECT DOC_KEY,EFF_COST FROM MIN_RATE_HISTORY WHERE DOC_KEY = ?"
+										+ " AND CASE WHEN STATUS IS NULL THEN 'A' ELSE STATUS END <> 'X' ";// added by nandkumar gadkari on 30/12/19
 									pstmt = conn.prepareStatement(sql);
 									pstmt.setString(1, minRateDocKey);
 									rs = pstmt.executeQuery();
@@ -3673,7 +3680,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 									if(docKey.trim().length() > 0 || docKey != null )
 									{
 										System.out.println("inside dok key : " +docKey);
-										sqlStr = " select INVOICE_ID , INVOICE_DATE  from MIN_RATE_HISTORY where DOC_KEY = ? "; //trim(:ls_itemcode);
+										sqlStr = " select INVOICE_ID , INVOICE_DATE  from MIN_RATE_HISTORY where DOC_KEY = ? " //trim(:ls_itemcode);
+												+ " AND CASE WHEN STATUS IS NULL THEN 'A' ELSE STATUS END <> 'X' ";// added by nandkumar gadkari on 30/12/19
 										pstmt = conn.prepareStatement( sqlStr );
 										pstmt.setString( 1, docKey );
 										rs = pstmt.executeQuery();
@@ -5794,6 +5802,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 											+ " AND MRH.SITE_CODE = ? "
 										//	+ "AND MRH.QUANTITY - CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END > 0"
 											+ " AND MRH.QUANTITY IS NOT NULL AND MRH.INVOICE_ID= ? AND MRH.DOC_KEY = ? "
+											+ " AND CASE WHEN MRH.STATUS IS NULL THEN 'A' ELSE MRH.STATUS END <> 'X' "// added by nandkumar gadkari on 30/12/19
 											+ " GROUP BY MRH.INVOICE_ID,  MRH.QUANTITY,  MRH.EFF_COST,MRH.CUST_CODE,MRH.ITEM_CODE,MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE"
 											//+ " HAVING MRH.QUANTITY-SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) > 0"
 											+ orderByStr;
@@ -5840,7 +5849,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 								}
 							}
 								//Added by Nandkumar Gadkari on 14/09/18----------------[End]---------------------------------------
-								sql = "SELECT DOC_KEY,EFF_COST FROM MIN_RATE_HISTORY WHERE DOC_KEY = ?";
+								sql = "SELECT DOC_KEY,EFF_COST FROM MIN_RATE_HISTORY WHERE DOC_KEY = ?"
+										+ " AND CASE WHEN STATUS IS NULL THEN 'A' ELSE STATUS END <> 'X' ";// added by nandkumar gadkari on 30/12/19
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, minRateDocKey);
 								rs = pstmt.executeQuery();
@@ -5875,7 +5885,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 								if(docKey.trim().length() > 0 || docKey != null )
 								{
 									System.out.println("inside dok key : " +docKey);
-									sqlStr = " select INVOICE_ID , INVOICE_DATE  from MIN_RATE_HISTORY where DOC_KEY = ? "; //trim(:ls_itemcode);
+									sqlStr = " select INVOICE_ID , INVOICE_DATE  from MIN_RATE_HISTORY where DOC_KEY = ? " //trim(:ls_itemcode);
+											+ " AND CASE WHEN STATUS IS NULL THEN 'A' ELSE STATUS END <> 'X' ";// added by nandkumar gadkari on 30/12/19
 									pstmt = conn.prepareStatement( sqlStr );
 									pstmt.setString( 1, docKey );
 									rs = pstmt.executeQuery();