Skip to content

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

columns are make as protected 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@196314 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1efbda21
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 38 deletions
webitm-dis/ibase/webitm/ejb/dis/SReturnForm.java
View file @ 0d421cda
...@@ -210,7 +210,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -210,7 +210,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
String contractNo="";//added by priyanka on 15/06/15 String contractNo="";//added by priyanka on 15/06/15
double contractRate = 0.0; double contractRate = 0.0;
int cntItemLotInfo=0; // 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;
try try
{ {
...@@ -1135,6 +1136,46 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -1135,6 +1136,46 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
if (cnt > 0 ) if (cnt > 0 )
{ {
valueXmlString.append("<ret_opt protect =\"1\">").append(retOpt).append("</ret_opt>"); valueXmlString.append("<ret_opt protect =\"1\">").append(retOpt).append("</ret_opt>");
//ADDED BY NANDKUMAR GADKARI ON 28/01/19--start
mfgDateStrg = genericUtility.getColumnValue("mfg_date",dom);
expDateStrg = genericUtility.getColumnValue("exp_date",dom);
packCode = genericUtility.getColumnValue("pack_code",dom);
siteCodeMfg = genericUtility.getColumnValue("site_code__mfg",dom);
unit = genericUtility.getColumnValue("unit",dom);
unitRate = genericUtility.getColumnValue("unit__rate",dom);
unitStd = genericUtility.getColumnValue("unit__std",dom);
varValue = genericUtility.getColumnValue("conv__qty_stduom",dom);
valStr = genericUtility.getColumnValue("conv__rtuom_stduom",dom);
unit = unit == null ?"" : unit.trim();
unitRate = unitRate == null ?"" : unitRate.trim();
unitStd = unitStd == null ?"" : unitStd.trim();
if(mfgDateStrg !=null && mfgDateStrg.trim().length()>0)
{
valueXmlString.append("<mfg_date protect =\"1\">").append("<![CDATA[" + (mfgDateStrg) + "]]>").append("</mfg_date>");
}
if(expDateStrg !=null && expDateStrg.trim().length()>0)
{
valueXmlString.append("<exp_date protect =\"1\">").append("<![CDATA[" + (expDateStrg) + "]]>").append("</exp_date>");
}
if(packCode !=null && packCode.trim().length()>0)
{
valueXmlString.append("<pack_code protect =\"1\">").append("<![CDATA[" + packCode + "]]>").append("</pack_code>");
}
if(siteCodeMfg !=null && siteCodeMfg.trim().length()>0)
{
valueXmlString.append("<site_code__mfg protect =\"1\">").append("<![CDATA[" + siteCodeMfg + "]]>").append("</site_code__mfg>");
}
if ( unit.trim().equals(unitRate.trim()) && unit.trim().length()>0 )
{
valueXmlString.append("<conv__rtuom_stduom protect =\"1\">").append("<![CDATA["+valStr+"]]>").append("</conv__rtuom_stduom>");
}
if ( unit.trim().equals(unitStd.trim()) && unit.trim().length()>0 )
{
valueXmlString.append("<conv__qty_stduom protect =\"1\">").append("<![CDATA["+varValue+"]]>").append("</conv__qty_stduom>");
}
//ADDED BY NANDKUMAR GADKARI ON 28/01/19 ---end
} }
else else
{ {
...@@ -1549,11 +1590,13 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -1549,11 +1590,13 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
convAr = distCommon.convQtyFactor(unit, unitRate, itemCode,mrate, 0, conn); convAr = distCommon.convQtyFactor(unit, unitRate, itemCode,mrate, 0, conn);
convRateStdUom = Double.parseDouble(convAr.get(0).toString()); convRateStdUom = Double.parseDouble(convAr.get(0).toString());
rateStduom = Double.parseDouble(convAr.get(1).toString()); rateStduom = Double.parseDouble(convAr.get(1).toString());
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + round(convRateStdUom, 3) + "]]>").append("</conv__rtuom_stduom>");// added by nandkumar gadkari on 29/01/19
} }
else else
{ {
convRateStdUom = 1; convRateStdUom = 1;
rateStduom = mrate; rateStduom = mrate;
valueXmlString.append("<conv__rtuom_stduom protect =\"1\">").append("<![CDATA[" + round(convRateStdUom, 3) + "]]>").append("</conv__rtuom_stduom>");// added by nandkumar gadkari on 29/01/19
} }
if (rateStduom == -9.99999999E8) if (rateStduom == -9.99999999E8)
{ {
...@@ -1564,7 +1607,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -1564,7 +1607,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
temp = String.valueOf(rateStduom); temp = String.valueOf(rateStduom);
} }
System.out.println("rate kunal ="+mrate+" conv__rtuom_stduom= "+convRateStdUom +" rateSTDUOm="+temp); System.out.println("rate kunal ="+mrate+" conv__rtuom_stduom= "+convRateStdUom +" rateSTDUOm="+temp);
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + round(convRateStdUom, 3) + "]]>").append("</conv__rtuom_stduom>"); //valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + round(convRateStdUom, 3) + "]]>").append("</conv__rtuom_stduom>"); // // commented by nandkumar gadkari on 29/01/19
setNodeValue( dom, "conv__rtuom_stduom", round(convRateStdUom, 3) ); setNodeValue( dom, "conv__rtuom_stduom", round(convRateStdUom, 3) );
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + temp + "]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA[" + temp + "]]>").append("</rate__stduom>");
setNodeValue( dom, "rate__stduom", temp ); setNodeValue( dom, "rate__stduom", temp );
...@@ -1611,11 +1654,13 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -1611,11 +1654,13 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
convAr = distCommon.convQtyFactor(unit, unitRate, itemCode,rate, 0, conn); convAr = distCommon.convQtyFactor(unit, unitRate, itemCode,rate, 0, conn);
convRateStdUom = Double.parseDouble(convAr.get(0).toString()); convRateStdUom = Double.parseDouble(convAr.get(0).toString());
rateStduom = Double.parseDouble(convAr.get(1).toString()); rateStduom = Double.parseDouble(convAr.get(1).toString());
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + round(convRateStdUom, 3) + "]]>").append("</conv__rtuom_stduom>");// added by nandkumar gadkari on 29/01/19
} }
else else
{ {
convRateStdUom = 1; convRateStdUom = 1;
rateStduom = rate; rateStduom = rate;
valueXmlString.append("<conv__rtuom_stduom protect =\"1\">").append("<![CDATA[" + round(convRateStdUom, 3) + "]]>").append("</conv__rtuom_stduom>");// added by nandkumar gadkari on 29/01/19
} }
if (rateStduom == -9.99999999E8) if (rateStduom == -9.99999999E8)
{ {
...@@ -1626,7 +1671,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -1626,7 +1671,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
temp = String.valueOf(rateStduom); temp = String.valueOf(rateStduom);
} }
System.out.println("rate kunal ="+rate+" conv__rtuom_stduom= "+convRateStdUom +" rateSTDUOm="+temp); System.out.println("rate kunal ="+rate+" conv__rtuom_stduom= "+convRateStdUom +" rateSTDUOm="+temp);
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + round(convRateStdUom, 3) + "]]>").append("</conv__rtuom_stduom>"); //valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + round(convRateStdUom, 3) + "]]>").append("</conv__rtuom_stduom>");// commented by nandkumar gadkari on 29/01/19
setNodeValue( dom, "conv__rtuom_stduom", round(convRateStdUom, 3) ); setNodeValue( dom, "conv__rtuom_stduom", round(convRateStdUom, 3) );
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + temp + "]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA[" + temp + "]]>").append("</rate__stduom>");
setNodeValue( dom, "rate__stduom", temp ); setNodeValue( dom, "rate__stduom", temp );
...@@ -1653,11 +1698,13 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -1653,11 +1698,13 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
convAr = distCommon.convQtyFactor(unit, unitRate, itemCode,rate, 0, conn); convAr = distCommon.convQtyFactor(unit, unitRate, itemCode,rate, 0, conn);
convRateStdUom = Double.parseDouble(convAr.get(0).toString()); convRateStdUom = Double.parseDouble(convAr.get(0).toString());
rateStduom = Double.parseDouble(convAr.get(1).toString()); rateStduom = Double.parseDouble(convAr.get(1).toString());
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + round(convRateStdUom, 3) + "]]>").append("</conv__rtuom_stduom>");// added by nandkumar gadkari on 29/01/19
} }
else else
{ {
convRateStdUom = 1; convRateStdUom = 1;
rateStduom = rate; rateStduom = rate;
valueXmlString.append("<conv__rtuom_stduom protect =\"1\">").append("<![CDATA[" + round(convRateStdUom, 3) + "]]>").append("</conv__rtuom_stduom>");// added by nandkumar gadkari on 29/01/19
} }
if (rateStduom == -9.99999999E8) if (rateStduom == -9.99999999E8)
{ {
...@@ -1668,7 +1715,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -1668,7 +1715,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
temp = String.valueOf(rateStduom); temp = String.valueOf(rateStduom);
} }
System.out.println("rate kunal ="+rate+" conv__rtuom_stduom= "+convRateStdUom +" rateSTDUOm="+temp); System.out.println("rate kunal ="+rate+" conv__rtuom_stduom= "+convRateStdUom +" rateSTDUOm="+temp);
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + round(convRateStdUom, 3) + "]]>").append("</conv__rtuom_stduom>"); //valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + round(convRateStdUom, 3) + "]]>").append("</conv__rtuom_stduom>");// commented by nandkumar gadkari on 29/01/19
setNodeValue( dom, "conv__rtuom_stduom", round(convRateStdUom, 3) ); setNodeValue( dom, "conv__rtuom_stduom", round(convRateStdUom, 3) );
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + temp + "]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA[" + temp + "]]>").append("</rate__stduom>");
setNodeValue( dom, "rate__stduom", temp ); setNodeValue( dom, "rate__stduom", temp );
...@@ -1841,13 +1888,15 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -1841,13 +1888,15 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
quantity = Double.parseDouble( convAr.get(1).toString() ); quantity = Double.parseDouble( convAr.get(1).toString() );
//tempNode = dom.getElementsByTagName("quantity__stduom").item(0); //tempNode = dom.getElementsByTagName("quantity__stduom").item(0);
//tempNode.getFirstChild().setNodeValue("" + quantity); //tempNode.getFirstChild().setNodeValue("" + quantity);
valueXmlString.append("<conv__qty_stduom>").append("<![CDATA[" + getRequiredDecimal( convFact, 3 ) + "]]>").append("</conv__qty_stduom>");// added by nandkumar gadkari on 29/01/19
} }
else else
{ {
convFact = 1; convFact = 1;
quantity = sQuantity; quantity = sQuantity;
valueXmlString.append("<conv__qty_stduom protect =\"1\">").append("<![CDATA[" + getRequiredDecimal( convFact, 3 ) + "]]>").append("</conv__qty_stduom>");// added by nandkumar gadkari on 29/01/19
} }
valueXmlString.append("<conv__qty_stduom>").append("<![CDATA[" + getRequiredDecimal( convFact, 3 ) + "]]>").append("</conv__qty_stduom>"); //valueXmlString.append("<conv__qty_stduom>").append("<![CDATA[" + getRequiredDecimal( convFact, 3 ) + "]]>").append("</conv__qty_stduom>");// commented by nandkumar gadkari on 29/01/19
setNodeValue( dom, "conv__qty_stduom", getRequiredDecimal( convFact, 3 ) ); setNodeValue( dom, "conv__qty_stduom", getRequiredDecimal( convFact, 3 ) );
valueXmlString.append("<quantity__stduom>").append("<![CDATA[" + getRequiredDecimal( quantity, 3 ) + "]]>").append("</quantity__stduom>"); valueXmlString.append("<quantity__stduom>").append("<![CDATA[" + getRequiredDecimal( quantity, 3 ) + "]]>").append("</quantity__stduom>");
setNodeValue( dom, "quantity__stduom", getRequiredDecimal( quantity, 3 ) ); setNodeValue( dom, "quantity__stduom", getRequiredDecimal( quantity, 3 ) );
...@@ -2196,7 +2245,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -2196,7 +2245,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
} }
} }
valueXmlString.append("<conv__qty_stduom>").append("<![CDATA[1]]>").append("</conv__qty_stduom>"); valueXmlString.append("<conv__qty_stduom protect =\"1\">").append("<![CDATA[1]]>").append("</conv__qty_stduom>"); // column protected by nandkumar gadkari on 29/01/19
setNodeValue( dom, "conv__qty_stduom", "1" ); setNodeValue( dom, "conv__qty_stduom", "1" );
unit = unit == null ?"" : unit.trim(); unit = unit == null ?"" : unit.trim();
unitRate = unitRate == null ?"" : unitRate.trim(); unitRate = unitRate == null ?"" : unitRate.trim();
...@@ -2205,7 +2254,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -2205,7 +2254,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
System.out.println("manohar rate__stduom 3 [" + getRequiredDecimal( rate, 4 ) + "]"); System.out.println("manohar rate__stduom 3 [" + getRequiredDecimal( rate, 4 ) + "]");
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + getRequiredDecimal( rate, 4 ) + "]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA[" + getRequiredDecimal( rate, 4 ) + "]]>").append("</rate__stduom>");
setNodeValue( dom, "rate__stduom", getRequiredDecimal( rate, 4 ) ); setNodeValue( dom, "rate__stduom", getRequiredDecimal( rate, 4 ) );
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[1]]>").append("</conv__rtuom_stduom>"); valueXmlString.append("<conv__rtuom_stduom protect =\"1\">").append("<![CDATA[1]]>").append("</conv__rtuom_stduom>");// column protected by nandkumar gadkari on 29/01/19
setNodeValue( dom, "conv__rtuom_stduom", "1" ); setNodeValue( dom, "conv__rtuom_stduom", "1" );
} }
else else
...@@ -2612,7 +2661,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -2612,7 +2661,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
rs = null; rs = null;
valueXmlString.append("<conv__qty_stduom>").append("<![CDATA[1]]>").append("</conv__qty_stduom>"); valueXmlString.append("<conv__qty_stduom protect =\"1\">").append("<![CDATA[1]]>").append("</conv__qty_stduom>"); // column protected by nandkumar gadkari on 29/01/19
setNodeValue( dom, "conv__qty_stduom", "1" ); setNodeValue( dom, "conv__qty_stduom", "1" );
infoMap = new HashMap(); infoMap = new HashMap();
...@@ -2760,7 +2809,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -2760,7 +2809,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
System.out.println("manohar rate__stduom 3 [" + getRequiredDecimal( rate, 4 ) + "]"); System.out.println("manohar rate__stduom 3 [" + getRequiredDecimal( rate, 4 ) + "]");
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + getRequiredDecimal( rate, 4 ) + "]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA[" + getRequiredDecimal( rate, 4 ) + "]]>").append("</rate__stduom>");
setNodeValue( dom, "rate__stduom", getRequiredDecimal( rate, 4 ) ); setNodeValue( dom, "rate__stduom", getRequiredDecimal( rate, 4 ) );
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[1]]>").append("</conv__rtuom_stduom>"); valueXmlString.append("<conv__rtuom_stduom protect =\"1\">").append("<![CDATA[1]]>").append("</conv__rtuom_stduom>");// column protected by nandkumar gadkari on 29/01/19
setNodeValue( dom, "conv__rtuom_stduom", "1" ); setNodeValue( dom, "conv__rtuom_stduom", "1" );
} }
else else
...@@ -3179,28 +3228,32 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3179,28 +3228,32 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
if (tempInvoiceId == null || tempInvoiceId.trim().length() == 0) if (tempInvoiceId == null || tempInvoiceId.trim().length() == 0)
{ {
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, " //COMMENTED BY NANDKUMAR GADKARI ON 28/01/19
+ " FROM MIN_RATE_HISTORY MRH, SRETURNDET SRDET" + " MRH.EFF_COST"
+ " WHERE MRH.DOC_KEY =SRDET.DOC_KEY(+) AND MRH.CUST_CODE = ?" + " FROM MIN_RATE_HISTORY MRH"
+ " AND MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?" //+ ", SRETURNDET SRDET" //COMMENTED BY NANDKUMAR GADKARI ON 28/01/19
+ " WHERE "
//+ "MRH.DOC_KEY =SRDET.DOC_KEY(+) AND MRH.CUST_CODE = ?" //COMMENTED BY NANDKUMAR GADKARI ON 28/01/19
//+ " AND "
+ " MRH.ITEM_CODE = ? AND MRH.LOT_NO = ?"
+ " AND MRH.SITE_CODE = ? " + " AND MRH.SITE_CODE = ? "
+ " AND MRH.QUANTITY IS NOT NULL" // + " 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 "
+ orderByStr; + orderByStr;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode); //pstmt.setString(1, custCode);
pstmt.setString(2, itemCode); pstmt.setString(1, itemCode);
pstmt.setString(3, lotNo); pstmt.setString(2, lotNo);
pstmt.setString(4, siteCode); pstmt.setString(3, siteCode);
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")); //COMMENTED BY NANDKUMAR GADKARI ON 28/01/19
rate = rs.getDouble("EFF_COST"); rate = rs.getDouble("EFF_COST");
...@@ -3399,6 +3452,13 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3399,6 +3452,13 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
invoiceId = null; invoiceId = null;
} }
else
{
valueXmlString.append("<doc_key>").append("<![CDATA[]]>").append("</doc_key>");
valueXmlString.append("<invoice_ref>").append("<![CDATA[]]>").append("</invoice_ref>");
valueXmlString.append("<inv_ref_date>").append("<![CDATA[]]>").append("</inv_ref_date>");
}
} }
else if(invoiceId != null && invoiceId.trim().length()>0) else if(invoiceId != null && invoiceId.trim().length()>0)
{ {
...@@ -3454,11 +3514,6 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3454,11 +3514,6 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
break; break;
} }
} }
if (tempInvoiceId != null && tempInvoiceId.trim().length() > 0)
{
break;
}
if (pstmt != null) { if (pstmt != null) {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
...@@ -3467,6 +3522,12 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3467,6 +3522,12 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
rs.close(); rs.close();
rs = null; rs = null;
} }
if (tempInvoiceId != null && tempInvoiceId.trim().length() > 0)
{
break;
}
} }
...@@ -3792,7 +3853,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3792,7 +3853,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
System.out.println("manohar rate__stduom 5 [" + rate + "]"); System.out.println("manohar rate__stduom 5 [" + rate + "]");
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + rate + "]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA[" + rate + "]]>").append("</rate__stduom>");
setNodeValue( dom, "rate__stduom", rate ); setNodeValue( dom, "rate__stduom", rate );
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[1]]>").append("</conv__rtuom_stduom>"); valueXmlString.append("<conv__rtuom_stduom protect =\"1\">").append("<![CDATA[1]]>").append("</conv__rtuom_stduom>");// column protected by nandkumar gadkari on 29/01/19
setNodeValue( dom, "conv__rtuom_stduom", "1" ); setNodeValue( dom, "conv__rtuom_stduom", "1" );
} }
else if ( unitRate != null && unit != null && !unit.trim().equals( unitRate.trim() ) ) else if ( unitRate != null && unit != null && !unit.trim().equals( unitRate.trim() ) )
...@@ -3861,20 +3922,19 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3861,20 +3922,19 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
{ {
lotSl = " "; lotSl = " ";
} }
sql = "select a.site_code__mfg, a.mfg_date, a.exp_date, a.pack_code " //Changed by nandkumar gahdari 28/01/2019 to set values from item_lot_info
+ " from stock a " sql = "select site_code__mfg, mfg_date, exp_date, pack_code "
+ " where a.item_code = ? " + " from item_lot_info "
+ " and a.site_code = ? " + " where item_code = ? "
+ " and a.lot_no = ? " + " and lot_no = ? ";
+ " and a.lot_sl = ? ";
pstmt= conn.prepareStatement( sql ); pstmt= conn.prepareStatement( sql );
pstmt.setString( 1, itemCode); pstmt.setString( 1, itemCode);
pstmt.setString( 2, siteCode); pstmt.setString( 2, lotNo);
pstmt.setString( 3, lotNo);
pstmt.setString( 4, lotSl);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if( rs.next() ) if( rs.next() )
{ {
cntItemLotInfo++;
siteCodeMfg = rs.getString(1); siteCodeMfg = rs.getString(1);
mfgDate = rs.getTimestamp(2); mfgDate = rs.getTimestamp(2);
expDate = rs.getTimestamp(3); expDate = rs.getTimestamp(3);
...@@ -3884,6 +3944,34 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3884,6 +3944,34 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
rs = null; rs = null;
if(cntItemLotInfo==0)
{
sql = "select a.site_code__mfg, a.mfg_date, a.exp_date, a.pack_code "
+ " from stock a "
+ " where a.item_code = ? "
+ " and a.site_code = ? "
+ " and a.lot_no = ? "
+ " and a.lot_sl = ? ";
pstmt= conn.prepareStatement( sql );
pstmt.setString( 1, itemCode);
pstmt.setString( 2, siteCode);
pstmt.setString( 3, lotNo);
pstmt.setString( 4, lotSl);
rs = pstmt.executeQuery();
if( rs.next() )
{
siteCodeMfg = rs.getString(1);
mfgDate = rs.getTimestamp(2);
expDate = rs.getTimestamp(3);
packCode = rs.getString(4);
}
rs.close();
pstmt.close();
pstmt = null;
rs = null;
}
cntItemLotInfo=0;
if (siteCodeMfg == null || siteCodeMfg.equals("null") || siteCodeMfg.trim().length() == 0) if (siteCodeMfg == null || siteCodeMfg.equals("null") || siteCodeMfg.trim().length() == 0)
{ {
siteCodeMfg = getMfgSitePackCode(itemCode, siteCode, locCode, lotNo, lotSl, "M", conn); siteCodeMfg = getMfgSitePackCode(itemCode, siteCode, locCode, lotNo, lotSl, "M", conn);
...@@ -3924,8 +4012,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -3924,8 +4012,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
} }
else else
{ {
valueXmlString.append("<mfg_date protect =\"0\">").append("<![CDATA[" + ( mfgDate != null ? new SimpleDateFormat(genericUtility.getApplDateFormat()).format(mfgDate).toString() : "" ) + "]]>").append("</mfg_date>"); valueXmlString.append("<mfg_date protect =\"1\">").append("<![CDATA[" + ( mfgDate != null ? new SimpleDateFormat(genericUtility.getApplDateFormat()).format(mfgDate).toString() : "" ) + "]]>").append("</mfg_date>");
valueXmlString.append("<exp_date protect =\"0\">").append("<![CDATA[" + ( expDate != null ? new SimpleDateFormat(genericUtility.getApplDateFormat()).format(expDate).toString() : "" ) + "]]>").append("</exp_date>"); valueXmlString.append("<exp_date protect =\"1\">").append("<![CDATA[" + ( expDate != null ? new SimpleDateFormat(genericUtility.getApplDateFormat()).format(expDate).toString() : "" ) + "]]>").append("</exp_date>");
valueXmlString.append("<pack_code protect =\"1\">").append("<![CDATA[" + packCode + "]]>").append("</pack_code>"); valueXmlString.append("<pack_code protect =\"1\">").append("<![CDATA[" + packCode + "]]>").append("</pack_code>");
valueXmlString.append("<site_code__mfg protect =\"1\">").append("<![CDATA[" + siteCodeMfg + "]]>").append("</site_code__mfg>"); valueXmlString.append("<site_code__mfg protect =\"1\">").append("<![CDATA[" + siteCodeMfg + "]]>").append("</site_code__mfg>");
} }
...@@ -5872,7 +5960,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -5872,7 +5960,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
System.out.println("manohar rate__stduom 5 [" + rate + "]"); System.out.println("manohar rate__stduom 5 [" + rate + "]");
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + rate + "]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA[" + rate + "]]>").append("</rate__stduom>");
setNodeValue( dom, "rate__stduom", rate ); setNodeValue( dom, "rate__stduom", rate );
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[1]]>").append("</conv__rtuom_stduom>"); valueXmlString.append("<conv__rtuom_stduom protect =\"1\">").append("<![CDATA[1]]>").append("</conv__rtuom_stduom>");// column protected by nandkumar gadkari on 29/01/19
setNodeValue( dom, "conv__rtuom_stduom", "1" ); setNodeValue( dom, "conv__rtuom_stduom", "1" );
} }
else if ( unitRate != null && unit != null && !unit.trim().equals( unitRate.trim() ) ) else if ( unitRate != null && unit != null && !unit.trim().equals( unitRate.trim() ) )
...@@ -7604,6 +7692,34 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu ...@@ -7604,6 +7692,34 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
} }
} }
//validation added by Nandkumar gadkari on 28/01/19-------------------------Start---------------------
itemCode = checkNull(genericUtility.getColumnValue( "item_code", dom ));
llCount=0;
sqlStr = "select count(*) ll_count "
+ " from item_lot_info "
+ " where item_code = ? "
+ " and lot_no = ? ";
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, itemCode );
pstmt.setString( 2, lsLotNo );
rs = pstmt.executeQuery();
if( rs.next() )
{
llCount = rs.getInt( "ll_count" );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if( llCount == 0 )
{
errCode = "VTIVLOTINF";
errList.add( errCode );
errFields.add( childNodeName.toLowerCase() );
}
//validation added by Nandkumar gadkari on 28/01/19-------------------------end---------------------
} }
} }
if( childNodeName.equalsIgnoreCase( "quantity" ) ) if( childNodeName.equalsIgnoreCase( "quantity" ) )
......
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