Skip to content

B
business-java
Commit eb099b88 authored by mchaudhari's avatar mchaudhari
Browse files
Options

Done changes 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96132 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4bb1ff48
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 205 deletions
webitm-dis/ibase/webitm/ejb/dis/DistIssDelWiz.java
View file @ eb099b88
......@@ -106,7 +106,7 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
ResultSet rs = null;
String sql = "";
String distOrder = "",confirmed="",tranId="",siteCode="",lotSl="";
String distOrderIssNo = "",confirmed="",tranId="",siteCode="",lotSl="";
try {
System.out.println("editFlag>>>>wf"+editFlag);
......@@ -135,23 +135,23 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if(childNodeName.equalsIgnoreCase("dist_order1"))
if(childNodeName.equalsIgnoreCase("distord_issno"))
{
distOrder = genericUtility.getColumnValue("dist_order1",dom);
distOrderIssNo = genericUtility.getColumnValue("distord_issno",dom);
if (distOrder == null || distOrder.trim().length() == 0)
if (distOrderIssNo == null || distOrderIssNo.trim().length() == 0)
{
errCode = "DIDONULL";
errString = getErrorString("dist_order1",errCode,userId);
errCode = "DISISSNULL";
errString = getErrorString("distord_issno",errCode,userId);
break;
}
else
{
sql = "select count(1) from distorder where dist_order = ?";
sql = "select count(1) from distord_iss where tran_id = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,distOrder);
pstmt.setString(1,distOrderIssNo);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -163,14 +163,14 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
rs = null;
if(cnt == 0)
{
errCode = "DIDONOTEX";
errString = getErrorString("dist_order1",errCode,userId);
errCode = "DISNOTEX";
errString = getErrorString("distord_issno",errCode,userId);
break;
}else
{
sql = "select confirmed from distorder where dist_order = ?";
sql = "select confirmed from distord_iss where tran_id = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,distOrder);
pstmt.setString(1,distOrderIssNo);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -181,54 +181,11 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
pstmt = null;
rs = null;
if(!confirmed.equals("Y"))
if(confirmed.equals("Y"))
{
errCode = "DIDONOTCO";
errString = getErrorString("dist_order1",errCode,userId);
errCode = "DISISSCO";
errString = getErrorString("distord_issno",errCode,userId);
break;
}else
{
sql = "select count(1) from ship_docs where ref_ser = 'D-ISS' and ref_id = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,distOrder);
rs = pstmt.executeQuery();
if(rs.next())
{
cnt = rs.getInt(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
if(cnt > 0)
{
errCode = "DIDOEISHDO";
errString = getErrorString("dist_order1",errCode,userId);
break;
}
else
{
//validation needs to added for checking dist order present in dist issue table
sql = "select count(1) from distord_iss where dist_order = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,distOrder);
rs = pstmt.executeQuery();
if(rs.next())
{
cnt = rs.getInt(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
if(cnt == 0)
{
errCode = "VTDIST2";
errString = getErrorString("dist_order1",errCode,userId);
break;
}
}
}
}
......@@ -236,11 +193,6 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
}
}
}
break;
case 2:
......@@ -282,7 +234,6 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
{
siteCode = genericUtility.getColumnValue("site_code",dom2);
lotSl = genericUtility.getColumnValue("lot_sl",dom2);
distOrder = genericUtility.getColumnValue("dist_order",dom2);
if (lotSl == null || lotSl.trim().length() == 0)
{
......@@ -388,7 +339,7 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
System.out.println("DOM111 Elements>>["+genericUtility.serializeDom(dom).toString()+"]");
System.out.println("DOM222 Elements>>["+genericUtility.serializeDom(dom1).toString()+"]");
System.out.println("DOM322 Elements>>["+genericUtility.serializeDom(dom2).toString()+"]");
String distOrder = "",itemCode = "",sql="";
String distOrder = "",itemCode = "",sql="", distOrderiss = "";
java.sql.Timestamp currDate = null;
double grossWeight = 0,netWeight=0,tareWeight=0,noOfArt=0;
SimpleDateFormat sdf = null;
......@@ -428,7 +379,7 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
distOrder = genericUtility.getColumnValue("dist_order1", dom1);
distOrderiss = genericUtility.getColumnValue("distord_issno", dom1);
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{
......@@ -456,7 +407,7 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
+"DISTORD_ISS.TRAN_CODE=TRANSPORTER.TRAN_CODE(+)) AND ( "
+"DISTORD_ISS.CURR_CODE__FRT=CURRENCY_B.CURR_CODE(+)) AND ("
+"DISTORD_ISS.SITE_CODE__BIL=SITE_C.SITE_CODE(+)) AND "
+"DISTORD_ISS.DIST_ORDER = '"+distOrder+"'";
+"DISTORD_ISS.TRAN_ID = '"+distOrderiss+"'";
......@@ -565,144 +516,11 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
break;
case 3 :
tranDate = getCurrdateAppFormat() ;
tranid = genericUtility.getColumnValue("tran_id", dom1);
distOrder = genericUtility.getColumnValue("dist_order1", dom1);
System.out.println("tran val"+tranid+"dist_order1>>>"+distOrder);
sql = "select tran_id from distord_iss where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED END = 'N' and dist_order = ?";
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,distOrder);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
tranid = rs1.getString(1) == null ? "":rs1.getString(1);
}
pstmt1.close();
rs1.close();
pstmt1 = null;
rs1 = null;
System.out.println("tranid FROM QUERY"+tranid);
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{/*
sql = "SELECT item.descr,location.descr,"
+"distord_issdet.tran_id,"
+"distord_issdet.line_no,"
+"distord_issdet.dist_order,"
+"distord_issdet.line_no_dist_order,"
+"distord_issdet.item_code,"
+"distord_issdet.quantity,"
+"distord_issdet.unit,"
+"distord_issdet.tax_class,"
+"distord_issdet.tax_chap,"
+"distord_issdet.tax_env,"
+"distord_issdet.loc_code,"
+"distord_issdet.lot_no,"
+"distord_issdet.lot_sl,"
+"distord_issdet.pack_code,"
+"distord_issdet.rate,"
+"distord_issdet.amount,"
+"distord_issdet.tax_amt,"
+"distord_issdet.net_amt,"
+"distord_issdet.site_code__mfg,"
+"distord_issdet.mfg_date,"
+"distord_issdet.exp_date,"
+"distord_issdet.potency_perc,"
+"distord_issdet.no_art,"
+"distord_issdet.gross_weight,"
+"distord_issdet.tare_weight,"
+"distord_issdet.net_weight,"
+"distord_issdet.pack_instr,"
+"distord_issdet.dimension,"
+"distord_issdet.supp_code__mfg,"
+"distord_issdet.batch_no,"
+"distord_issdet.grade,"
+"distord_issdet.retest_date,"
+"distord_issdet.rate__clg,"
+"distord_issdet.discount,"
+"distord_issdet.disc_amt,"
+"distord_issdet.remarks,"
+"distord_issdet.cost_rate,"
+"space(300) as qty_details,"
+"distord_issdet.unit__alt,"
+"distord_issdet.conv__qty__alt,"
+"distord_issdet.qty_order__alt,"
+"distord_issdet.pallet_wt,"
+"distorder_det.reas_code,"
+"distord_issdet.rate__alt,"
+"distord_issdet.conv__rate_alt,"
+"distord_issdet.batch_size,"
+"distord_issdet.shelf_life_type "
+"FROM distord_issdet,"
+"item,"
+"location,"
+"distorder_det "
+"WHERE ( distord_issdet.item_code = item.item_code ) and "
+"( distord_issdet.loc_code = location.loc_code ) and "
+"( distord_issdet.dist_order = distorder_det.dist_order ) and "
+" distord_issdet.tran_id = '"+tranid+"'";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
while(rs.next())
{
valueXmlString.append("<Detail3 domID='" +rs.getInt("line_no")+ "' objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n");
valueXmlString.append("<tran_id><![CDATA["+tranid+"]]></tran_id>");
valueXmlString.append("<dist_order><![CDATA["+distOrder+"]]></dist_order>");
valueXmlString.append("<line_no_dist_order><![CDATA["+rs.getInt("line_no_dist_order")+"]]></line_no_dist_order>");
valueXmlString.append("<line_no><![CDATA["+rs.getInt("line_no")+"]]></line_no>");
valueXmlString.append("<item_code>").append("<![CDATA["+(rs.getString("item_code")==null?"":rs.getString("item_code").trim())+"]]>").append("</item_code>\r\n");
valueXmlString.append("<item_descr>").append("<![CDATA["+(rs.getString(1)==null?"":rs.getString(1).trim())+"]]>").append("</item_descr>\r\n");
valueXmlString.append("<location_descr>").append("<![CDATA["+(rs.getString(2)==null?"":rs.getString(2).trim())+"]]>").append("</location_descr>\r\n");
valueXmlString.append("<unit>").append("<![CDATA["+(rs.getString("unit")==null?"":rs.getString("unit").trim())+"]]>").append("</unit>\r\n");
valueXmlString.append("<unit__alt>").append("<![CDATA["+(rs.getString("unit__alt")==null?"":rs.getString("unit__alt").trim())+"]]>").append("</unit__alt>\r\n");
valueXmlString.append("<conv__qty__alt>").append("<![CDATA["+rs.getDouble("conv__qty__alt")+"]]>").append("</conv__qty__alt>\r\n");
valueXmlString.append("<qty_order__alt>").append("<![CDATA["+rs.getDouble("conv__qty__alt")+"]]>").append("</qty_order__alt>\r\n");
valueXmlString.append("<loc_code>").append("<![CDATA["+(rs.getString("loc_code")==null?"":rs.getString("loc_code").trim())+"]]>").append("</loc_code>\r\n");
valueXmlString.append("<rate>").append("<![CDATA["+rs.getDouble("rate")+"]]>").append("</rate>\r\n");
valueXmlString.append("<rate__clg>").append("<![CDATA["+rs.getDouble("rate__clg")+"]]>").append("</rate__clg>\r\n"); //Commented - jiten - 05/04/06 - as set in itemChange of lot_no
valueXmlString.append("<quantity>").append("<![CDATA["+rs.getDouble("quantity")+"]]>").append("</quantity>\r\n");
valueXmlString.append("<amount>").append("<![CDATA["+rs.getDouble("amount")+"]]>").append("</amount>\r\n");
valueXmlString.append("<lot_sl>").append("<![CDATA["+(rs.getString("lot_sl")==null?"":rs.getString("lot_sl").trim())+"]]>").append("</lot_sl>\r\n");
valueXmlString.append("<pack_code>").append("<![CDATA["+(rs.getString("pack_code")==null?"":rs.getString("pack_code").trim())+"]]>").append("</pack_code>\r\n");
valueXmlString.append("<disc_amt>").append("<![CDATA["+rs.getDouble("disc_amt")+"]]>").append("</disc_amt>\r\n");
valueXmlString.append("<tax_class>").append("<![CDATA["+(rs.getString("tax_class")==null?"":rs.getString("tax_class").trim())+"]]>").append("</tax_class>\r\n");
valueXmlString.append("<tax_chap>").append("<![CDATA["+(rs.getString("tax_chap")==null?"":rs.getString("tax_chap").trim())+"]]>").append("</tax_chap>\r\n");
valueXmlString.append("<tax_env>").append("<![CDATA["+(rs.getString("tax_env")==null?"":rs.getString("tax_env").trim())+"]]>").append("</tax_env>\r\n");
valueXmlString.append("<gross_weight>").append("<![CDATA["+rs.getDouble("gross_weight")+"]]>").append("</gross_weight>\r\n");
valueXmlString.append("<net_weight>").append("<![CDATA["+rs.getDouble("net_weight")+"]]>").append("</net_weight>\r\n");
valueXmlString.append("<tare_weight>").append("<![CDATA["+rs.getDouble("tare_weight")+"]]>").append("</tare_weight>\r\n");
valueXmlString.append("<pack_instr>").append("<![CDATA["+(rs.getString("pack_instr")==null?"":rs.getString("pack_instr").trim())+"]]>").append("</pack_instr>\r\n"); //Gulzar 24/03/07
valueXmlString.append("<retest_date>").append("<![CDATA[").append((rs.getDate("retest_date") == null) ? "":sdf.format(rs.getDate("retest_date"))).append("]]>").append("</retest_date>\r\n");
valueXmlString.append("<dimension>").append("<![CDATA[").append((rs.getString("dimension") == null) ? "":rs.getString("dimension")).append("]]>").append("</dimension>\r\n");
valueXmlString.append("<supp_code__mfg>").append("<![CDATA[").append((rs.getString("supp_code__mfg") == null) ? "":rs.getString("supp_code__mfg")).append("]]>").append("</supp_code__mfg>\r\n"); //Gulzar 24/03/07
valueXmlString.append("<site_code__mfg>").append("<![CDATA[").append((rs.getString("site_code__mfg") == null) ? "":rs.getString("site_code__mfg")).append("]]>").append("</site_code__mfg>\r\n");
valueXmlString.append("<mfg_date>").append("<![CDATA[").append((rs.getDate("mfg_date") == null) ? "":sdf.format(rs.getDate("mfg_date"))).append("]]>").append("</mfg_date>\r\n");
valueXmlString.append("<exp_date>").append("<![CDATA[").append((rs.getDate("exp_date") == null) ? "":sdf.format(rs.getDate("exp_date"))).append("]]>").append("</exp_date>\r\n");
valueXmlString.append("<potency_perc>").append("<![CDATA[").append( ( (rs.getString("potency_perc") == null) ? "": rs.getString("potency_perc") ) ).append("]]>").append("</potency_perc>\r\n");
valueXmlString.append("<no_art>").append("<![CDATA["+rs.getDouble("no_art")+"]]>").append("</no_art>\r\n");
valueXmlString.append("<batch_no>").append("<![CDATA[").append( ( (rs.getString("batch_no") == null) ? "":rs.getString("batch_no") ) ).append("]]>").append("</batch_no>\r\n");
valueXmlString.append("<grade>").append("<![CDATA[").append( ( (rs.getString("grade") == null) ? "": rs.getString("grade") ) ).append("]]>").append("</grade>\r\n");
valueXmlString.append("<lot_no>").append("<![CDATA[").append(( (rs.getString("lot_no") == null) ? "": rs.getString("lot_no"))).append("]]>").append("</lot_no>\r\n");
valueXmlString.append("</Detail3>");
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
*/}
else if(currentColumn.trim().equalsIgnoreCase("lot_sl"))
if(currentColumn.trim().equalsIgnoreCase("lot_sl"))
{
System.out.println(">>>>START>>>>");
distOrder = genericUtility.getColumnValue("dist_order1", dom1);
distOrderiss = genericUtility.getColumnValue("distord_issno", dom2);
lotSl = genericUtility.getColumnValue("lot_sl",dom);
siteCode = genericUtility.getColumnValue("site_code", dom2,"2");
System.out.println("<<<sdsdsddS"+siteCode);
......@@ -711,10 +529,10 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
if(lotSl != null && lotSl.trim().length() > 0)
{
//item_code,no_art,quantity,amount,net_amt,discount,tax_amt,gross_weight,tare_weight,net_weight
sql = "select LOC_CODE,LOT_NO,ITEM_CODE,QUANTITY,GROSS_WEIGHT,NET_WEIGHT,TARE_WEIGHT,NO_ART from distord_issdet where LOT_SL = ? and dist_order = ?";
sql = "select LOC_CODE,LOT_NO,ITEM_CODE,QUANTITY,GROSS_WEIGHT,NET_WEIGHT,TARE_WEIGHT,NO_ART,DIST_ORDER from distord_issdet where LOT_SL = ? and tran_id = ?";
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,lotSl);
pstmt1.setString(2,distOrder);
pstmt1.setString(2,distOrderiss);
rs1 = pstmt1.executeQuery();
if(rs1.next())
......@@ -727,6 +545,7 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
netWeight = rs1.getDouble("net_weight");
tareWeight = rs1.getDouble("tare_weight");
noOfArt = rs1.getDouble("no_art");
distOrder = rs1.getString("DIST_ORDER");
}
pstmt1.close();
......@@ -852,7 +671,6 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
break;
}
if(("lot_sl".equalsIgnoreCase(currentColumn)))
......
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