Skip to content

B
business-java
Commit 58747d40 authored by cpatil's avatar cpatil
Browse files
Options

remove item change of frt type 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93572 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 97d093db
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 39 deletions
webitm-dis/ibase/webitm/ejb/dis/POrderAmdConf.java
View file @ 58747d40
......@@ -47,17 +47,17 @@ POrderAmdConfLocal, POrderAmdConfRemote
System.out.println("POrderAmdConf confirm called..............");
String confirmed = "";
String sql = "";
String sql1 = "";
int status = 0;
//String sql1 = "";
//int status = 0;
double frtAmt = 0.0;
Date lrDate = null;
//Date lrDate = null;
Connection conn = null;
PreparedStatement pstmt = null;
PreparedStatement pstmt1 = null;
//PreparedStatement pstmt1 = null;
ITMDBAccessEJB itmDBAccessEJB = null;
String errString = null;
ResultSet rs = null;
ResultSet rs1 = null;
//ResultSet rs1 = null;
String purcOrder = "", poStatus = "", amdNo = "", workflowStatus = "";
int recCnt = 0, cnt = 0;
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
......@@ -218,12 +218,13 @@ POrderAmdConfLocal, POrderAmdConfRemote
System.out
.println("@@@@@@@@@@@@@@@ gbf_retrieve_pordamd confirm called..............");
loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
Calendar currentDate = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
String sysDateStr = sdf.format(currentDate.getTime());
System.out.println("Now the date is :=> " + sysDateStr);
System.out.println("Now the date is :=> " + sysDateStr+":::loginEmpCode["+loginEmpCode+"]");
sysDate= Timestamp.valueOf(genericUtility.getValidDateString(sysDateStr, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
sql = " select a.tot_amt, case when a.vouch_adv_amt is null then 0 else a.vouch_adv_amt end "
+ " from porder a, poamd_hdr b "
......@@ -396,8 +397,8 @@ POrderAmdConfLocal, POrderAmdConfRemote
int cnt = 0;
// Document dom = null;
String retString = "", sql = "", sql1 = "", purcOrder = "", lineNoOrd = "", errCode = "";
String loginEmpCode = "", ediOption = "", dataStr = "";
double pohdrTot = 0, vouchAdv = 0, amdDetTot = 0, poDetTot = 0, poHdrTot = 0;
//String loginEmpCode = "", ediOption = "", dataStr = "";
//double pohdrTot = 0, vouchAdv = 0, amdDetTot = 0, poDetTot = 0, poHdrTot = 0;
Timestamp sysDate = null, taxDate = null, refDate = null, amdDate = null;
String siteCodeDlv = "", siteCodeOrd = "", siteCodeBill = "", deptCode = "", empCode = "", itemSer = "", taxOpt = "", crTerm = "";
String currCode = "", taxChapHdr = "", taxClassHdr = "", taxEnvHdr = "", remarks = "", projCode = "", salesPers = "", commPerc = "", commPercOn = "";
......
webitm-dis/ibase/webitm/ejb/dis/POrderAmdIC.java
View file @ 58747d40
......@@ -1582,7 +1582,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
qtybrow = quantitybrow==null?0:Double.parseDouble(quantitybrow);
totQty = totalQuantity==null?0:Double.parseDouble(totalQuantity);
totQty = totQty + qtybrow;
} // end if
}
}
recCnt=0;
......@@ -1649,12 +1649,14 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if( childNodeName.equalsIgnoreCase("line_no_ord") ) //
if( childNodeName.equalsIgnoreCase("line_no_ord") )
{
lineNoOrd = checkNull(genericUtility.getColumnValue("line_no_ord", dom1));
lineNoOrd = checkNull(genericUtility.getColumnValue("line_no_ord", dom));
System.out.println("@@@@@1lineNoOrd["+lineNoOrd+"]");
if ( lineNoOrd != null && lineNoOrd.trim().length() > 0 )
{
purcOrder = checkNull(genericUtility.getColumnValue("purc_order", dom1));
purcOrder = checkNull(genericUtility.getColumnValue("purc_order", dom));
System.out.println("@@@@@2purcOrder["+purcOrder+"]");
sql = " select count(1) from pord_term where purc_order = ? and line_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, purcOrder );
......@@ -1678,9 +1680,10 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
}
if( childNodeName.equalsIgnoreCase("term_code") ) //
if( childNodeName.equalsIgnoreCase("term_code") )
{
termCode = checkNull(genericUtility.getColumnValue("term_code", dom1));
termCode = checkNull(genericUtility.getColumnValue("term_code", dom));
System.out.println("@@@@@3termCode["+termCode+"]");
errCode = isExist("pur_term", "term_code", termCode, conn);
if ( "FALSE".equalsIgnoreCase(empCode))
{
......@@ -1690,10 +1693,12 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
}
else
{
lineNoOrd = checkNull(genericUtility.getColumnValue("line_no_ord", dom1));
lineNoOrd = checkNull(genericUtility.getColumnValue("line_no_ord", dom));
System.out.println("@@@@@4lineNoOrd["+lineNoOrd+"]");
if ( lineNoOrd == null || lineNoOrd.trim().length() == 0 )
{
purcOrder = checkNull(genericUtility.getColumnValue("purc_order", dom1));
purcOrder = checkNull(genericUtility.getColumnValue("purc_order", dom));
System.out.println("@@@@@5purcOrder["+purcOrder+"]");
sql = "select count(1) from pord_term where purc_order = ? and term_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, purcOrder );
......@@ -2077,6 +2082,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
String frtType="";
double frtRate=0,frtAmtQty=0,frtAmtFixed=0;
//SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
String frtRateStr = "", frtAmtQtyStr = "", frtAmtFixedStr = "";
try
......@@ -2131,6 +2137,13 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
valueXmlString.append("<amd_date>").append("<![CDATA["+sysDate+"]]>").append("</amd_date>");
valueXmlString.append("<conf_date>").append("<![CDATA["+sysDate+"]]>").append("</conf_date>");
valueXmlString.append("<tax_date>").append("<![CDATA["+sysDate+"]]>").append("</tax_date>");
valueXmlString.append("<frt_type protect = \"0\">").append("<![CDATA["+"Q"+"]]>").append("</frt_type>");
valueXmlString.append("<frt_amt__fixed protect = \"1\">").append("<![CDATA[]]>").append("</frt_amt__fixed>");
valueXmlString.append("<frt_rate protect = \"0\">").append("<![CDATA[]]>").append("</frt_rate>");
valueXmlString.append("<frt_amt__qty protect = \"0\">").append("<![CDATA[]]>").append("</frt_amt__qty>");
}
else if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
{
......@@ -2176,6 +2189,29 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
{
valueXmlString.append("<purc_order protect = \"0\" >").append("<![CDATA["+purcOrder+"]]>").append("</purc_order>");
}
/// for item change frt_type
System.out.println("@@@@@@@@ item change frt_type "+currentColumn);
frtType = checkNull(genericUtility.getColumnValue("frt_type", dom));
frtRateStr = checkNull(genericUtility.getColumnValue("frt_rate", dom));
frtAmtQtyStr = checkNull(genericUtility.getColumnValue("frt_amt__qty", dom));
frtAmtFixedStr = checkNull(genericUtility.getColumnValue("frt_amt__fixed", dom));
System.out.println("frtType["+frtType+"]:::frtAmtFixed["+frtAmtFixedStr+"]");
if("Q".equalsIgnoreCase(frtType ))
{
valueXmlString.append("<frt_amt__fixed protect = \"1\">").append("<![CDATA["+( frtAmtFixedStr )+"]]>").append("</frt_amt__fixed>");
valueXmlString.append("<frt_rate protect = \"0\">").append("<![CDATA["+frtRateStr+"]]>").append("</frt_rate__o>");
valueXmlString.append("<frt_amt__qty protect = \"0\">").append("<![CDATA["+frtAmtQtyStr+"]]>").append("</frt_amt__qty>");
}
else if( "F".equalsIgnoreCase(frtType ))
{
valueXmlString.append("<frt_amt__fixed protect = \"0\">").append("<![CDATA["+ frtAmtFixedStr +"]]>").append("</frt_amt__fixed>");
valueXmlString.append("<frt_rate protect = \"1\">").append("<![CDATA["+frtRateStr+"]]>").append("</frt_rate__o>");
valueXmlString.append("<frt_amt__qty protect = \"1\">").append("<![CDATA["+frtAmtQtyStr+"]]>").append("</frt_amt__qty>");
}
///
}
else if(currentColumn.trim().equalsIgnoreCase("purc_order"))
{
......@@ -2379,43 +2415,56 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
valueXmlString.append("<frt_type>").append("<![CDATA["+checkNull(frtType)+"]]>").append("</frt_type>");
valueXmlString.append("<frt_type__o>").append("<![CDATA["+checkNull(frtType)+"]]>").append("</frt_type__o>");
valueXmlString.append("<frt_rate>").append("<![CDATA["+frtRate+"]]>").append("</frt_rate>");
valueXmlString.append("<frt_rate__o>").append("<![CDATA["+frtRate+"]]>").append("</frt_rate__o>");
if("Q".equalsIgnoreCase(frtType ))
{
valueXmlString.append("<frt_amt__fixed protect = \"1\">").append("<![CDATA["+( frtAmtFixed )+"]]>").append("</frt_amt__fixed>");
valueXmlString.append("<frt_rate protect = \"0\">").append("<![CDATA["+frtRate+"]]>").append("</frt_rate>");
valueXmlString.append("<frt_amt__qty protect = \"0\">").append("<![CDATA["+frtAmtQty+"]]>").append("</frt_amt__qty>");
}
else if( "F".equalsIgnoreCase(frtType ))
{
valueXmlString.append("<frt_amt__fixed protect = \"0\">").append("<![CDATA["+ frtAmtFixed +"]]>").append("</frt_amt__fixed>");
valueXmlString.append("<frt_rate protect = \"1\">").append("<![CDATA["+frtRate+"]]>").append("</frt_rate>");
valueXmlString.append("<frt_amt__qty protect = \"1\">").append("<![CDATA["+frtAmtQty+"]]>").append("</frt_amt__qty>");
}
valueXmlString.append("<frt_amt__qty>").append("<![CDATA["+frtAmtQty+"]]>").append("</frt_amt__qty>");
//valueXmlString.append("<frt_rate>").append("<![CDATA["+frtRate+"]]>").append("</frt_rate>");
valueXmlString.append("<frt_rate__o>").append("<![CDATA["+frtRate+"]]>").append("</frt_rate__o>");
//valueXmlString.append("<frt_amt__qty>").append("<![CDATA["+frtAmtQty+"]]>").append("</frt_amt__qty>");
valueXmlString.append("<frt_amt__qty__o>").append("<![CDATA["+frtAmtQty+"]]>").append("</frt_amt__qty__o>");
valueXmlString.append("<frt_amt__fixed>").append("<![CDATA["+frtAmtFixed+"]]>").append("</frt_amt__fixed>");
//valueXmlString.append("<frt_amt__fixed>").append("<![CDATA["+frtAmtFixed+"]]>").append("</frt_amt__fixed>");
valueXmlString.append("<frt_amt__fixed__o>").append("<![CDATA["+frtAmtFixed+"]]>").append("</frt_amt__fixed__o>");
// end
}
// cpatil
else if(currentColumn.trim().equalsIgnoreCase("frt_type") || currentColumn.trim().equalsIgnoreCase("frt_rate") || currentColumn.trim().equalsIgnoreCase("frt_amt__qty"))
else if(currentColumn.trim().equalsIgnoreCase("frt_type") )
{
System.out.println("@@@@@@@@ item change call for "+currentColumn);
frtType = checkNull(genericUtility.getColumnValue("frt_type", dom));
String frtRateStr = genericUtility.getColumnValue("frt_rate", dom);
String frtAmtQtyStr = genericUtility.getColumnValue("frt_amt__qty", dom);
String frtAmtFixedStr = genericUtility.getColumnValue("frt_amt__fixed", dom);
frtRate = frtRateStr==null?0:Double.parseDouble(frtRateStr);
frtAmtQty = frtAmtQtyStr==null?0:Double.parseDouble(frtAmtQtyStr);
frtAmtFixed = frtAmtFixedStr==null?0:Double.parseDouble(frtAmtFixedStr);
System.out.println("frtType["+frtType+"]frtRate["+frtRate+"]frtAmtQty["+frtAmtQty+"]frtAmtFixed["+frtAmtFixed+"]::amount["+ ( frtRate * frtAmtQty ) +"]");
frtRateStr = checkNull(genericUtility.getColumnValue("frt_rate", dom));
frtAmtQtyStr = checkNull(genericUtility.getColumnValue("frt_amt__qty", dom));
frtAmtFixedStr = checkNull(genericUtility.getColumnValue("frt_amt__fixed", dom));
System.out.println("frtType["+frtType+"]:::frtAmtFixed["+frtAmtFixedStr+"]");
if("Q".equalsIgnoreCase(frtType ))
{
valueXmlString.append("<frt_amt>").append("<![CDATA["+( frtRate * frtAmtQty )+"]]>").append("</frt_amt>");
valueXmlString.append("<frt_amt__fixed protect = \"1\">").append("<![CDATA["+( frtAmtFixedStr )+"]]>").append("</frt_amt__fixed>");
valueXmlString.append("<frt_rate protect = \"0\">").append("<![CDATA["+frtRateStr+"]]>").append("</frt_rate>");
valueXmlString.append("<frt_amt__qty protect = \"0\">").append("<![CDATA["+frtAmtQtyStr+"]]>").append("</frt_amt__qty>");
}
else if( "F".equalsIgnoreCase(frtType ))
{
valueXmlString.append("<frt_amt>").append("<![CDATA["+frtAmtFixed+"]]>").append("</frt_amt>");
valueXmlString.append("<frt_amt__fixed protect = \"0\">").append("<![CDATA["+ frtAmtFixedStr +"]]>").append("</frt_amt__fixed>");
valueXmlString.append("<frt_rate protect = \"1\">").append("<![CDATA["+frtRateStr+"]]>").append("</frt_rate>");
valueXmlString.append("<frt_amt__qty protect = \"1\">").append("<![CDATA["+frtAmtQtyStr+"]]>").append("</frt_amt__qty>");
}
}
// end
else if(currentColumn.trim().equalsIgnoreCase("item_ser"))
{
itemSer = checkNull(genericUtility.getColumnValue("item_ser", dom));
......@@ -3476,24 +3525,29 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
if( currentColumn.trim().equalsIgnoreCase( "itm_defaultedit" ) )
{
lineNoOrd = genericUtility.getColumnValue("line_no_ord", dom1);
lineNoOrd = genericUtility.getColumnValue("line_no_ord", dom);
System.out.println("@@@@@1 lineNoOrd ["+ lineNoOrd + "]");
valueXmlString.append("<line_no_ord protect = \"1\">").append("<![CDATA["+lineNoOrd+"]]>").append("</line_no_ord>");
}
else if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
{
amdNo = genericUtility.getColumnValue("amd_no", dom1);
System.out.println("@@@@@2 amdNo ["+ amdNo + "]");
valueXmlString.append("<amd_no protect = \"1\">").append("<![CDATA["+amdNo+"]]>").append("</amd_no>");
purcOrder = genericUtility.getColumnValue("purc_order", dom1);
System.out.println("@@@@@3 purcOrder ["+ purcOrder + "]");
valueXmlString.append("<purc_order protect = \"1\">").append("<![CDATA["+purcOrder+"]]>").append("</purc_order>");
}
else if ( currentColumn.trim().equalsIgnoreCase( "line_no_ord" ) )
{
lineNoOrd = genericUtility.getColumnValue("line_no_ord", dom1);
lineNoOrd = genericUtility.getColumnValue("line_no_ord", dom);
System.out.println("@@@@@4 lineNoOrd ["+ lineNoOrd + "]");
if( lineNoOrd != null && lineNoOrd.trim().length() > 0 )
{
purcOrder = genericUtility.getColumnValue("purc_order", dom1);
System.out.println("@@@@@5 purcOrder ["+ purcOrder + "]");
sql = " select term_code, descr from pord_term where purc_order = ? and line_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
......@@ -3518,12 +3572,13 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
else if( currentColumn.trim().equalsIgnoreCase( "term_code" ) )
{
purcOrder = genericUtility.getColumnValue("purc_order", dom1);
termCode = genericUtility.getColumnValue("term_code", dom1);
termCodeO = genericUtility.getColumnValue("term_code__o", dom1);
lineNoOrd = genericUtility.getColumnValue("line_no_ord", dom1);
termCode = genericUtility.getColumnValue("term_code", dom);
termCodeO = genericUtility.getColumnValue("term_code__o", dom);
lineNoOrd = genericUtility.getColumnValue("line_no_ord", dom);
System.out.println("@@@@@6termCode["+termCode+"]::termCodeO["+termCodeO+"]::purcOrder["+purcOrder+"]::lineNoOrd ["+ lineNoOrd + "]");
if( lineNoOrd != null && lineNoOrd.trim().length() > 0 )
{
sql = " select descr into from pord_term where purc_order = ? and line_no = ? ";
sql = " select descr from pord_term where purc_order = ? and line_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
pstmt.setString(2, lineNoOrd);
......
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