Commit d0486499 authored by arawankar's avatar arawankar

-Changes made to set gross weight article per article and tare weight per article

AdjIssueRcpConf.java

-Changes made to update correct gross weight.(Previously it was set gross_weight as gross_rate)
StockUpdate.java

StockUpdate.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@200861 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2d438653
...@@ -147,6 +147,7 @@ public class StockUpdate ...@@ -147,6 +147,7 @@ public class StockUpdate
{ {
termId = "SYSTEM"; termId = "SYSTEM";
} }
System.out.println("this.tranType--["+this.tranType+"]");
if(this.tranType.equalsIgnoreCase("R")) if(this.tranType.equalsIgnoreCase("R"))
{ {
sql="SELECT MIN(CREA_DATE) FROM STOCK WHERE ITEM_CODE = '"+this.itemCode+"' AND SITE_CODE = '"+this.siteCode+"'" sql="SELECT MIN(CREA_DATE) FROM STOCK WHERE ITEM_CODE = '"+this.itemCode+"' AND SITE_CODE = '"+this.siteCode+"'"
...@@ -1143,10 +1144,16 @@ public class StockUpdate ...@@ -1143,10 +1144,16 @@ public class StockUpdate
qtyPerArtStr = utilMethods.getReqDecString(qtyPerArt,3); qtyPerArtStr = utilMethods.getReqDecString(qtyPerArt,3);
qtyPerArt = Double.parseDouble(qtyPerArtStr); qtyPerArt = Double.parseDouble(qtyPerArtStr);
tarewtPerArtStr = utilMethods.getReqDecString(qtyPerArt,3); //Modified by Anjali R. on[16/05/2019][Wrong variable passed to getreqdecstring method for calculation of tare_weight_per_art][Start]
//tarewtPerArtStr = utilMethods.getReqDecString(qtyPerArt,3);
tarewtPerArtStr = utilMethods.getReqDecString(tarewtPerArt,3);
//Modified by Anjali R. on[16/05/2019][Wrong variable passed to getreqdecstring method for calculation of tare_weight_per_art][End]
tarewtPerArt = Double.parseDouble(tarewtPerArtStr); tarewtPerArt = Double.parseDouble(tarewtPerArtStr);
grosswtPerArtStr = utilMethods.getReqDecString(qtyPerArt,3); //Modified by Anjali R. on[16/05/2019][Wrong variable passed to getreqdecstring method for calculation of gross_weight_per_art][Start]
//grosswtPerArtStr = utilMethods.getReqDecString(qtyPerArt,3);
grosswtPerArtStr = utilMethods.getReqDecString(grosswtPerArt,3);
//Modified by Anjali R. on[16/05/2019][Wrong variable passed to getreqdecstring method for calculation of gross_weight_per_art][Start]
grosswtPerArt = Double.parseDouble(grosswtPerArtStr); grosswtPerArt = Double.parseDouble(grosswtPerArtStr);
// Changed By Nasruddin 21-11-16 END // Changed By Nasruddin 21-11-16 END
sql = "insert into stock (item_code,site_code,loc_code, lot_no,lot_sl,unit, quantity,crea_date,chg_user," sql = "insert into stock (item_code,site_code,loc_code, lot_no,lot_sl,unit, quantity,crea_date,chg_user,"
...@@ -1718,10 +1725,16 @@ public class StockUpdate ...@@ -1718,10 +1725,16 @@ public class StockUpdate
qtyPerArtStr = utilMethods.getReqDecString(qtyPerArt,3); qtyPerArtStr = utilMethods.getReqDecString(qtyPerArt,3);
qtyPerArt = Double.parseDouble(qtyPerArtStr); qtyPerArt = Double.parseDouble(qtyPerArtStr);
tarewtPerArtStr = utilMethods.getReqDecString(qtyPerArt,3); //Modified by Anjali R. on[16/05/2019][Wrong variable passed to getreqdecstring method for calculation of tare_weight_per_art][Start]
//tarewtPerArtStr = utilMethods.getReqDecString(qtyPerArt,3);
tarewtPerArtStr = utilMethods.getReqDecString(tarewtPerArt,3);
//Modified by Anjali R. on[16/05/2019][Wrong variable passed to getreqdecstring method for calculation of tare_weight_per_art][Start]
tarewtPerArt = Double.parseDouble(tarewtPerArtStr); tarewtPerArt = Double.parseDouble(tarewtPerArtStr);
grosswtPerArtStr = utilMethods.getReqDecString(qtyPerArt,3); //Modified by Anjali R. on[16/05/2019][Wrong variable passed to getreqdecstring method for calculation of weight_weight_per_art][Start]
//grosswtPerArtStr = utilMethods.getReqDecString(qtyPerArt,3);
grosswtPerArtStr = utilMethods.getReqDecString(grosswtPerArt,3);
//Modified by Anjali R. on[16/05/2019][Wrong variable passed to getreqdecstring method for calculation of weight_weight_per_art][Start]
grosswtPerArt = Double.parseDouble(grosswtPerArtStr); grosswtPerArt = Double.parseDouble(grosswtPerArtStr);
// Changed By Nasruddin 21-11-16 END // Changed By Nasruddin 21-11-16 END
......
...@@ -726,7 +726,10 @@ public class AdjIssueRcpConf extends ActionHandlerEJB implements AdjIssueRcpConf ...@@ -726,7 +726,10 @@ public class AdjIssueRcpConf extends ActionHandlerEJB implements AdjIssueRcpConf
stockUpd.put("exp_date",expDate); stockUpd.put("exp_date",expDate);
stockUpd.put("pack_code",packCode); stockUpd.put("pack_code",packCode);
//stockUpd.put("supp_code__mfg",siteCodeMfg); //stockUpd.put("supp_code__mfg",siteCodeMfg);
stockUpd.put("gross_weight",grossRate); //Modified by Anjali R. on [15/05/2019][Start]
//stockUpd.put("gross_weight",grossRate);
stockUpd.put("gross_weight",grossWeight);
//Modified by Anjali R. on [15/05/2019][End]
stockUpd.put("tare_weight",tareWeight); stockUpd.put("tare_weight",tareWeight);
stockUpd.put("net_weight",netWeight); stockUpd.put("net_weight",netWeight);
stockUpd.put("unit__alt",unitAlt); stockUpd.put("unit__alt",unitAlt);
......
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