Skip to content

B
business-java
Commit ba33ad3f authored by caluka's avatar caluka
Browse files
Options

gross rate and gross value set on closing item change 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100280 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d93a5d77
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 12 deletions
webitm-dis/ibase/webitm/ejb/dis/CustStockGWTIC.java
View file @ ba33ad3f
......@@ -4050,6 +4050,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<free_value>").append("<![CDATA["+getRequiredDecimal(Double.parseDouble(itemMap.get("freeValue@"+itemDomId).toString()),3)+"]]>").append("</free_value>");
valueXmlString.append("<sret_vale>").append("<![CDATA["+getRequiredDecimal(Double.parseDouble(itemMap.get("sretValue@"+itemDomId).toString()),3)+"]]>").append("</sret_vale>");
valueXmlString.append("<pur_value>").append("<![CDATA["+(long)Math.round(Double.parseDouble(itemMap.get("rcpValue@"+itemDomId).toString()))+"]]>").append("</pur_value>");
openingValue=(long)Math.round(Double.parseDouble(itemMap.get("mopStk@"+itemDomId).toString()))*(Double.parseDouble(itemMap.get("oldRate@"+itemDomId).toString()));
salesValueCal=openingValue+Double.parseDouble(itemMap.get("rcpValue@"+itemDomId).toString())+Double.parseDouble(itemMap.get("replValue@"+itemDomId).toString())-Double.parseDouble(itemMap.get("sretValue@"+itemDomId).toString());
valueXmlString.append("<op_value>").append("<![CDATA["+getRequiredDecimal(openingValue, 2)+"]]>").append("</op_value>");
......@@ -4074,10 +4075,11 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
System.out.println("repl value>>>>>>"+Double.parseDouble(itemMap.get("replValue@"+itemDomId).toString()));
System.out.println("free value>>>>>>"+Double.parseDouble(itemMap.get("freeValue@"+itemDomId).toString()));
System.out.println("sret value>>>>>>"+Double.parseDouble(itemMap.get("sretValue@"+itemDomId).toString()));
grosSalesValueCal=openingValue+Double.parseDouble(itemMap.get("rcpValue@"+itemDomId).toString())
+Double.parseDouble(itemMap.get("replValue@"+itemDomId).toString())
+Double.parseDouble(itemMap.get("freeValue@"+itemDomId).toString())
-Double.parseDouble(itemMap.get("sretValue@"+itemDomId).toString());
grosSalesValueCal=Double.parseDouble(itemMap.get("mopStk@"+itemDomId).toString())*Double.parseDouble(itemMap.get("oldRateOrg@"+itemDomId).toString())
+Double.parseDouble(itemMap.get("rcpValue@"+itemDomId).toString())
+Double.parseDouble(itemMap.get("replValue@"+itemDomId).toString())
+Double.parseDouble(itemMap.get("freeValue@"+itemDomId).toString())
-Double.parseDouble(itemMap.get("sretValue@"+itemDomId).toString());
System.out.println("grosSalesValueCal>>>>"+grosSalesValueCal);
if(grossSecondaryQty>0)
......@@ -4296,7 +4298,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
formulaValue=0;
// closingValue=0;
//closingRate=0;
System.out.println("cmQuantity1>>>>>>>>@@@@@@"+cmQuantity1);
/*System.out.println("cmQuantity1>>>>>>>>@@@@@@"+cmQuantity1);
if(cmQuantity1>clStock)
{
formulaValue=0;
......@@ -4307,7 +4309,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
formulaValue=clStock-cmQuantity1;
//closingRate=(cmValue1+(formulaValue*rateOld))/clStock;
grossClosingRate=(cmValue1+(formulaValue*rateOrgOld))/clStock;
}
}*/
System.out.println("formulaValue>>>>>"+formulaValue);
......@@ -4316,7 +4318,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
System.out.println("grossClosingRate>>>"+grossClosingRate);
closingValue=closingRate*clStock;
System.out.println("closingValue>>>>>>>"+closingValue);*/
grossClosingValue=grossClosingRate*clStock;
//grossClosingValue=grossClosingRate*clStock;
netSecondarySalesValue=(opStkDom*rateOld)+rcpValue+replValue-retValue-closingValue;
System.out.println("netSecondarySalesValue>>>>>>>"+netSecondarySalesValue);
......@@ -4325,8 +4327,10 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
netSecondaryRate=netSecondarySalesValue/secondaryQty;
System.out.println("netSecondaryRate>>>"+netSecondaryRate);*/
grossSecondarySalesValue=(opStkDom*rateOrgOld)+rcpValue+replValue+rcpFreeValue-retValue-grossClosingValue;
grossSecondarySalesValue=(opStkDom*rateOrgOld)+rcpValue+replValue+rcpFreeValue-retValue-closingValue;
System.out.println("rcpFreeValue>>>>"+rcpFreeValue);
System.out.println("grossSecondarySalesValue>>>>"+grossSecondarySalesValue);
System.out.println("grossSecondaryQty>>>>"+grossSecondaryQty);
/*grossSecondaryQty=opStkDom+rcpQtmDom+rcpReplQtmDom+rcpFreeQtmDom-retQtyDom-clStock;
System.out.println("grossSecondaryQty>>>>"+grossSecondaryQty);*/
grossSecondaryRate=grossSecondarySalesValue/grossSecondaryQty;
......@@ -6742,7 +6746,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
{
clStock = rs1.getString("cl_stock");
rate = rs1.getString("rate");
rateOrg = rs1.getString("rate__org");
rateOrg = checkNull(rs1.getString("rate__org")).trim();
}
rs1.close();
rs1 = null;
......@@ -6761,7 +6765,10 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
rs1 = null;
pstmt1.close();
pstmt1 = null;
if(rateOrg == null || rateOrg.trim().length()==0 || "0".equalsIgnoreCase(rateOrg))
{
rateOrg=rate;
}
itemDescr = new ItemDescr();
itemDescr.setItemCode(invItemCode);
itemDescr.setLsOpStock(clStock);
......@@ -8086,7 +8093,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
itemCode = rs1.getString("item_code");
clStock = rs1.getString("cl_stock");
rate = rs1.getString("rate");
rateOrg = rs1.getString("rate__org");
rateOrg = checkNull(rs1.getString("rate__org")).trim();
if(!itemListLast.contains(itemCode) && !previousItem.contains(itemCode))
{
sql= " select descr from item where item_code = ?";
......@@ -8102,6 +8109,10 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
pstmt.close();
pstmt = null;
if(rateOrg == null || rateOrg.trim().length()==0 || "0".equalsIgnoreCase(rateOrg))
{
rateOrg=rate;
}
itemDescr = new ItemDescr();
itemDescr.setItemCode(itemCode);
itemDescr.setLsOpStock(clStock);
......
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