Skip to content

B
business-java
Commit a26cdaff authored by ngadkari's avatar ngadkari
Browse files
Options

Change in validation tran id consideration in sql and removed edit flag condition 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204188 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f97e7479
Show whitespace changes
Inline Side-by-side
Showing with 206 additions and 51 deletions
webitm-dis/ibase/webitm/ejb/dis/SReturnForm.java
View file @ a26cdaff
...@@ -213,6 +213,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -213,6 +213,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
int cntItemLotInfo=0; // added by nandkumar gadkari on 28/01/19 int cntItemLotInfo=0; // added by nandkumar gadkari on 28/01/19
String expDateStrg="",mfgDateStrg="";// added by nandkumar gadkari on 28/01/19 String expDateStrg="",mfgDateStrg="";// added by nandkumar gadkari on 28/01/19
Timestamp trDate = null; Timestamp trDate = null;
double srDQuantity =0,adjQty=0,domTotalQty=0;
try try
{ {
ITMDBAccessEJB dbEjb = new ITMDBAccessEJB(); ITMDBAccessEJB dbEjb = new ITMDBAccessEJB();
...@@ -3064,7 +3065,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3064,7 +3065,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
{ {
iValStr = iValStr.substring(0,iValStr.indexOf(".")); iValStr = iValStr.substring(0,iValStr.indexOf("."));
} }
sQuantity=checkDoubleNull(genericUtility.getColumnValue("quantity__stduom", dom));//added by nandkumar gadkari on 18/07/19
tranId = genericUtility.getColumnValue("tran_id", dom);
/* lineNoInv = Integer.parseInt( getNumString( iValStr ) ); /* lineNoInv = Integer.parseInt( getNumString( iValStr ) );
iValStr = genericUtility.getColumnValue( "quantity__stduom", dom); iValStr = genericUtility.getColumnValue( "quantity__stduom", dom);
qtyStdUom = Double.parseDouble( getNumString( iValStr ) ); qtyStdUom = Double.parseDouble( getNumString( iValStr ) );
...@@ -3074,7 +3076,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3074,7 +3076,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
//Added by Nandkumar Gadkatri on 23/10/2018 to append invoice id to itemChange retStr [Start] //Added by Nandkumar Gadkatri on 23/10/2018 to append invoice id to itemChange retStr [Start]
String invoiceQty = "", adjQty = ""; String invoiceQty = "";
HashMap<String, String> curFormItemLotHMap = new HashMap<String, String>(); HashMap<String, String> curFormItemLotHMap = new HashMap<String, String>();
HashMap<String, String> curRecordItemLotHMap = new HashMap<String, String>(); HashMap<String, String> curRecordItemLotHMap = new HashMap<String, String>();
String sreturnAdjOpt = "", orderByStr = "",slineNo=""; String sreturnAdjOpt = "", orderByStr = "",slineNo="";
...@@ -3117,7 +3119,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3117,7 +3119,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
slineNo = genericUtility.getColumnValue("line_no", dom); slineNo = genericUtility.getColumnValue("line_no", dom);
sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE," /*sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
+ " SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) AS QTY_ADJ, MRH.EFF_COST" + " SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) AS QTY_ADJ, MRH.EFF_COST"
+ " FROM MIN_RATE_HISTORY MRH, SRETURNDET SRDET" + " FROM MIN_RATE_HISTORY MRH, SRETURNDET SRDET"
...@@ -3127,22 +3129,31 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3127,22 +3129,31 @@ 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.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.QUANTITY IS NOT NULL"
+ " 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" + " 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" + " HAVING MRH.QUANTITY-SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) > 0"*/
//sql added for remove join with sreturnDet table by nandkumar gadkari on 18/07/19
sql =" SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
+ " CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END AS QTY_ADJ, MRH.EFF_COST"
+ " FROM MIN_RATE_HISTORY MRH "
+ " WHERE MRH.CUST_CODE = ?"
+ " 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"
+ " 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; + orderByStr;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode); pstmt.setString(1, custCode);
pstmt.setString(2, itemCode); pstmt.setString(2, itemCode);
pstmt.setString(3, lotNo); pstmt.setString(3, lotNo);
pstmt.setString(4, siteCode); pstmt.setString(4, siteCode);
pstmt.setDouble(5, sQuantity);// added by nandkumar gadkari on 18/07/19
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
invoiceId = checkNull(rs.getString("INVOICE_ID")); invoiceId = checkNull(rs.getString("INVOICE_ID"));
invoiceQty = checkNull(rs.getString("QUANTITY")); invoiceQty = checkNull(rs.getString("QUANTITY"));
adjQty = checkNull(rs.getString("QTY_ADJ")); //adjQty = checkNull(rs.getString("QTY_ADJ"));
adjQty =rs.getDouble("QTY_ADJ");
rate = rs.getDouble("EFF_COST"); rate = rs.getDouble("EFF_COST");
curRecordItemLotHMap.put("cust_code", checkNull(rs.getString("CUST_CODE"))); curRecordItemLotHMap.put("cust_code", checkNull(rs.getString("CUST_CODE")));
...@@ -3176,9 +3187,61 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3176,9 +3187,61 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
System.out.println( "cnt :: " + cnt ); System.out.println( "cnt :: " + cnt );
if(cnt ==5) if(cnt ==5)
{ {
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 ";
//ADDED BY NANDKUMAR GADKARI ON 26/07/19--------------start---------------
domTotalQty=0;
slineNo = genericUtility.getColumnValue( "line_no", dom );
lineNo= slineNo == null || slineNo.trim().length() == 0 ? 0 : Integer.parseInt(slineNo.trim());
adjQty =rs.getDouble("QTY_ADJ");
curFormItemLotHMap.put("doc_key", minRateDocKey);
curFormItemLotHMap.put("line_no", slineNo);
sql1 = " SELECT SDET.INVOICE_ID, SUM(SDET.QUANTITY) AS QTY_ADJ"
+ " FROM SRETURN SRET, SRETURNDET SDET"
+ " WHERE SRET.TRAN_ID = SDET.TRAN_ID"
+ " AND SRET.CONFIRMED = 'N'"
+ " AND SDET.DOC_KEY = ?"
+ " AND SDET.ITEM_CODE = ?"
+ " AND SDET.LOT_NO = ?"
+ " AND SRET.SITE_CODE = ?"
+ " AND SRET.CUST_CODE = ?"
+" AND SDET.TRAN_ID <> ?"
+ " GROUP BY SDET.INVOICE_ID";
pstmt1 = conn.prepareStatement(sql1); pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, minRateDocKey); pstmt1.setString(1, minRateDocKey);
pstmt1.setString(2, itemCode);
pstmt1.setString(3, lotNo);
pstmt1.setString(4, siteCode);
pstmt1.setString(5, custCode);
tranId = tranId == null || tranId.trim().length() == 0 ? " " : tranId;
pstmt1.setString(6, tranId);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
srDQuantity = rs1.getDouble(2);
}
if(pstmt1 != null)
{
pstmt1.close();
pstmt1 = null;
}
if(rs1 != null)
{
rs1.close();
rs1 = null;
}
domTotalQty = getDomQuantityUsed(dom2, curFormItemLotHMap);
System.out.println("domTotalQty : " +domTotalQty);
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 ";
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, minRateDocKey);
pstmt1.setDouble(2, srDQuantity);
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
...@@ -3237,7 +3300,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3237,7 +3300,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
//+ " AND " //+ " AND "
+ " MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?" + " MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?"
+ " AND MRH.SITE_CODE = ? " // + " 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 MRH.QUANTITY IS NOT NULL" //COMMENTED BY NANDKUMAR GADKARI ON 28/01/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 " + " 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 "
...@@ -3246,7 +3309,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3246,7 +3309,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
//pstmt.setString(1, custCode); //pstmt.setString(1, custCode);
pstmt.setString(1, itemCode); pstmt.setString(1, itemCode);
pstmt.setString(2, lotNo); pstmt.setString(2, lotNo);
pstmt.setString(3, siteCode); //pstmt.setString(3, siteCode);commented by nandkumar gadkari on 26/07/19
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
...@@ -3480,7 +3543,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3480,7 +3543,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
minRateDocKey = dokkeyList.get(i); minRateDocKey = dokkeyList.get(i);
System.out.println("@@@@@@@minRateDocKey ..........[" + minRateDocKey+"]"); System.out.println("@@@@@@@minRateDocKey ..........[" + minRateDocKey+"]");
sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE," /*sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
+ " SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) AS QTY_ADJ, MRH.EFF_COST" + " SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) AS QTY_ADJ, MRH.EFF_COST"
+ " FROM MIN_RATE_HISTORY MRH, SRETURNDET SRDET" + " FROM MIN_RATE_HISTORY MRH, SRETURNDET SRDET"
+ " WHERE MRH.DOC_KEY =SRDET.DOC_KEY(+) AND MRH.CUST_CODE = ?" + " WHERE MRH.DOC_KEY =SRDET.DOC_KEY(+) AND MRH.CUST_CODE = ?"
...@@ -3488,7 +3551,16 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3488,7 +3551,16 @@ 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.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 MRH.QUANTITY IS NOT NULL AND MRH.DOC_KEY = ? "
+ " 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" + " 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" + " HAVING MRH.QUANTITY-SUM( CASE WHEN SRDET.QUANTITY IS NULL THEN 0 ELSE SRDET.QUANTITY END) > 0"*/
//sql added for remove join with sreturnDet table by nandkumar gadkari on 18/07/19
sql = " SELECT MRH.INVOICE_ID,MRH.QUANTITY, MRH.CUST_CODE, MRH.ITEM_CODE, MRH.LOT_NO, MRH.SITE_CODE, MRH.INVOICE_DATE,"
+ " CASE WHEN MRH.QUANTITY_ADJ IS NULL THEN 0 ELSE MRH.QUANTITY_ADJ END AS QTY_ADJ, MRH.EFF_COST"
+ " FROM MIN_RATE_HISTORY MRH "
+ " WHERE MRH.CUST_CODE = ?"
+ " 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 = ? "
+ " 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; + orderByStr;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode); pstmt.setString(1, custCode);
...@@ -3499,7 +3571,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3499,7 +3571,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) { while (rs.next()) {
invoiceQty = checkNull(rs.getString("QUANTITY")); invoiceQty = checkNull(rs.getString("QUANTITY"));
adjQty = checkNull(rs.getString("QTY_ADJ")); //adjQty = checkNull(rs.getString("QTY_ADJ"));
adjQty = rs.getDouble("QTY_ADJ");
rate = rs.getDouble("EFF_COST"); rate = rs.getDouble("EFF_COST");
curRecordItemLotHMap.put("cust_code", checkNull(rs.getString("CUST_CODE"))); curRecordItemLotHMap.put("cust_code", checkNull(rs.getString("CUST_CODE")));
curRecordItemLotHMap.put("item_code", checkNull(rs.getString("ITEM_CODE"))); curRecordItemLotHMap.put("item_code", checkNull(rs.getString("ITEM_CODE")));
...@@ -5500,7 +5573,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -5500,7 +5573,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
{ {
//Nandkumar Gadkari on 11/10/18--------------------------------------------(Start)--------------------------------- //Nandkumar Gadkari on 11/10/18--------------------------------------------(Start)---------------------------------
String invoiceQty = "", adjQty = ""; String invoiceQty = "";
HashMap<String, String> curFormItemLotHMap = new HashMap<String, String>(); HashMap<String, String> curFormItemLotHMap = new HashMap<String, String>();
HashMap<String, String> curRecordItemLotHMap = new HashMap<String, String>(); HashMap<String, String> curRecordItemLotHMap = new HashMap<String, String>();
String sreturnAdjOpt = "", orderByStr = "",slineNo=""; String sreturnAdjOpt = "", orderByStr = "",slineNo="";
...@@ -5612,7 +5685,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -5612,7 +5685,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) { while (rs.next()) {
invoiceQty = checkNull(rs.getString("QUANTITY")); invoiceQty = checkNull(rs.getString("QUANTITY"));
adjQty = checkNull(rs.getString("QTY_ADJ")); //adjQty = checkNull(rs.getString("QTY_ADJ"));
adjQty = rs.getDouble("QTY_ADJ");
rate = rs.getDouble("EFF_COST"); rate = rs.getDouble("EFF_COST");
curRecordItemLotHMap.put("cust_code", checkNull(rs.getString("CUST_CODE"))); curRecordItemLotHMap.put("cust_code", checkNull(rs.getString("CUST_CODE")));
curRecordItemLotHMap.put("item_code", checkNull(rs.getString("ITEM_CODE"))); curRecordItemLotHMap.put("item_code", checkNull(rs.getString("ITEM_CODE")));
...@@ -7870,12 +7944,13 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -7870,12 +7944,13 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
+ " AND SDET.LOT_NO = ?" + " AND SDET.LOT_NO = ?"
+ " AND SRET.SITE_CODE = ?" + " AND SRET.SITE_CODE = ?"
+ " AND SRET.CUST_CODE = ?"; + " AND SRET.CUST_CODE = ?";
if(editFlag != null && "E".equalsIgnoreCase(editFlag)) /*if(editFlag != null && "E".equalsIgnoreCase(editFlag))
{ {
sql = sql +" AND SDET.TRAN_ID <> ?" ; sql = sql +" AND SDET.TRAN_ID <> ?" ;
//Added by Santosh on 20/09/2017 for bug fix split qty validatoin in edit mode //Added by Santosh on 20/09/2017 for bug fix split qty validatoin in edit mode
sql = sql +" AND SDET.LINE_NO <> ?" ; sql = sql +" AND SDET.LINE_NO <> ?" ;
} }*/// commented by nandkumar gadkari on 27/07/19
sql = sql +" AND SDET.TRAN_ID <> ?" ;// added by nandkumar gadkari on 27/07/19
sql = sql + " GROUP BY SDET.INVOICE_ID"; sql = sql + " GROUP BY SDET.INVOICE_ID";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -7886,13 +7961,14 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -7886,13 +7961,14 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
pstmt.setString(3, lsLotNo); pstmt.setString(3, lsLotNo);
pstmt.setString(4, siteCode); pstmt.setString(4, siteCode);
pstmt.setString(5, custCode); pstmt.setString(5, custCode);
if(editFlag != null && "E".equalsIgnoreCase(editFlag)) /*if(editFlag != null && "E".equalsIgnoreCase(editFlag))
{ {
pstmt.setString(6, tranId); pstmt.setString(6, tranId);
//Added by Santosh on 20/09/2017 for bug fix split qty validatoin in edit mode //Added by Santosh on 20/09/2017 for bug fix split qty validatoin in edit mode
pstmt.setString(7, lineNo); pstmt.setString(7, lineNo);
} }*/// commented by nandkumar gadkari on 27/07/19
tranId = tranId == null || tranId.trim().length() == 0 ? " " : tranId;// added by nandkumar gadkari on 27/07/19
pstmt.setString(6, tranId);// added by nandkumar gadkari on 27/07/19
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
...@@ -7944,7 +8020,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -7944,7 +8020,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
errCode = "VTINVADJ"; errCode = "VTINVADJ";
errList.add( errCode ); errList.add( errCode );
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
isValidInvoiceId = false; //isValidInvoiceId = false; commented by nandkumar gadkari on 26/07/19
} }
} }
//Added by Santosh on 23/05/2017 to check if enetered inovice id is availbel for salesreturn[End] //Added by Santosh on 23/05/2017 to check if enetered inovice id is availbel for salesreturn[End]
...@@ -9466,7 +9542,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -9466,7 +9542,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
} }
//added by Nandkumar Gadkari on 23/10/18-------------------Start-------------------------- //added by Nandkumar Gadkari on 23/10/18-------------------Start--------------------------
private String getAvailableInvId(Document dom,Document allDom, HashMap<String, String> curFormItemLotHMap, HashMap<String, String> curRecordItemLotHMap, String invoiceId, String domDocKey, String adjQty) private String getAvailableInvId(Document dom,Document allDom, HashMap<String, String> curFormItemLotHMap, HashMap<String, String> curRecordItemLotHMap, String invoiceId, String domDocKey, double dQtyAdj) // AdjQty change string to double by nandkumar gadkari on 26/07/19
{ {
String retInvoiceId = ""; String retInvoiceId = "";
NodeList detail1NList = null; NodeList detail1NList = null;
...@@ -9475,7 +9551,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -9475,7 +9551,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
String curFormCustCode = "", curFormItemCode = "", curFormLotNo = "", curFormSiteCode = "", curFormQuantity = ""; String curFormCustCode = "", curFormItemCode = "", curFormLotNo = "", curFormSiteCode = "", curFormQuantity = "";
String domCustCode = "", domItemCode = "", domLotNo = "", domSiteCode = "", domQuantity = "", domInvoiceId = ""; String domCustCode = "", domItemCode = "", domLotNo = "", domSiteCode = "", domQuantity = "", domInvoiceId = "";
String curRecCustCode = "", curRecItemCode = "", curRecLotNo = "", curRecSiteCode = "", curRecInvQuantity = "", curRecInvoiceId = ""; String curRecCustCode = "", curRecItemCode = "", curRecLotNo = "", curRecSiteCode = "", curRecInvQuantity = "", curRecInvoiceId = "";
double dQtyAdj = 0.0, dCurRecInvQty = 0.0, dDomQty = 0.0, dTotalDomQty = 0.0; double dCurRecInvQty = 0.0, dDomQty = 0.0, dTotalDomQty = 0.0;
boolean isCurFormDataInDom = false; boolean isCurFormDataInDom = false;
//Added by Santosh on 16/05/2017 //Added by Santosh on 16/05/2017
// String domDocKey = ""; // String domDocKey = "";
...@@ -9496,11 +9572,11 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -9496,11 +9572,11 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
curRecSiteCode = curRecordItemLotHMap.get("site_code").trim(); curRecSiteCode = curRecordItemLotHMap.get("site_code").trim();
curRecInvQuantity = curRecordItemLotHMap.get("quantity").trim(); curRecInvQuantity = curRecordItemLotHMap.get("quantity").trim();
System.out.println("adjQty["+adjQty+"] curRecQuantity["+curRecInvQuantity+"]"); System.out.println("adjQty["+dQtyAdj+"] curRecQuantity["+curRecInvQuantity+"]");
invoiceId=invoiceId.trim();// trim() by Nandkumar Gadkari on 25/10/18 invoiceId=invoiceId.trim();// trim() by Nandkumar Gadkari on 25/10/18
/*dQtyAdj = Double.parseDouble(adjQty); /*dQtyAdj = Double.parseDouble(adjQty);
dCurRecInvQty = Double.parseDouble(curRecInvQuantity);*/ dCurRecInvQty = Double.parseDouble(curRecInvQuantity);*/
dQtyAdj = adjQty == null || adjQty.trim().length()== 0 ? 0 :Double.parseDouble(adjQty); //dQtyAdj = adjQty == null || adjQty.trim().length()== 0 ? 0 :Double.parseDouble(adjQty);commented by nandkumar on 26/07/19
dCurRecInvQty = curRecInvQuantity == null || curRecInvQuantity.trim().length()== 0 ? 0 : Double.parseDouble(curRecInvQuantity); dCurRecInvQty = curRecInvQuantity == null || curRecInvQuantity.trim().length()== 0 ? 0 : Double.parseDouble(curRecInvQuantity);
System.out.println("dQtyAdj["+dQtyAdj+"] dCurRecInvQty["+dCurRecInvQty+"]"); System.out.println("dQtyAdj["+dQtyAdj+"] dCurRecInvQty["+dCurRecInvQty+"]");
...@@ -9835,5 +9911,84 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -9835,5 +9911,84 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
return valueXmlString; return valueXmlString;
} }
//Pavan Rane 22Jul19 end //Pavan Rane 22Jul19 end
private double getDomQuantityUsed(Document allDom, HashMap<String, String> curDomDataHMap)
{
double retDomQty = 0.0, dDomQty = 0.0;
String curDomCustCode = "", curDomItemCode = "", curDomLotNo = "", curDomSiteCode = "", curDomInvoiceId = "";
String domCustCode = "", domItemCode = "", domLotNo = "", domSiteCode = "", domQuantity = "", domInvoiceId = "";
NodeList detail1NList = null, detail2NList = null;
Node detail1Node = null;
String curDomDocKey = "", domDocKey = "";
String domLineNo = "", curDomLineNo = "";
Node eachDetail2Node = null;
try
{
//curDomCustCode = (curDomDataHMap.get("cust_code"));
curDomItemCode = checkNullandTrim(curDomDataHMap.get("item_code"));
curDomLotNo = checkNullandTrim(curDomDataHMap.get("lot_no"));
//curDomSiteCode = (curDomDataHMap.get("site_code").trim();
curDomDocKey = checkNullandTrim(curDomDataHMap.get("doc_key"));
curDomLineNo = checkNullandTrim(curDomDataHMap.get("line_no"));
detail1NList = allDom.getElementsByTagName("Detail1");
detail1Node = detail1NList.item(0);
detail2NList = allDom.getElementsByTagName("Detail2");
int noOfDetails = detail2NList.getLength();
System.out.println("inside side loop:"+noOfDetails);
for(int i=0; i< noOfDetails; i++)
{
System.out.println("inside side loop");
eachDetail2Node = detail2NList.item(i);
System.out.println("inside side 223");
//domCustCode = genericUtility.getColumnValueFromNode("cust_code", detail1Node).trim();
domItemCode = checkNullandTrim(genericUtility.getColumnValueFromNode("item_code", eachDetail2Node));
domLotNo = checkNullandTrim(genericUtility.getColumnValueFromNode("lot_no", eachDetail2Node));
//domSiteCode = genericUtility.getColumnValueFromNode("site_code", detail1Node).trim();
domQuantity =(genericUtility.getColumnValueFromNode("quantity", eachDetail2Node));
domDocKey = checkNullandTrim(genericUtility.getColumnValueFromNode("doc_key", eachDetail2Node));
domLineNo = checkNullandTrim(genericUtility.getColumnValueFromNode("line_no", eachDetail2Node));
System.out.println("curDomDocKey["+curDomDocKey+"] domDocKey ["+domDocKey+"]");
System.out.println("curDomCustCode["+curDomCustCode+"] domCustCode ["+domCustCode+"]");
System.out.println("curDomItemCode["+curDomItemCode+"] domItemCode ["+domItemCode+"]");
System.out.println("curDomLotNo["+curDomLotNo+"] domLotNo ["+domLotNo+"]");
System.out.println("curDomSiteCode["+curDomSiteCode+"] domSiteCode ["+domSiteCode+"]");
System.out.println("curDomLineNo["+curDomLineNo+"] domLineNo ["+domLineNo+"]");
System.out.println("retDomQty["+retDomQty+"] domQuantity ["+domQuantity+"]");
dDomQty =domQuantity == null || domQuantity.trim().length() == 0 ? 0 : Double.parseDouble(domQuantity.trim());
if( curDomDocKey.equalsIgnoreCase(domDocKey) &&
//curDomCustCode.equalsIgnoreCase(domCustCode) &&
curDomItemCode.equalsIgnoreCase(domItemCode) &&
curDomLotNo.equalsIgnoreCase(domLotNo) &&
// curDomSiteCode.equalsIgnoreCase(domSiteCode) &&
!curDomLineNo.equalsIgnoreCase(domLineNo))
{
retDomQty += dDomQty;
}
}
}
catch(Exception e)
{
e.printStackTrace();
System.out.println("SalesReturn.getDomQuantityUsed()["+e.getMessage()+"]");
}
return retDomQty;
}
private String checkNullandTrim(String input) {
if (input == null)
{
input = "";
}
return input.trim();
}
private double checkDoubleNull(String input)
{
double var=0.0;
if (input != null && input.trim().length() > 0)
{
var =Double.parseDouble(input);
}
return var;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment