Skip to content

B
business-java
Commit d316454a 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@196320 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ce772c86
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 8 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesReturn.java
View file @ d316454a
......@@ -408,6 +408,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
String shExpDiscAppl="";
Timestamp invRefDateStr=null;// Added by Nandkumar Gadkari on 19MAR2018
ArrayList<String> dokkeyList=null; // Added by Nandkumar Gadkari on 14/09/18
String expDateStrg="",mfgDateStrg="";// added by nandkumar gadkari on 28/01/19
try
{
// Changed by Sneha on 22-07-2016 for exchange rate [Start]
......@@ -1914,6 +1915,42 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
}
}
//Added by sarita on 29 JUN 18 [END] on edit mode if exp_date available against lot_no , lot_sl , item_code and site_code in stock then system should not allow to change exp_date
//ADDED BY NANDKUMAR GADKARI ON 28/01/19--start
mfgDateStrg = genericUtility.getColumnValue("mfg_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(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
} // end itm_defaultedit
else if(currentColumn.trim().equalsIgnoreCase("item_code"))
{
......@@ -2193,7 +2230,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
varValue = varValue == null ?"0" : varValue.trim();
if (varValue == null || Double.parseDouble(varValue) <= 0)
{
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" );
System.out.println("manohar rate__stduom 1 [" + rate + "]");
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + rate + "]]>").append("</rate__stduom>");
......@@ -2430,13 +2467,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
quantity = Double.parseDouble( convAr.get(1).toString() );
//tempNode = dom.getElementsByTagName("quantity__stduom").item(0);
//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
{
convFact = 1;
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 ) );
valueXmlString.append("<quantity__stduom>").append("<![CDATA[" + getRequiredDecimal( quantity, 3 ) + "]]>").append("</quantity__stduom>");
setNodeValue( dom, "quantity__stduom", getRequiredDecimal( quantity, 3 ) );
......@@ -2840,7 +2879,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt.close();
pstmt = 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" );
infoMap = new HashMap();
......@@ -2988,7 +3027,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
System.out.println("manohar rate__stduom 3 [" + getRequiredDecimal( rate, 4 ) + "]");
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + getRequiredDecimal( rate, 4 ) + "]]>").append("</rate__stduom>");
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" );
}
else
......@@ -4244,7 +4283,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
System.out.println("manohar rate__stduom 5 [" + rate + "]");
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + rate + "]]>").append("</rate__stduom>");
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" );
}
else if ( unitRate != null && unit != null && !unit.trim().equals( unitRate.trim() ) )
......@@ -6628,7 +6667,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
System.out.println("manohar rate__stduom 5 [" + rate + "]");
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + rate + "]]>").append("</rate__stduom>");
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" );
}
else if ( unitRate != null && unit != null && !unit.trim().equals( unitRate.trim() ) )
......@@ -11436,7 +11475,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
valueXmlString.append("<exp_date protect =\"0\">").append("<![CDATA[]]>").append("</exp_date>");
}
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>"); //protected by nandkumar gadkari on 29/01/19
}catch (Exception e) {
......
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