Skip to content

B
business-java
Commit caec4432 authored by kshinde's avatar kshinde
Browse files
Options

Changed duplicate challan no logic error and appending of values in itemdefaultedit before locking. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104826 ce508802-f39f-4f6c-b175-0d175dae99d5
parent bd24c062
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 9 deletions
webitm-dis/ibase/webitm/ejb/dis/PoReceiptIc.java
View file @ caec4432
......@@ -792,7 +792,7 @@ public class PoReceiptIc extends ValidatorEJB implements PoReceiptIcLocal,PoRec
+ " 00:00:00.0");
}
tranId = genericUtility.getColumnValue("tran_id", dom);
if( tranId ==null || tranId.trim().length() > 0 )
if( tranId!=null || tranId.trim().length() > 0 )
{
tranId = "@@@@";
}
......@@ -5912,6 +5912,9 @@ public class PoReceiptIc extends ValidatorEJB implements PoReceiptIcLocal,PoRec
lsitemcode =checkNull (genericUtility.getColumnValue("item_code", dom));
String lsautogeneratelotno="", lsNull="",lsLotNoManualSite="", lssitestring="" ,lsexit="",lsgenlotauto="";
lssite = checkNull(genericUtility.getColumnValue("site_code", dom1));
String lotNo=(genericUtility.getColumnValue("lot_no", dom));
String rate=(genericUtility.getColumnValue("rate", dom));
String reasCode=(genericUtility.getColumnValue("reas_code", dom));
sql="select qc_reqd from siteitem where item_code = ? and site_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsitemcode);
......@@ -5980,7 +5983,7 @@ public class PoReceiptIc extends ValidatorEJB implements PoReceiptIcLocal,PoRec
pstmt = null;
if("N".equalsIgnoreCase(lsgenlotauto))
{
valueXmlString.append("<lot_no protect =\"0\">").append("</lot_no>");
valueXmlString.append("<lot_no protect =\"0\">").append("<![CDATA["+lotNo+"]]>").append("</lot_no>");
}
else
{
......@@ -5988,11 +5991,11 @@ public class PoReceiptIc extends ValidatorEJB implements PoReceiptIcLocal,PoRec
{
if("Y".equalsIgnoreCase(lsqcreqd))
{
valueXmlString.append("<lot_no protect =\"1\">").append("</lot_no>");
valueXmlString.append("<lot_no protect =\"1\">").append("<![CDATA["+lotNo+"]]>").append("</lot_no>");
}
else
{
valueXmlString.append("<lot_no protect =\"0\">").append("</lot_no>");
valueXmlString.append("<lot_no protect =\"0\">").append("<![CDATA["+lotNo+"]]>").append("</lot_no>");
}
}
else
......@@ -6001,8 +6004,8 @@ public class PoReceiptIc extends ValidatorEJB implements PoReceiptIcLocal,PoRec
{
if("Y".equalsIgnoreCase(lsautogeneratelotno))
{
valueXmlString.append("<lot_no >").append(" ").append("</lot_no>");
valueXmlString.append("<lot_no protect =\"1\">").append("</lot_no>");
valueXmlString.append("<lot_no >").append("<![CDATA["+lotNo+"]]>").append("</lot_no>");
valueXmlString.append("<lot_no protect =\"1\">").append("<![CDATA[").append(lotNo).append("]]>").append("</lot_no>");
}
else
{
......@@ -6033,13 +6036,13 @@ public class PoReceiptIc extends ValidatorEJB implements PoReceiptIcLocal,PoRec
}
if("N".equalsIgnoreCase(lsporateoption))
{
valueXmlString.append("<rate protect =\"1\">").append("<![CDATA[0]]>").append("</rate>");
valueXmlString.append("<rate protect =\"1\">").append("<![CDATA["+rate+"]]>").append("</rate>");
}
else
{
valueXmlString.append("<rate protect =\"0\">").append("<![CDATA[0]]>").append("</rate>");
valueXmlString.append("<rate protect =\"0\">").append("<![CDATA["+rate+"]]>").append("</rate>");
}
valueXmlString.append("<reas_code protect =\"1\">").append("<![CDATA[]]>").append("</reas_code>");
valueXmlString.append("<reas_code protect =\"1\">").append("<![CDATA["+reasCode+"]]>").append("</reas_code>");
}
else if (currentColumn.trim().equalsIgnoreCase("purc_order"))
{
......
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