Skip to content

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

MF89SUN092 various bug fix 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@29833 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 078b2e30
Hide whitespace changes
Inline Side-by-side
Showing with 2494 additions and 2376 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesReturn.java
View file @ 7244350e
......@@ -1420,6 +1420,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
valueXmlString.append("<ret_rep_flag protect =\"1\">").append("<![CDATA[R]]>").append("</ret_rep_flag>");
}
}
else if ("w_salesreturn_repl".equalsIgnoreCase(winName))
{
valueXmlString.append("<ret_rep_flag protect =\"1\">").append("<![CDATA[P]]>").append("</ret_rep_flag>");
......@@ -1617,7 +1618,10 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
valueXmlString.append("<tax_env protect =\"0\">").append("<![CDATA[" + ""+"]]>").append("</tax_env>");
}
valueXmlString.append("<stk_opt protect =\"1\">").append("<![CDATA[" + ""+"]]>").append("</stk_opt>");
valueXmlString.append("<gross_weight>").append("<![CDATA[0]]>").append("</gross_weight>");
valueXmlString.append("<net_weight>").append("<![CDATA[0]]>").append("</net_weight>");
valueXmlString.append("<tare_weight>").append("<![CDATA[0]]>").append("</tare_weight>");
} // end itm_default
else if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
......@@ -3662,7 +3666,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
mchkDate = distCommon.CalcExpiry( mtranDate, mminShlife );
if( mexpDate.before( mchkDate ) )
// 29/12/11 manoharan check for null expiry date
//if( mexpDate.before( mchkDate ) )
if( mexpDate != null && mexpDate.before( mchkDate ) )
{
valueXmlString.append("<status>").append("<![CDATA[" + "N" + "]]>").append("</status>");
// 22/04/10 manoharan to set the loc_code accordingly
......@@ -6548,7 +6554,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = null;
mchkDate = distCommon.CalcExpiry( mtrandate, mminShlife );
if( ( mexpDate.before( mchkDate ) || mexpDate == mchkDate ) && ( "E".equalsIgnoreCase( lsStatus ) || "S".equalsIgnoreCase( lsStatus ) ) )
// 29/12/11 manoharan
//if( ( mexpDate.before( mchkDate ) || mexpDate == mchkDate ) && ( "E".equalsIgnoreCase( lsStatus ) || "S".equalsIgnoreCase( lsStatus ) ) )
if( ( (mexpDate != null && mexpDate.before( mchkDate )) || mexpDate == mchkDate ) && ( "E".equalsIgnoreCase( lsStatus ) || "S".equalsIgnoreCase( lsStatus ) ) )
{
errCode = "VTSRET15";
//errString = getErrorString( childNodeName, errCode, userId );
......@@ -6556,7 +6564,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
errList.add( errCode );
errFields.add( childNodeName.toLowerCase() );
}
else if( mexpDate.after( mchkDate ) && "N".equalsIgnoreCase( lsStatus ) )
//else if( mexpDate.after( mchkDate ) && "N".equalsIgnoreCase( lsStatus ) )
else if( mexpDate != null && mexpDate.after( mchkDate ) && "N".equalsIgnoreCase( lsStatus ) )
{
errCode = "VTSRET16";
//errString = getErrorString( childNodeName, errCode, userId );
......@@ -6841,7 +6850,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( mminShelfLife > 0 )
{
mchkDate = distCommon.CalcExpiry( mtrandate, mminShelfLife );
if( mchkDate.after( mexpDate ) )
// 29/12/11 manoharan check null
//if( mchkDate.after( mexpDate ) )
if( mexpDate != null && mchkDate.after( mexpDate ) )
{
errCode = "VTSHELF01";
//errString = getErrorString( childNodeName, errCode, userId );
......
webitm-dis/ibase/webitm/ejb/dis/StockUpdate.java
View file @ 7244350e
This source diff could not be displayed because it is too large. You can view the blob instead.
webitm-dis/ibase/webitm/ejb/dis/adv/DespatchAct.java
View file @ 7244350e
......@@ -493,7 +493,41 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
stkNoArt = "1";
}
stkRate =rs.getString("RATE");
// if (Integer.parseInt(balanceQty) > 0)
// 20/03/12 manoharan
if(stkItemCode == null)
{
stkItemCode = "";
}
if(stkLocCode == null)
{
stkLocCode = "";
}
if(stklotNo == null)
{
stklotNo = "";
}
if(stklotSl == null)
{
stklotSl = "";
}
if(stkquantity == null)
{
stkquantity = "0";
}
if(stkAllocQty == null)
{
stkAllocQty = "0";
}
if(stkNoArt == null)
{
stkNoArt = "0";
}
if(stkRate == null)
{
stkRate = "0";
}
// end 20/03/12 manoharan
//if (Integer.parseInt(balanceQty) > 0)
if (Double.parseDouble(balanceQty) > 0)
{
valueXmlString.append("<Detail>\r\n");
......@@ -1955,6 +1989,16 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
try
{
System.out.println("Closing Connection.....");
if (rs != null)
{
rs.close();
rs = null;
}
if (stmt != null)
{
stmt.close();
stmt = null;
}
conn.close();
}catch(Exception e){}
}
......@@ -2342,7 +2386,27 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
try
{
System.out.println("Closing Connection.....");
conn.close();
if (rs != null)
{
rs.close();
rs = null;
}
if (stmt != null)
{
stmt.close();
stmt = null;
}
if (rs1 != null)
{
rs1.close();
rs1 = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
conn.close();
}catch(Exception e){}
}
System.out.println("10/12/10 manohar valueXmlString.toString() "+valueXmlString.toString());
......@@ -3846,7 +3910,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
+"A.GROSS_WT_PER_ART, " // Gulzar - 23/01/08
+"A.TARE_WT_PER_ART, " // Gulzar - 23/01/08
+"A.PALLET_WT " //Gulzar - 30/01/08
+"FROM STOCK A,INVSTAT B , LOCATION c"
+"FROM STOCK A,INVSTAT B , LOCATION c "
+"WHERE C.LOC_CODE = A.LOC_CODE "
+ " AND C.INV_STAT = B.INV_STAT "
+"AND A.ITEM_CODE = '"+itemCode+"' "
......
webitm-mfg/ibase/webitm/ejb/mfg/adv/WOrderIssueAct.java
View file @ 7244350e
......@@ -1383,8 +1383,8 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
valueXmlString.append("<quantity>").append("<![CDATA[").append(quantity).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<unit>").append("<![CDATA[").append(unit).append("]]>").append("</unit>\r\n");
valueXmlString.append("<loc_code>").append("<![CDATA[").append(mfgLoc).append("]]>").append("</loc_code>\r\n");
valueXmlString.append("<lot_no>").append("<![CDATA[").append("").append("]]>").append("</lot_no>\r\n");
valueXmlString.append("<lot_sl>").append("<![CDATA[").append("").append("]]>").append("</lot_sl>\r\n");
valueXmlString.append("<lot_no>").append("<![CDATA[").append(" ").append("]]>").append("</lot_no>\r\n");
valueXmlString.append("<lot_sl>").append("<![CDATA[").append(" ").append("]]>").append("</lot_sl>\r\n");
valueXmlString.append("<stk_opt>").append("<![CDATA[").append(1).append("]]>").append("</stk_opt>\r\n");
valueXmlString.append("<reas_code>").append("<![CDATA[").append(reasCode).append("]]>").append("</reas_code>\r\n");
if (tranType.equalsIgnoreCase("F"))
......@@ -1396,6 +1396,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
valueXmlString.append("<no_art>").append("<![CDATA[").append("1").append("]]>").append("</no_art>\r\n");
}
}
valueXmlString.append("</Detail>\r\n");
}
else
{
......@@ -1859,11 +1860,12 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
valueXmlString.append("<no_art>").append("<![CDATA[").append(Math.round(noArt)).append("]]>").append("</no_art>\r\n");
}
valueXmlString.append("</Detail>\r\n");
pstmt1.close();
rs1.close();
}
valueXmlString.append("</Detail>\r\n");
}
}
valueXmlString.append("</Root>\r\n");
......@@ -1888,7 +1890,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
}
catch (Exception e){}
}
System.out.println("valueXmlString return from WOrderIssueActEJB.actionAllocate ["+valueXmlString.toString() + "]");
System.out.println("Manoharan 23/03/12 valueXmlString return from WOrderIssueActEJB.actionAllocate ["+valueXmlString.toString() + "]");
return valueXmlString.toString();
}
......
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