Commit 177910b9 authored by mjadhav's avatar mjadhav

chage variable name for return


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98685 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e305c8c3
...@@ -1073,7 +1073,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1073,7 +1073,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
String locality_code=""; String locality_code="";
String childNodeName = "",lineNoStrDom="",lineNoStr=""; String childNodeName = "",lineNoStrDom="",lineNoStr="";
String invoiceIdList = ""; String invoiceIdList = "";
double sretQtyAll=0.0,rateAll=0.0; double sretQtyAll=0.0,rateAll=0.0,sretQtyAllTot=0.0;
String sretSiteCodeAll="",sretLocCodeAll="",sretLotNoAll="",sretLotSlAll="",retRepFlagAll=""; String sretSiteCodeAll="",sretLocCodeAll="",sretLotNoAll="",sretLotSlAll="",retRepFlagAll="";
int invCnt=0; int invCnt=0;
...@@ -2154,7 +2154,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -2154,7 +2154,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
if (rs3.next()) if (rs3.next())
{ {
invStat = rs3.getString("INV_STAT");////GetRcpQty(String selectedInvList,String itemCode, Connection conn) invStat = rs3.getString("INV_STAT");////GetRcpQty(String selectedInvList,String itemCode, Connection conn)
System.out.println("invStat :"+invStat); System.out.println("invStat>>> :"+invStat);
invStat = ( invStat == null || invStat.trim().length() == 0 ) ? "" : invStat.trim(); invStat = ( invStat == null || invStat.trim().length() == 0 ) ? "" : invStat.trim();
if ("R".equalsIgnoreCase(retRepFlag.trim()) && "SALE".equalsIgnoreCase(invStat.trim()) ) if ("R".equalsIgnoreCase(retRepFlag.trim()) && "SALE".equalsIgnoreCase(invStat.trim()) )
{ {
...@@ -2425,6 +2425,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -2425,6 +2425,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
if (rs1.next()) if (rs1.next())
{ {
invStat = rs1.getString("INV_STAT"); invStat = rs1.getString("INV_STAT");
System.out.println("invStat :"+invStat);
invStat = ( invStat == null || invStat.trim().length() == 0 ) ? "" : invStat.trim(); invStat = ( invStat == null || invStat.trim().length() == 0 ) ? "" : invStat.trim();
if ("R".equalsIgnoreCase(retRepFlag.trim()) && "SALE".equalsIgnoreCase(invStat.trim()) ) if ("R".equalsIgnoreCase(retRepFlag.trim()) && "SALE".equalsIgnoreCase(invStat.trim()) )
{ {
...@@ -2449,10 +2450,10 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -2449,10 +2450,10 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
pstmt = null; pstmt = null;
System.out.println("retQtyAll :"+retQtyAll); System.out.println("retQtyAll :"+retQtyAll);
System.out.println("replQty :"+replQty); System.out.println("replQty :"+replQty);
sretQtyAll = retQtyAll - replQtyAll ; sretQtyAllTot= retQtyAll - replQtyAll ;
System.out.println("sretQty !!!!!!:"+retQty); System.out.println("sretQty !!!!!!:"+retQty);
System.out.println("Return quantity for not available in last or current tranaction"+"itemCode :"+itemCode +"Return Quantity :"+sretQty); System.out.println("Return quantity for not available in last or current tranaction"+"itemCode :"+itemCode +"Return Quantity :"+sretQtyAll);
transitQty=0.0; transitQty=0.0;
transitQtyBon=0.0; transitQtyBon=0.0;
...@@ -2462,9 +2463,9 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -2462,9 +2463,9 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
System.out.println("sretQtyAll :"+sretQtyAll); System.out.println("sretQtyAll :"+sretQtyAll);
System.out.println("replQtyAll :"+replQtyAll); System.out.println("replQtyAll :"+replQtyAll);
if(rcpQty > (sretQtyAll + replQtyAll)) if(rcpQty > (sretQtyAllTot + replQtyAll))
{ {
primarySalesAll = rcpQty - sretQtyAll + replQtyAll; primarySalesAll = rcpQty - sretQtyAllTot + replQtyAll;
} }
else else
{ {
...@@ -2493,7 +2494,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -2493,7 +2494,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
//itemMap.put("mopStk@"+lineNoItmCnt, String.valueOf(opStkItem)); //itemMap.put("mopStk@"+lineNoItmCnt, String.valueOf(opStkItem));
itemMap.put("mquantRcp@"+lineNoItmCnt, String.valueOf(rcpQty)); itemMap.put("mquantRcp@"+lineNoItmCnt, String.valueOf(rcpQty));
itemMap.put("rcpQtyBon@"+lineNoItmCnt, String.valueOf(rcpQtyBon)); itemMap.put("rcpQtyBon@"+lineNoItmCnt, String.valueOf(rcpQtyBon));
itemMap.put("mquant@"+lineNoItmCnt, String.valueOf(sretQtyAll)); itemMap.put("mquant@"+lineNoItmCnt, String.valueOf(sretQtyAllTot));
itemMap.put("retQty@"+lineNoItmCnt, String.valueOf(retQtyAll)); itemMap.put("retQty@"+lineNoItmCnt, String.valueOf(retQtyAll));
itemMap.put("replQty@"+lineNoItmCnt, String.valueOf(replQtyAll)); itemMap.put("replQty@"+lineNoItmCnt, String.valueOf(replQtyAll));
itemMap.put("msalesQty@"+lineNoItmCnt, String.valueOf(salesQty)); itemMap.put("msalesQty@"+lineNoItmCnt, String.valueOf(salesQty));
...@@ -2550,7 +2551,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -2550,7 +2551,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
//valueXmlString.append("<loc_type>").append("<![CDATA["+itemMap.get("mlType@"+i)+"]]>").append("</loc_type>"); //valueXmlString.append("<loc_type>").append("<![CDATA["+itemMap.get("mlType@"+i)+"]]>").append("</loc_type>");
valueXmlString.append("<rate>").append("<![CDATA["+itemMap.get("rate@"+itemDomId)+"]]>").append("</rate>"); valueXmlString.append("<rate>").append("<![CDATA["+itemMap.get("rate@"+itemDomId)+"]]>").append("</rate>");
valueXmlString.append("<op_stock protect='1'>").append("<![CDATA["+itemMap.get("mopStk@"+itemDomId)+"]]>").append("</op_stock>"); valueXmlString.append("<op_stock protect='1'>").append("<![CDATA["+itemMap.get("mopStk@"+itemDomId)+"]]>").append("</op_stock>");
valueXmlString.append("<cl_stock protect='0'>").append("<![CDATA[]]>").append("</cl_stock>"); valueXmlString.append("<cl_stock protect='0'>").append("<![CDATA["+itemMap.get("mopStk@"+itemDomId)+"]]>").append("</cl_stock>");
valueXmlString.append("<purc_rcp>").append("<![CDATA["+itemMap.get("mquantRcp@"+itemDomId)+"]]>").append("</purc_rcp>"); valueXmlString.append("<purc_rcp>").append("<![CDATA["+itemMap.get("mquantRcp@"+itemDomId)+"]]>").append("</purc_rcp>");
valueXmlString.append("<purc_rcp__repl>").append("<![CDATA[0]]>").append("</purc_rcp__repl>"); valueXmlString.append("<purc_rcp__repl>").append("<![CDATA[0]]>").append("</purc_rcp__repl>");
......
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