Skip to content

B
business-java
Commit 453c2423 authored by dsawant's avatar dsawant
Browse files
Options

updated for new changes in create dist iss 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96399 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a2508ac6
Show whitespace changes
Inline Side-by-side
Showing with 516 additions and 562 deletions
webitm-dis/ibase/webitm/ejb/dis/DistIssWiz.java
View file @ 453c2423
......@@ -752,7 +752,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
String rate1 = "";
String active = "",errCode ="",sql2 ="",noArt ="",itemDescr="";
String errString ="",siteCodeShip ="";
String lotSl ="",rateClg ="";
String lotSl ="",rateClg ="",rateFmDistOrd = "";
java.util.Date chkDate1 = null;
String prvDeptCode = null,deptCode ="";
String locGroupJwiss="";
......@@ -1168,7 +1168,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<tran_name><![CDATA[]]></tran_name>");
valueXmlString.append("<currency_descr><![CDATA[]]></currency_descr>");
valueXmlString.append("<confirmed><![CDATA[N]]></confirmed>");
valueXmlString.append("<loc_code__git><![CDATA["+(rs.getString("LOC_CODE__GITBF")==null?"":rs.getString("LOC_CODE__GITBF"))+"]]></loc_code__git>");
valueXmlString.append("<loc_code__git><![CDATA["+(rs.getString("loc_code__git")==null?"":rs.getString("loc_code__git"))+"]]></loc_code__git>");
valueXmlString.append("<conf_date><![CDATA["+sdf.format(rs.getTimestamp("CONF_DATE"))+"]]></conf_date>");
valueXmlString.append("<no_art><![CDATA[0]]></no_art>");
valueXmlString.append("<trans_mode><![CDATA["+(rs.getString("TRANS_MODE")==null?"":rs.getString("TRANS_MODE").trim())+"]]></trans_mode>");
......@@ -1226,72 +1226,6 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
rs = null;
}
if(currentColumn.trim().equalsIgnoreCase("tran_code"))
{
System.out.println(">>>>START>>>>");
tranCode = genericUtility.getColumnValue("tran_code",dom);
String currDomStr = genericUtility.serializeDom(dom);
if(tranCode != null && tranCode.trim().length() > 0)
{
sql = "select tran_name from transporter where tran_code = ?";
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,tranCode);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
tranName = rs1.getString("tran_name")==null?"":rs1.getString("tran_name").trim();
}
pstmt1.close();
rs1.close();
pstmt1 = null;
rs1 = null;
valueXmlString.append("<tran_name protect=\"0\">").append("<![CDATA[" + tranName + "]]>").append("</tran_name>");
setNodeValue( dom, "tran_name", getAbsString(""+tranName));
sql = "select trans_mode from transporter_mode where tran_code = ?";
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,tranCode);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
transMode = rs1.getString("trans_mode")==null?"":rs1.getString("trans_mode").trim();
}
pstmt1.close();
rs1.close();
pstmt1 = null;
rs1 = null;
valueXmlString.append("<trans_mode protect=\"0\">").append("<![CDATA[" + transMode + "]]>").append("</trans_mode>");
setNodeValue( dom, "trans_mode", getAbsString(""+transMode));
currDomStr = currDomStr.replace("</Detail2>", valueXmlString.toString() + "</Detail2>");
System.out.println("after currDomStr[" + currDomStr + "]");
valueXmlString.append(currDomStr);
}
else
{
valueXmlString.append("<tran_name protect=\"0\">").append("<![CDATA[]]>").append("</tran_name>");
setNodeValue( dom, "tran_name", getAbsString(""));
valueXmlString.append("<trans_mode protect=\"0\">").append("<![CDATA[]]>").append("</trans_mode>");
setNodeValue( dom, "trans_mode", getAbsString(""));
currDomStr = currDomStr.replace("</Detail2>", valueXmlString.toString() + "</Detail2>");
System.out.println("after currDomStr[" + currDomStr + "]");
valueXmlString.append(currDomStr);
}
System.out.println(">>>>END>>>>>>>>>trancode");
}
break;
......@@ -1548,26 +1482,36 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
lineNo++;
System.out.println(">>>>>>>>>>>>>..dom"+lineNo+">><><"+tranid);
valueXmlString.append("<Detail3 domID='" + lineNo+ "' objContext = '"+currentFormNo+"' selected=\"N\">\r\n");
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>\r\n");
valueXmlString.append("<tran_id><![CDATA["+tranid+"]]></tran_id>");
prvDeptCode = "NULL";
sql = "SELECT D.DIST_ORDER,D.LINE_NO AS LINE_NO,D.TRAN_ID__DEMAND,D.ITEM_CODE AS ITEM_CODE,D.QTY_ORDER AS QTY_ORDER,D.QTY_CONFIRM AS QTY_CONFIRM,"
+"D.QTY_RECEIVED AS QTY_RECEIVED,D.QTY_SHIPPED AS QTY_SHIPPED,D.DUE_DATE AS DUE_DATE,D.TAX_CLASS AS TAX_CLASS,D.TAX_CHAP AS TAX_CHAP,D.TAX_ENV AS TAX_ENV,D.UNIT AS UNIT,ITEM.DESCR AS ITEM_DESCR,"
+"D.SALE_ORDER AS SALE_ORDER,D.LINE_NO__SORD AS LINE_NO__SORD,D.RATE AS RATE,D.QTY_RETURN AS QTY_RETURN,D.RATE__CLG AS RATE__CLG,D.DISCOUNT AS DISCOUNT,D.REMARKS AS REMARKS,D.TOT_AMT AS TOT_AMT,D.TAX_AMT AS TAX_AMT,"
+"D.NET_AMT AS NET_AMT,D.OVER_SHIP_PERC AS OVER_SHIP_PERC,SPACE(300) AS QTY_DETAILS,D.UNIT__ALT AS UNIT__ALT,D.CONV__QTY__ALT AS CONV__QTY__ALT,"
+"D.QTY_ORDER__ALT AS QTY_ORDER__ALT,D.SHIP_DATE AS SHIP_DATE,D.PACK_INSTR AS PACK_INSTR ,"
+"( CASE WHEN ITEM.DEPT_CODE__ISS IS NULL then ' ' else ITEM.DEPT_CODE__ISS END ) AS DEPT_CODE, "
+"H.AVALIABLE_YN, H.TRAN_TYPE AS TRAN_TYPE, CASE WHEN H.LOC_GROUP__JWISS IS NULL THEN ' ' ELSE H.LOC_GROUP__JWISS END AS LOC_GROUP "
+"FROM DISTORDER_DET D,ITEM ITEM, DISTORDER H "
+"WHERE D.DIST_ORDER = H.DIST_ORDER "
+"AND D.ITEM_CODE = ITEM.ITEM_CODE "
+"AND H.DIST_ORDER = '"+distOrder+"'";
pstmt = conn.prepareStatement(sql);
sql="SELECT D.DIST_ORDER,D.LINE_NO AS LINE_NO,D.TRAN_ID__DEMAND,D.ITEM_CODE AS ITEM_CODE,D.QTY_ORDER AS QTY_ORDER,D.QTY_CONFIRM AS QTY_CONFIRM,"
+" D.QTY_RECEIVED AS QTY_RECEIVED,D.QTY_SHIPPED AS QTY_SHIPPED,D.DUE_DATE AS DUE_DATE,D.TAX_CLASS AS TAX_CLASS,D.TAX_CHAP AS TAX_CHAP,D.TAX_ENV AS TAX_ENV,D.UNIT AS UNIT,ITEM.DESCR AS ITEM_DESCR,"
+" D.SALE_ORDER AS SALE_ORDER,D.LINE_NO__SORD AS LINE_NO__SORD,D.RATE AS RATE,D.QTY_RETURN AS QTY_RETURN,D.RATE__CLG AS RATE__CLG,D.DISCOUNT AS DISCOUNT,D.REMARKS AS REMARKS,D.TOT_AMT AS TOT_AMT,D.TAX_AMT AS TAX_AMT,"
+" D.NET_AMT AS NET_AMT,D.OVER_SHIP_PERC AS OVER_SHIP_PERC,SPACE(300) AS QTY_DETAILS,D.UNIT__ALT AS UNIT__ALT,D.CONV__QTY__ALT AS CONV__QTY__ALT,"
+" D.QTY_ORDER__ALT AS QTY_ORDER__ALT,D.SHIP_DATE AS SHIP_DATE,D.PACK_INSTR AS PACK_INSTR ,"
+" ( CASE WHEN ITEM.DEPT_CODE__ISS IS NULL then ' ' else ITEM.DEPT_CODE__ISS END ) AS DEPT_CODE, "
+" H.AVALIABLE_YN, H.TRAN_TYPE AS TRAN_TYPE, CASE WHEN H.LOC_GROUP__JWISS IS NULL THEN ' ' ELSE H.LOC_GROUP__JWISS END AS LOC_GROUP "
+" FROM DISTORDER_DET D,ITEM ITEM, DISTORDER H "
+" WHERE D.DIST_ORDER = H.DIST_ORDER "
+" AND D.ITEM_CODE = ITEM.ITEM_CODE "
+" AND H.DIST_ORDER = '"+distOrder+"'"
+ " AND CASE WHEN D.STATUS IS NULL THEN 'O' ELSE D.STATUS END<>'C' "//Added by manoj dtd 24/12/2013 to exclude closed lines
+" ORDER BY item.dept_code__iss ASC," //added by rajendra on 02/09/08
+" D.LINE_NO ASC ";
//System.out.println( "sql....................... " + sql );
pstmt= conn.prepareStatement( sql );
rs = pstmt.executeQuery();
if(rs.next())
count = 0;
detail2xml=new StringBuffer();
locGroupJwiss="";
while(rs.next())
{
rateClg = Double.toString(rs.getDouble( "RATE__CLG" )); // ADDED BY RITESH ON 17/SEP/2014
rateFmDistOrd = Double.toString(rs.getDouble( "RATE" )); // ADDED BY RITESH ON 18/SEP/2014
System.out.println(" rateClg received from dist order iss det"+rateClg);
System.out.println(" rate received from dist order iss det"+rateFmDistOrd);
//added by msalam on 180609 to get tran_type from distorder start
tranType = rs.getString( "TRAN_TYPE" );
//added by msalam on 180609 to get tran_type from distorder end
......@@ -1598,6 +1542,11 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
System.out.println("prvDeptCode----deptCode--"+prvDeptCode+"----"+deptCode);
System.out.println( "match dept....................... " );
valueXmlString.append("<Detail3 domID='" + lineNo + "' objContext = '"+currentFormNo+"' selected=\"N\">\r\n");
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>\r\n");
valueXmlString.append("<tran_id><![CDATA["+tranid+"]]></tran_id>");
//xmldetail2hdr.append("<tran_id/>");
valueXmlString.append("<dist_order><![CDATA["+distOrder+"]]></dist_order>");
valueXmlString.append("<line_no_dist_order><![CDATA["+rs.getInt("LINE_NO")+"]]></line_no_dist_order>");
......@@ -1885,21 +1834,23 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
}
rate1 = Double.toString(rate2);
}
rateClg = null;
if (rateClg == null || rateClg.equals("") || Double.parseDouble(rateClg) == 0)
{
if (priceListClg != null && priceListClg.trim().length() > 0 )
{
rateClgVal = disCommon.pickRate(priceListClg, tranDate, itemCode, rs1.getString(1),"D",conn);
//System.out.println("rateClgVal :"+rateClgVal);
}
if (rateClgVal <= 0)
{
rateClgVal = rate2;
//System.out.println("rateClgVal :"+rateClgVal);
}
rateClg = Double.toString(rateClgVal);
}
//commented by ritesh on 17/SEP/2014 as per instruction by manoj start
// rateClg = null;
// if (rateClg == null || rateClg.equals("") || Double.parseDouble(rateClg) == 0)
// {
// if (priceListClg != null && priceListClg.trim().length() > 0 )
// {
// rateClgVal = disCommon.pickRate(priceListClg, tranDate, itemCode, rs1.getString(1),"D",conn);
// //System.out.println("rateClgVal :"+rateClgVal);
// }
// if (rateClgVal <= 0)
// {
// rateClgVal = rate2;
// //System.out.println("rateClgVal :"+rateClgVal);
// }
// rateClg = Double.toString(rateClgVal);
// }
//commented by ritesh end
if (Double.parseDouble(rs1.getString(3)) > 0)
{
grossPer = rs1.getDouble(15) / rs1.getDouble(3);
......@@ -2024,15 +1975,14 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<unit>").append("<![CDATA[").append(rs1.getString(5)).append("]]>").append("</unit>\r\n");
valueXmlString.append("<unit__alt>").append("<![CDATA[").append(unitAlt).append("]]>").append("</unit__alt>\r\n");
valueXmlString.append("<conv__qty__alt>").append("<![CDATA[").append(lcFact).append("]]>").append("</conv__qty__alt>\r\n");
valueXmlString.append("<qty_order__alt>").append("<![CDATA[").append(0).append("]]>").append("</qty_order__alt>\r\n");
valueXmlString.append("<qty_order__alt>").append("<![CDATA[").append(rs1.getDouble("qty_order__alt")).append("]]>").append("</qty_order__alt>\r\n");
String tLocCode = null;
tLocCode = rs1.getString(12);
// valueXmlString.append("<loc_code>").append("<![CDATA[").append( (tLocCode == null ? "" : tLocCode.trim()) ).append("]]>").append("</loc_code>\r\n");
//commented for rajendra on 04/09/08 for pick up rate from stock
valueXmlString.append("<rate>").append("<![CDATA[").append(rate1).append("]]>").append("</rate>\r\n");
//xmldetail2stock.append("<rate>").append("<![CDATA[").append(ratefromStock).append("]]>").append("</rate>\r\n");
valueXmlString.append("<rate__clg>").append("<![CDATA[").append(rateClg).append("]]>").append("</rate__clg>\r\n"); //Commented - jiten - 05/04/06 - as set in itemChange of lot_no
// valueXmlString.append("<quantity>").append("<![CDATA[").append(minputQty).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<rate>").append("<![CDATA[").append(rateFmDistOrd).append("]]>").append("</rate>\r\n"); // CHANGED BY RITESH ON 18/SEP/2014
// valueXmlString.append("<quantity>").append("<![CDATA[").append(rs1.getDouble("quantity")).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<amount>").append("<![CDATA[").append(minputQty*Double.parseDouble(rate1)).append("]]>").append("</amount>\r\n");
String tLotSl = null;
tLotSl = rs1.getString(2);
......@@ -2098,7 +2048,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
}
//}
}
}
pstmt.close();
rs.close();
pstmt = null;
......@@ -2222,6 +2173,9 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<quantity protect=\"0\">").append("<![CDATA[" + setQty + "]]>").append("</quantity>");
setNodeValue( dom, "quantity", getAbsString(""+setQty));
valueXmlString.append("<qty_order__alt protect=\"0\">").append("<![CDATA[" + setQty + "]]>").append("</qty_order__alt>");
setNodeValue( dom, "qty_order__alt", getAbsString(""+setQty));
valueXmlString.append("<gross_weight protect=\"0\">").append("<![CDATA[" + grossWeight + "]]>").append("</gross_weight>");
setNodeValue( dom, "gross_weight", getAbsString(""+grossWeight));
......@@ -2320,7 +2274,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
}
if(("lot_sl".equalsIgnoreCase(currentColumn)) || ("tran_code".equalsIgnoreCase(currentColumn)))
if(("lot_sl".equalsIgnoreCase(currentColumn)))
{
System.out.println("CHK VAL");
String currDomStr = genericUtility.serializeDom(dom);
......
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