Commit 39d47124 authored by caluka's avatar caluka

through stock button gross weight,netweight,tar weight set at the time of migration [D16ASUN021]


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101695 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 00c4d0c5
...@@ -144,6 +144,7 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs ...@@ -144,6 +144,7 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs
String stkRetestDate = ""; String stkRetestDate = "";
String stkExpDate = ""; String stkExpDate = "";
double rate = 0; double rate = 0;
double grossWeight=0.0,tareWeight=0.0,netWeight=0.0,noArt=0.0;
int row = 0; int row = 0;
StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n"); StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
if (dom == null) if (dom == null)
...@@ -201,7 +202,7 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs ...@@ -201,7 +202,7 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs
" STOCK.UNIT,STOCK.LOC_CODE,STOCK.LOT_NO, " + " STOCK.UNIT,STOCK.LOC_CODE,STOCK.LOT_NO, " +
" STOCK.LOT_SL,STOCK.QUANTITY - STOCK.ALLOC_QTY AS QUANTITY, " + " STOCK.LOT_SL,STOCK.QUANTITY - STOCK.ALLOC_QTY AS QUANTITY, " +
" STOCK.SITE_CODE,STOCK.EXP_DATE,STOCK.RETEST_DATE, " + " STOCK.SITE_CODE,STOCK.EXP_DATE,STOCK.RETEST_DATE, " +
" STOCK.DIMENSION,STOCK.RATE "+ " STOCK.DIMENSION,STOCK.RATE,STOCK.GROSS_WEIGHT,STOCK.TARE_WEIGHT,STOCK.NET_WEIGHT,STOCK.NO_ART "+
" FROM STOCK,INVSTAT " + " FROM STOCK,INVSTAT " +
" WHERE ( STOCK.INV_STAT = INVSTAT.INV_STAT ) AND " + " WHERE ( STOCK.INV_STAT = INVSTAT.INV_STAT ) AND " +
"( STOCK.ITEM_CODE = '" +itemCode + "' ) AND " + "( STOCK.ITEM_CODE = '" +itemCode + "' ) AND " +
...@@ -235,6 +236,11 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs ...@@ -235,6 +236,11 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs
retestDate = rs.getDate(10); retestDate = rs.getDate(10);
dimension =( rs.getString(11) ==null ?" ": rs.getString(11)); dimension =( rs.getString(11) ==null ?" ": rs.getString(11));
rate = rs.getDouble(12); rate = rs.getDouble(12);
grossWeight = rs.getDouble(13);
tareWeight = rs.getDouble(14);
netWeight = rs.getDouble(15);
noArt = rs.getDouble(16);
System.out.println("lotNo......................."+lotNo); System.out.println("lotNo......................."+lotNo);
valueXmlString.append("<Detail>\r\n"); valueXmlString.append("<Detail>\r\n");
//added by rajendra on 19/06/07 //added by rajendra on 19/06/07
...@@ -299,6 +305,11 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs ...@@ -299,6 +305,11 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs
valueXmlString.append("<retest_date>").append("<![CDATA[").append(stkRetestDate).append("]]>").append("</retest_date>\r\n"); valueXmlString.append("<retest_date>").append("<![CDATA[").append(stkRetestDate).append("]]>").append("</retest_date>\r\n");
valueXmlString.append("<dimension>").append("<![CDATA[").append(dimension).append("]]>").append("</dimension>\r\n"); valueXmlString.append("<dimension>").append("<![CDATA[").append(dimension).append("]]>").append("</dimension>\r\n");
valueXmlString.append("<gross_weight>").append("<![CDATA[").append(grossWeight).append("]]>").append("</gross_weight>\r\n");
valueXmlString.append("<tare_weight>").append("<![CDATA[").append(tareWeight).append("]]>").append("</tare_weight>\r\n");
valueXmlString.append("<net_weight>").append("<![CDATA[").append(netWeight).append("]]>").append("</net_weight>\r\n");
valueXmlString.append("<no_art>").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n");
valueXmlString.append("</Detail>\r\n"); valueXmlString.append("</Detail>\r\n");
}//end while }//end while
} }
...@@ -333,6 +344,7 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs ...@@ -333,6 +344,7 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs
String acctCodeCr = "",acctCodeDr = "",cctrCodeCr = "",cctrCodeDr = "", userId =""; String acctCodeCr = "",acctCodeDr = "",cctrCodeCr = "",cctrCodeDr = "", userId ="";
String issCriteria = "",stkQtyStr = "",sql = "",errCode = "", errString = ""; String issCriteria = "",stkQtyStr = "",sql = "",errCode = "", errString = "";
String selLocCode = "",selLotNo = "",selLotSl = "",selUnit = "",selQuantity = "",selStkRate = "0"; String selLocCode = "",selLotNo = "",selLotSl = "",selUnit = "",selQuantity = "",selStkRate = "0";
String selGrossWeight="0",selTareWeight="0",selNetWeight="0",selNoArt="0";
double stkQty = 0,ordQuantity = 0,selQty = 0; double stkQty = 0,ordQuantity = 0,selQty = 0;
NodeList detailList = null; NodeList detailList = null;
int detailListLength = 0; int detailListLength = 0;
...@@ -371,6 +383,7 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs ...@@ -371,6 +383,7 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs
cctrCodeCr = new ibase.utility.E12GenericUtility().getColumnValue("cctr_code__cr",dom); cctrCodeCr = new ibase.utility.E12GenericUtility().getColumnValue("cctr_code__cr",dom);
cctrCodeDr = new ibase.utility.E12GenericUtility().getColumnValue("cctr_code__dr",dom); cctrCodeDr = new ibase.utility.E12GenericUtility().getColumnValue("cctr_code__dr",dom);
System.out.println("grossWt>>["+grossWt+"]tareWt>>["+tareWt+"]netWt>>["+netWt+"]noArt>>["+noArt+"]");
//Added by Alka 31/05/07 -- Entering Required Quantity in the Screen is necessary //Added by Alka 31/05/07 -- Entering Required Quantity in the Screen is necessary
if (Double.parseDouble(quantity) == 0) if (Double.parseDouble(quantity) == 0)
{ {
...@@ -416,6 +429,12 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs ...@@ -416,6 +429,12 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs
selQuantity = new ibase.utility.E12GenericUtility().getColumnValueFromNode("quantity",detailList.item(ctr)); selQuantity = new ibase.utility.E12GenericUtility().getColumnValueFromNode("quantity",detailList.item(ctr));
// selStkRate = new ibase.utility.E12GenericUtility().getColumnValueFromNode("stock_rate",detailList.item(ctr)); //stock-rate is wrongly placed Gulzar - 10/05/07 // selStkRate = new ibase.utility.E12GenericUtility().getColumnValueFromNode("stock_rate",detailList.item(ctr)); //stock-rate is wrongly placed Gulzar - 10/05/07
selStkRate = new ibase.utility.E12GenericUtility().getColumnValueFromNode("rate",detailList.item(ctr)); //stock-rate is changed to rate Gulzar - 10/05/07 selStkRate = new ibase.utility.E12GenericUtility().getColumnValueFromNode("rate",detailList.item(ctr)); //stock-rate is changed to rate Gulzar - 10/05/07
selGrossWeight = checkDouble(new ibase.utility.E12GenericUtility().getColumnValueFromNode("gross_weight",detailList.item(ctr)));
selTareWeight = checkDouble(new ibase.utility.E12GenericUtility().getColumnValueFromNode("tare_weight",detailList.item(ctr)));
selNetWeight = checkDouble(new ibase.utility.E12GenericUtility().getColumnValueFromNode("net_weight",detailList.item(ctr)));
selNoArt = checkDouble(new ibase.utility.E12GenericUtility().getColumnValueFromNode("no_art",detailList.item(ctr)));
System.out.println("selGrossWeight>>["+selGrossWeight+"]selTareWeight>>["+selTareWeight+"]selNetWeight>>["+selNetWeight+"]selNoArt>>["+selNoArt+"]");
if (selStkRate == null) if (selStkRate == null)
{ {
selStkRate = "0"; selStkRate = "0";
...@@ -476,21 +495,34 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs ...@@ -476,21 +495,34 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs
} }
} }
valueXmlString.append("<amount>").append(ordQuantity * Double.parseDouble(selStkRate)).append("</amount>"); valueXmlString.append("<amount>").append(ordQuantity * Double.parseDouble(selStkRate)).append("</amount>");
if (noArt != null && noArt.trim().length() > 0) if (noArt != null && noArt.trim().length() > 0 && Double.parseDouble(noArt)>0)
{ {
valueXmlString.append("<no_art>").append(noArt).append("</no_art>"); valueXmlString.append("<no_art>").append(noArt).append("</no_art>");
} }
if (grossWt != null && grossWt.trim().length() > 0) else
{
valueXmlString.append("<no_art>").append(selNoArt).append("</no_art>");
}
if (grossWt != null && grossWt.trim().length() > 0 && Double.parseDouble(grossWt)>0)
{ {
valueXmlString.append("<gross_weight>").append(grossWt).append("</gross_weight>"); valueXmlString.append("<gross_weight>").append(grossWt).append("</gross_weight>");
}else
{
valueXmlString.append("<gross_weight>").append(selGrossWeight).append("</gross_weight>");
} }
if (tareWt != null && tareWt.trim().length() > 0) if (tareWt != null && tareWt.trim().length() > 0 && Double.parseDouble(tareWt)>0)
{ {
valueXmlString.append("<tare_weight>").append(tareWt).append("</tare_weight>"); valueXmlString.append("<tare_weight>").append(tareWt).append("</tare_weight>");
}else
{
valueXmlString.append("<tare_weight>").append(selTareWeight).append("</tare_weight>");
} }
if (netWt != null && netWt.trim().length() > 0) if (netWt != null && netWt.trim().length() > 0 && Double.parseDouble(netWt)>0)
{ {
valueXmlString.append("<net_weight>").append(netWt).append("</net_weight>"); valueXmlString.append("<net_weight>").append(netWt).append("</net_weight>");
}else
{
valueXmlString.append("<net_weight>").append(selNetWeight).append("</net_weight>");
} }
valueXmlString.append("</Detail>"); valueXmlString.append("</Detail>");
if (ordQuantity == 0) if (ordQuantity == 0)
...@@ -700,5 +732,13 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs ...@@ -700,5 +732,13 @@ public class AdjIssAct extends ActionHandlerEJB implements AdjIssActLocal, AdjIs
} }
return valueXmlString.toString(); return valueXmlString.toString();
} }
private String checkDouble(String input)
{
if (input == null || input.trim().length() == 0)
{
input="0";
}
return input;
}
} }
\ No newline at end of file
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