Skip to content

B
business-java
Commit d2b87e15 authored by smestry's avatar smestry
Browse files
Options

Updated the code for stockAmd to display blank errCode. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104768 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 02864f55
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 46 deletions
webitm-dis/ibase/webitm/ejb/dis/StockAmdIC.java
View file @ d2b87e15
...@@ -280,6 +280,7 @@ public class StockAmdIC extends ValidatorEJB implements StockAmdICLocal, StockAm ...@@ -280,6 +280,7 @@ public class StockAmdIC extends ValidatorEJB implements StockAmdICLocal, StockAm
} }
else if("lot_no".equalsIgnoreCase(childNodeName)) else if("lot_no".equalsIgnoreCase(childNodeName))
{ {
cnt = 0;
System.out.println("------------ Inside lot_no ...... =================== "); System.out.println("------------ Inside lot_no ...... =================== ");
ls_itemcode = checkNullAndTrim(genericUtility.getColumnValue("item_code", dom)); ls_itemcode = checkNullAndTrim(genericUtility.getColumnValue("item_code", dom));
ls_sitecode = checkNullAndTrim(genericUtility.getColumnValue("site_code", dom)); ls_sitecode = checkNullAndTrim(genericUtility.getColumnValue("site_code", dom));
...@@ -293,61 +294,52 @@ public class StockAmdIC extends ValidatorEJB implements StockAmdICLocal, StockAm ...@@ -293,61 +294,52 @@ public class StockAmdIC extends ValidatorEJB implements StockAmdICLocal, StockAm
errList.add( errCode ); errList.add( errCode );
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
else else if(ls_lot_no.length() > 0)
{ {
errCode = chkQcOrd(ls_itemcode, ls_sitecode, ls_loc_code, ls_lot_no, ls_lot_sl, conn);
if(errCode.length() > 0) sql = "SELECT COUNT(*) FROM STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, ls_itemcode);
pstmt.setString(2, ls_sitecode);
pstmt.setString(3, ls_loc_code);
pstmt.setString(4, ls_lot_no);
rs = pstmt.executeQuery();
if(rs.next())
{
cnt = rs.getInt(1);
}
if(pstmt != null)
{ {
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(cnt == 0)
{
errCode = "VTLOTASN";
errList.add( errCode ); errList.add( errCode );
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
if(errCode.length() == 0) }
if(cnt > 0)
{
errCode = chkQcOrd(ls_itemcode, ls_sitecode, ls_loc_code, ls_lot_no, ls_lot_sl, conn);
if(errCode.length() > 0)
{ {
ld_mfg_date_o = checkNullAndTrim(genericUtility.getColumnValue("mfg_date__o", dom)); errList.add( errCode );
ld_exp_date_o = checkNullAndTrim(genericUtility.getColumnValue("exp_date__o", dom)); errFields.add(childNodeName.toLowerCase());
ls_sitecode_o = checkNullAndTrim(genericUtility.getColumnValue("site_code__mfg__o", dom));
ld_retest_o = checkNullAndTrim(genericUtility.getColumnValue("retest_date_o", dom));
lc_potency_o = checkNullAndTrim(genericUtility.getColumnValue("potency_perc_o", dom));
ls_suppcodemfg_o = checkNullAndTrim(genericUtility.getColumnValue("supp_code__mfg__o", dom));
ls_dim_o = checkNullAndTrim(genericUtility.getColumnValue("dimension__o", dom));
lc_conv_qty_o = checkNullAndTrim(genericUtility.getColumnValue("conv__qty_stduom_o", dom));
ls_consider_allocate__o = checkNullAndTrim(genericUtility.getColumnValue("consider_allocate__o", dom));
lc_qty_per_art_o = checkNullAndTrim(genericUtility.getColumnValue("qty_per_art_o", dom));
lc_no_art_o = checkNullAndTrim(genericUtility.getColumnValue("no_art_o", dom));
ls_pack_code_o = checkNullAndTrim(genericUtility.getColumnValue("pack_code_o", dom));
ld_mfg_date = checkNullAndTrim(genericUtility.getColumnValue("mfg_date", dom));
ld_exp_date = checkNullAndTrim(genericUtility.getColumnValue("exp_date", dom));
ls_sitecode = checkNullAndTrim(genericUtility.getColumnValue("site_code__mfg", dom));
ld_retest = checkNullAndTrim(genericUtility.getColumnValue("retest_date", dom));
lc_potency = checkNullAndTrim(genericUtility.getColumnValue("potency_perc", dom));
ls_suppcodemfg = checkNullAndTrim(genericUtility.getColumnValue("supp_code__mfg", dom));
ls_dim = checkNullAndTrim(genericUtility.getColumnValue("dimension", dom));
lc_conv_qty = checkNullAndTrim(genericUtility.getColumnValue("conv__qty_stduom", dom));
ls_consider_allocate = checkNullAndTrim(genericUtility.getColumnValue("consider_allocate", dom));
lc_qty_per_art = checkNullAndTrim(genericUtility.getColumnValue("qty_per_art", dom));
lc_no_art = checkNullAndTrim(genericUtility.getColumnValue("no_art", dom));
ls_pack_code = checkNullAndTrim(genericUtility.getColumnValue("pack_code", dom));
if(ld_mfg_date_o.equalsIgnoreCase(ld_mfg_date) && ld_exp_date_o.equalsIgnoreCase(ld_exp_date) &&
ls_sitecode_o.equalsIgnoreCase(ls_sitecode) && ld_retest_o.equalsIgnoreCase(ld_retest) &&
lc_potency_o.equalsIgnoreCase(lc_potency) && ls_suppcodemfg_o.equalsIgnoreCase(ls_suppcodemfg) &&
ls_dim.equalsIgnoreCase(ls_dim_o) && lc_conv_qty_o.equalsIgnoreCase(lc_conv_qty) &&
ls_consider_allocate.equalsIgnoreCase(ls_consider_allocate__o) && lc_qty_per_art.equalsIgnoreCase(lc_qty_per_art_o) &&
lc_no_art.equalsIgnoreCase(lc_no_art_o) && ls_pack_code.equalsIgnoreCase(ls_pack_code_o))
{
errCode = "VTOLDNEW";
errList.add( errCode );
errFields.add(childNodeName.toLowerCase());
}
} }
} }
} }
else if("lot_sl".equalsIgnoreCase(childNodeName)) else if("lot_sl".equalsIgnoreCase(childNodeName))
{ {
System.out.println("------------ Inside lot_sl ...... =================== "); System.out.println("------------ Inside lot_sl ...... =================== ");
cnt = 0;
ls_sitecode = checkNullAndTrim(genericUtility.getColumnValue("site_code", dom)); ls_sitecode = checkNullAndTrim(genericUtility.getColumnValue("site_code", dom));
ls_itemcode = checkNullAndTrim(genericUtility.getColumnValue("item_code", dom)); ls_itemcode = checkNullAndTrim(genericUtility.getColumnValue("item_code", dom));
ls_loc_code = checkNullAndTrim(genericUtility.getColumnValue("loc_code", dom)); ls_loc_code = checkNullAndTrim(genericUtility.getColumnValue("loc_code", dom));
...@@ -360,7 +352,7 @@ public class StockAmdIC extends ValidatorEJB implements StockAmdICLocal, StockAm ...@@ -360,7 +352,7 @@ public class StockAmdIC extends ValidatorEJB implements StockAmdICLocal, StockAm
errList.add( errCode ); errList.add( errCode );
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
else else if(ls_lot_sl.length() > 0)
{ {
if(ls_sitecode.length() == 0) if(ls_sitecode.length() == 0)
{ {
...@@ -382,7 +374,6 @@ public class StockAmdIC extends ValidatorEJB implements StockAmdICLocal, StockAm ...@@ -382,7 +374,6 @@ public class StockAmdIC extends ValidatorEJB implements StockAmdICLocal, StockAm
{ {
ls_lot_sl = " "; ls_lot_sl = " ";
} }
sql = "SELECT COUNT(*) FROM STOCK WHERE SITE_CODE = ? AND ITEM_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? "; sql = "SELECT COUNT(*) FROM STOCK WHERE SITE_CODE = ? AND ITEM_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, ls_sitecode); pstmt.setString(1, ls_sitecode);
...@@ -407,14 +398,14 @@ public class StockAmdIC extends ValidatorEJB implements StockAmdICLocal, StockAm ...@@ -407,14 +398,14 @@ public class StockAmdIC extends ValidatorEJB implements StockAmdICLocal, StockAm
} }
if(cnt == 0) if(cnt == 0)
{ {
errCode = "VTNOSTOCK"; errCode = "VMLOTSV";
errList.add( errCode ); errList.add( errCode );
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
if(errCode.length() == 0) if(cnt > 0)
{ {
ld_mfg_date_o = checkNullAndTrim(genericUtility.getColumnValue("mfg_date__o", dom)); ld_mfg_date_o = checkNullAndTrim(genericUtility.getColumnValue("mfg_date__o", dom));
ld_exp_date_o = checkNullAndTrim(genericUtility.getColumnValue("exp_date__o", dom)); ld_exp_date_o = checkNullAndTrim(genericUtility.getColumnValue("exp_date__o", dom));
...@@ -1506,6 +1497,12 @@ public class StockAmdIC extends ValidatorEJB implements StockAmdICLocal, StockAm ...@@ -1506,6 +1497,12 @@ public class StockAmdIC extends ValidatorEJB implements StockAmdICLocal, StockAm
valueXmlString.append( "<consider_allocate><![CDATA[" ).append( ls_consider_allocate ).append( "]]></consider_allocate>\r\n" ); valueXmlString.append( "<consider_allocate><![CDATA[" ).append( ls_consider_allocate ).append( "]]></consider_allocate>\r\n" );
valueXmlString.append( "<pack_code_o><![CDATA[" ).append( ls_pack_code ).append( "]]></pack_code_o>\r\n" ); valueXmlString.append( "<pack_code_o><![CDATA[" ).append( ls_pack_code ).append( "]]></pack_code_o>\r\n" );
valueXmlString.append( "<pack_code><![CDATA[" ).append( ls_pack_code ).append( "]]></pack_code>\r\n" ); valueXmlString.append( "<pack_code><![CDATA[" ).append( ls_pack_code ).append( "]]></pack_code>\r\n" );
valueXmlString.append( "<qty_per_art><![CDATA[" ).append( lc_qtyperart ).append( "]]></qty_per_art>\r\n" );
valueXmlString.append( "<qty_per_art_o><![CDATA[" ).append( lc_qtyperart ).append( "]]></qty_per_art_o>\r\n" );
valueXmlString.append( "<no_art><![CDATA[" ).append( ll_noart ).append( "]]></no_art>\r\n" );
valueXmlString.append( "<no_art_o><![CDATA[" ).append( ll_noart ).append( "]]></no_art_o>\r\n" );
} }
else else
{ {
......
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