Skip to content

B
business-java
Commit da1d7f0e authored by manohar's avatar manohar
Browse files
Options

no_art initialised to 1 in case of null or 0 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91327 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0d6156cc
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 1 deletion
webitm-dis/ibase/webitm/ejb/dis/adv/DespatchAct.java
View file @ da1d7f0e
...@@ -456,6 +456,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -456,6 +456,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
balanceQty = rs.getString("BALANCE_QTY"); balanceQty = rs.getString("BALANCE_QTY");
stkLocCode = rs.getString("LOC_CODE"); stkLocCode = rs.getString("LOC_CODE");
stkNoArt = rs.getString("NO_ART"); stkNoArt = rs.getString("NO_ART");
if (stkNoArt == null)
{
stkNoArt = "1";
}
stkRate =rs.getString("RATE"); stkRate =rs.getString("RATE");
// if (Integer.parseInt(balanceQty) > 0) // if (Integer.parseInt(balanceQty) > 0)
if (Double.parseDouble(balanceQty) > 0) if (Double.parseDouble(balanceQty) > 0)
...@@ -1066,6 +1070,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -1066,6 +1070,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
System.out.println("tareWeight [if ( qtyPerArt > 0 )] ::"+tareWeight); System.out.println("tareWeight [if ( qtyPerArt > 0 )] ::"+tareWeight);
System.out.println("netWeight [if ( qtyPerArt > 0 )] ::"+netWeight); System.out.println("netWeight [if ( qtyPerArt > 0 )] ::"+netWeight);
} }
if (noArt == 0)
{
noArt = 1;
}
if (noArt > 0) if (noArt > 0)
{ {
packQty = 0d; packQty = 0d;
...@@ -1118,6 +1126,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -1118,6 +1126,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//loc_code isSrvCallOnChg='0' to loc_code isSrvCallOnChg='1' by msalam on 051108 as rate__clg was not coming //loc_code isSrvCallOnChg='0' to loc_code isSrvCallOnChg='1' by msalam on 051108 as rate__clg was not coming
valueXmlString.append("<loc_code isSrvCallOnChg='0'>").append(locCode).append("</loc_code>"); valueXmlString.append("<loc_code isSrvCallOnChg='0'>").append(locCode).append("</loc_code>");
setNodeValue( dom, "loc_code", (locCode == null) ? "" : locCode ); setNodeValue( dom, "loc_code", (locCode == null) ? "" : locCode );
System.out.println("28/08/10 packQty 1 [" + packQty + "]");
valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n"); valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n");
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(balQty).append("]]>").append("</quantity__stduom>\r\n"); valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(balQty).append("]]>").append("</quantity__stduom>\r\n");
valueXmlString.append("<qty_details isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyDetailStr).append("]]>").append("</qty_details>\r\n"); valueXmlString.append("<qty_details isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyDetailStr).append("]]>").append("</qty_details>\r\n");
...@@ -2011,7 +2020,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -2011,7 +2020,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
} }
else else
{ {
noArt = 0; noArt = 1;
} }
dimension = genericUtility.getColumnValueFromNode("dimension",currDetail); dimension = genericUtility.getColumnValueFromNode("dimension",currDetail);
...@@ -3986,6 +3995,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -3986,6 +3995,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
} }
//End Add - Gulzar - 30/01/08 //End Add - Gulzar - 30/01/08
packQty = 0d; packQty = 0d;
if ( noArt == 0)
{
noArt = 1;
}
if (noArt > 0) if (noArt > 0)
{ {
packQty = 0d; packQty = 0d;
...@@ -4135,6 +4148,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -4135,6 +4148,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//for test by msalam //for test by msalam
valueXmlString.append("<loc_code isSrvCallOnChg='0'>").append("<![CDATA[").append(locCode).append("]]>").append("</loc_code>\r\n"); valueXmlString.append("<loc_code isSrvCallOnChg='0'>").append("<![CDATA[").append(locCode).append("]]>").append("</loc_code>\r\n");
setNodeValue( dom, "loc_code", (locCode == null) ? "" : locCode ); setNodeValue( dom, "loc_code", (locCode == null) ? "" : locCode );
System.out.println("28/08/10 packQty 2 [" + packQty + "]");
valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n"); valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n");
setNodeValue( dom, "pack_qty", packQty ); setNodeValue( dom, "pack_qty", packQty );
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity__stduom>\r\n"); valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity__stduom>\r\n");
...@@ -5310,6 +5324,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -5310,6 +5324,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
{ {
noArt = (qty - (qty % shipperQty1)) / shipperQty1; noArt = (qty - (qty % shipperQty1)) / shipperQty1;
} }
else
{
noArt =1;
}
} }
else if ( qtyType.equals("I") ) else if ( qtyType.equals("I") )
{ {
...@@ -5353,6 +5371,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -5353,6 +5371,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
{ {
noArt = (qty - (qty % integralQty1)) / integralQty1; noArt = (qty - (qty % integralQty1)) / integralQty1;
} }
else
{
noArt = 1;
}
} }
else if ( qtyType.equals("B") ) else if ( qtyType.equals("B") )
{ {
...@@ -5784,10 +5806,16 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -5784,10 +5806,16 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(mNum3).append("]]>").append("</rate__stduom>\r\n"); //valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(mNum3).append("]]>").append("</rate__stduom>\r\n");
//setNodeValue( dom, "rate__stduom", mNum3); /// 16-08 //setNodeValue( dom, "rate__stduom", mNum3); /// 16-08
sNoArticle = genericUtility.getColumnValue("no_art",dom); sNoArticle = genericUtility.getColumnValue("no_art",dom);
if (sNoArticle == null || "null".equals(sNoArticle))
{
sNoArticle = "1";
}
if(sNoArticle != null && sNoArticle.trim().length() > 0) if(sNoArticle != null && sNoArticle.trim().length() > 0)
{ {
noArticle = Double.parseDouble(sNoArticle); noArticle = Double.parseDouble(sNoArticle);
packQty = mNum3 / noArticle; packQty = mNum3 / noArticle;
System.out.println("28/08/10 packQty 3 [" + packQty + "]");
valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n"); valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n");
setNodeValue( dom, "pack_qty", packQty ); setNodeValue( dom, "pack_qty", packQty );
} }
...@@ -6119,10 +6147,15 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -6119,10 +6147,15 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(mNum3).append("]]>").append("</rate__stduom>\r\n"); //valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(mNum3).append("]]>").append("</rate__stduom>\r\n");
//setNodeValue( dom, "rate__stduom", mNum3); /// 16-08 //setNodeValue( dom, "rate__stduom", mNum3); /// 16-08
sNoArticle = genericUtility.getColumnValue("no_art",dom); sNoArticle = genericUtility.getColumnValue("no_art",dom);
if(sNoArticle == null || "null".equals(sNoArticle) || "0".equals(sNoArticle))
{
sNoArticle = "1";
}
if(sNoArticle != null && sNoArticle.trim().length() > 0) if(sNoArticle != null && sNoArticle.trim().length() > 0)
{ {
noArticle = Double.parseDouble(sNoArticle); noArticle = Double.parseDouble(sNoArticle);
packQty = mNum3 / noArticle; packQty = mNum3 / noArticle;
System.out.println("28/08/10 packQty 4 [" + packQty + "]");
valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n"); valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n");
setNodeValue( dom, "pack_qty",packQty ); setNodeValue( dom, "pack_qty",packQty );
} }
...@@ -6528,9 +6561,14 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -6528,9 +6561,14 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
if(sNoArticle !=null && sNoArticle.trim().length() >0) if(sNoArticle !=null && sNoArticle.trim().length() >0)
{ {
noArticle = Double.parseDouble(sNoArticle); noArticle = Double.parseDouble(sNoArticle);
if (noArticle == 0)
{
noArticle = 1;
}
if(noArticle > 0) if(noArticle > 0)
{ {
packQty = mNum / noArticle; packQty = mNum / noArticle;
System.out.println("28/08/10 packQty 5 [" + packQty + "]");
valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n"); valueXmlString.append("<pack_qty isSrvCallOnChg='0'>").append("<![CDATA[").append(packQty).append("]]>").append("</pack_qty>\r\n");
setNodeValue( dom, "pack_qty", packQty ); setNodeValue( dom, "pack_qty", packQty );
} }
......
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