Commit a846eb7a authored by manohar's avatar manohar

Bug fix and cosmetic change for display


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97437 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9d9e989d
...@@ -835,7 +835,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa ...@@ -835,7 +835,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
valueXmlString = new StringBuffer("<?xml version = \"1.0\"?> <Root> <header> <editFlag>"); valueXmlString = new StringBuffer("<?xml version = \"1.0\"?> <Root> <header> <editFlag>");
valueXmlString.append(editFlag).append("</editFlag> </header>"); valueXmlString.append(editFlag).append("</editFlag> </header>");
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
switch (currentFormNo) { switch (currentFormNo)
{
case 1 : case 1 :
break; break;
...@@ -846,267 +847,236 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa ...@@ -846,267 +847,236 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
sorderNo = checkNull(genericUtility.getColumnValue("sale_order_no", dom1)); sorderNo = checkNull(genericUtility.getColumnValue("sale_order_no", dom1));
System.out.println("sorderNo in case211---->>["+sorderNo+"]"); System.out.println("sorderNo in case211---->>["+sorderNo+"]");
sql = "select add_user,sord_no from despatch where CASE WHEN confirmed IS NULL THEN "
+ "'N' ELSE CONFIRMED END = 'N' and sord_no = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,sorderNo);
rs = pstmt.executeQuery();
while(rs.next())
{
addUser = checkNull(rs.getString("add_user"));
addUsersList.add(addUser);
}
System.out.println("addUsersList--case2---->>["+addUsersList+"]");
pstmt.close();
rs.close();
pstmt = null;
rs = null;
sql="select count(1) from despatch where CASE WHEN confirmed IS NULL " sql="select count(1) from despatch where CASE WHEN confirmed IS NULL "
+ "THEN 'N' ELSE confirmed END = 'N' and sord_no = ?"; + "THEN 'N' ELSE confirmed END = 'N' and sord_no = ? and add_user = ? ";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,sorderNo); pstmt.setString(1,sorderNo);
pstmt.setString(2,chgUser);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()){ if(rs.next())
cnt = rs.getInt(1); {
cnt = rs.getInt(1);
} }
if(rs!=null){
rs.close(); rs.close();
rs=null; rs=null;
}
if(pstmt!=null){
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
}
System.out.println("sorderNo cnt123/@-@/>>----->>["+cnt+"]");//GROSS_WEIGHT, TARE_WEIGHT, NETT_WEIGHT System.out.println("sorderNo cnt123/@-@/>>----->>["+cnt+"]");//GROSS_WEIGHT, TARE_WEIGHT, NETT_WEIGHT
if(cnt > 0) if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{ {
if(currentColumn.trim().equalsIgnoreCase("itm_default")) if (cnt > 0 )
{ {
System.out.println("addUsersList22------>>["+addUsersList+"]"); sql="select d.desp_id,d.site_code,d.desp_date,d.curr_code,d.exch_rate,d.trans_mode,d.curr_code__frt,d.curr_code__ins,d.stan_code,"
System.out.println("chgUser11------>>["+chgUser+"]"); + "d.state_code__dlv,d.dlv_city,d.dlv_pin,d.count_code__dlv,d.dlv_add1,d.dlv_add2,d.dlv_add3,"
if(addUsersList.contains(chgUser)) + "d.tran_code,d.stan_code__init,d.status,d.status_remarks,d.remarks,d.no_art,d.status_date,d.cust_code,d.cust_code__dlv,"
{ + "s.site_code__ship,s.CHG_USER,s.CHG_TERM, s.order_date,d.gross_weight,d.nett_weight,d.tare_weight,d.no_art,"
for(int i = 0;i < addUsersList.size(); i++) + "d.eff_date,d.confirmed,d.chg_date,d.chg_term,d.chg_user,d.licence_no,d.licence_no_1,d.licence_no_2,d.licence_no_3," // Sandesh 2-Oct-2014
{ + "d.licence_date_1,d.licence_date_2,d.licence_date_3,d.available_yn,d.insurance,d.freight " // Sandesh 2-Oct-2014
addUser = addUsersList.get(i); + " from despatch d,sorder s where d.sord_no = ? and d.sord_no = s.sale_order and d.add_user = ? "
System.out.println("addUser------------>>["+addUser+"]"); + " and CASE WHEN d.confirmed IS NULL THEN 'N' ELSE d.confirmed END = 'N'";
if(chgUser.equalsIgnoreCase(addUser))
{
sql="select d.desp_id,d.site_code,d.desp_date,d.curr_code,d.exch_rate,d.trans_mode,d.curr_code__frt,d.curr_code__ins,d.stan_code,"
+ "d.state_code__dlv,d.dlv_city,d.dlv_pin,d.count_code__dlv,d.dlv_add1,d.dlv_add2,d.dlv_add3,"
+ "d.tran_code,d.stan_code__init,d.status,d.status_remarks,d.remarks,d.no_art,d.status_date,d.cust_code,d.cust_code__dlv,"
+ "s.site_code__ship,s.CHG_USER,s.CHG_TERM, s.order_date,d.gross_weight,d.nett_weight,d.tare_weight,d.no_art,"
+ "d.eff_date,d.confirmed,d.chg_date,d.chg_term,d.chg_user,d.licence_no,d.licence_no_1,d.licence_no_2,d.licence_no_3," // Sandesh 2-Oct-2014
+ "d.licence_date_1,d.licence_date_2,d.licence_date_3,d.available_yn,d.insurance,d.freight " // Sandesh 2-Oct-2014
+ " from despatch d,sorder s where d.sord_no = ? and d.sord_no = s.sale_order and d.add_user = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,sorderNo); pstmt.setString(1,sorderNo);
pstmt.setString(2,addUser); pstmt.setString(2,chgUser);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()){ if(rs.next())
System.out.println("Data found3334455..................."); {
despId=checkNull(rs.getString("desp_id")); System.out.println("Data found3334455...................");
siteCode = checkNull(rs.getString("site_code")); despId=checkNull(rs.getString("desp_id"));
currencyCode = checkNull(rs.getString("curr_code")); siteCode = checkNull(rs.getString("site_code"));
exchRate1 = checkNull(rs.getString("exch_rate")); currencyCode = checkNull(rs.getString("curr_code"));
transMode = rs.getString("trans_mode") == null ? "R " : rs.getString("trans_mode"); exchRate1 = checkNull(rs.getString("exch_rate"));
currCodeFrt = checkNull(rs.getString("curr_code__frt")); transMode = rs.getString("trans_mode") == null ? "R " : rs.getString("trans_mode");
currCodeIns = checkNull(rs.getString("curr_code__ins")); currCodeFrt = checkNull(rs.getString("curr_code__frt"));
currCodeIns = checkNull(rs.getString("curr_code__ins"));
orderDt = rs.getDate("desp_date");
orderDt = rs.getDate("desp_date");
stanCode = checkNull(rs.getString("stan_code"));
stanCodeDlv = checkNull(rs.getString("state_code__dlv")); stanCode = checkNull(rs.getString("stan_code"));
dlvCity = checkNull(rs.getString("dlv_city")); stanCodeDlv = checkNull(rs.getString("state_code__dlv"));
dlvPin = checkNull(rs.getString("dlv_pin")); dlvCity = checkNull(rs.getString("dlv_city"));
countCodeDlv = checkNull(rs.getString("count_code__dlv")); dlvPin = checkNull(rs.getString("dlv_pin"));
tranCode = checkNull(rs.getString("tran_code")); countCodeDlv = checkNull(rs.getString("count_code__dlv"));
stanCodeInit = checkNull(rs.getString("stan_code__init")); tranCode = checkNull(rs.getString("tran_code"));
status = checkNull(rs.getString("status")); stanCodeInit = checkNull(rs.getString("stan_code__init"));
status = checkNull(rs.getString("status"));
//---- Added by Sandesh 2-Oct-2014 -
/*if(status.equals("")){ //---- Added by Sandesh 2-Oct-2014 -
/*if(status.equals("")){
status = " ";
}*/ status = " ";
// ----------------------- }*/
// -----------------------
statusRemarks = checkNull(rs.getString("status_remarks"));
statusDate = rs.getDate("status_date"); statusRemarks = checkNull(rs.getString("status_remarks"));
custCode=checkNull(rs.getString("cust_code")); statusDate = rs.getDate("status_date");
custCodeDlv=checkNull(rs.getString("cust_code__dlv")); custCode=checkNull(rs.getString("cust_code"));
siteCodeShip=checkNull(rs.getString("site_code__ship")); custCodeDlv=checkNull(rs.getString("cust_code__dlv"));
siteCodeShip=checkNull(rs.getString("site_code__ship"));
dlvAdd1=checkNull(rs.getString("dlv_add1"));
dlvAdd2=checkNull(rs.getString("dlv_add2")); dlvAdd1=checkNull(rs.getString("dlv_add1"));
dlvAdd3=checkNull(rs.getString("dlv_add3")); dlvAdd2=checkNull(rs.getString("dlv_add2"));
dlvAdd3=checkNull(rs.getString("dlv_add3"));
remarksDes=checkNull(rs.getString("remarks"));
noArtDes=checkNull(rs.getString("no_art")); remarksDes=checkNull(rs.getString("remarks"));
sOrdDate=rs.getDate("order_date"); noArtDes=checkNull(rs.getString("no_art"));
grossWeight=rs.getDouble("gross_weight"); sOrdDate=rs.getDate("order_date");
netWeight=rs.getDouble("nett_weight"); grossWeight=rs.getDouble("gross_weight");
tareWeight=rs.getDouble("tare_weight"); netWeight=rs.getDouble("nett_weight");
tareWeight=rs.getDouble("tare_weight");
//------- Added by Sandesh 2-Oct-2014 -------
//------- Added by Sandesh 2-Oct-2014 -------
effDate = rs.getTimestamp("EFF_DATE");
confirm = checkNull(rs.getString("CONFIRMED")); effDate = rs.getTimestamp("EFF_DATE");
chgDate = rs.getTimestamp("CHG_DATE"); confirm = checkNull(rs.getString("CONFIRMED"));
licnNo = checkNull(rs.getString("LICENCE_NO")); chgDate = rs.getTimestamp("CHG_DATE");
licnNo1 = checkNull(rs.getString("LICENCE_NO_1")); licnNo = checkNull(rs.getString("LICENCE_NO"));
licnNo2 = checkNull(rs.getString("LICENCE_NO_2")); licnNo1 = checkNull(rs.getString("LICENCE_NO_1"));
licnNo3 = checkNull(rs.getString("LICENCE_NO_3")); licnNo2 = checkNull(rs.getString("LICENCE_NO_2"));
licnDate1 = rs.getTimestamp("LICENCE_DATE_1"); licnNo3 = checkNull(rs.getString("LICENCE_NO_3"));
licnDate2 = rs.getTimestamp("LICENCE_DATE_2"); licnDate1 = rs.getTimestamp("LICENCE_DATE_1");
licnDate3 = rs.getTimestamp("LICENCE_DATE_3"); licnDate2 = rs.getTimestamp("LICENCE_DATE_2");
availYN = checkNull(rs.getString("AVAILABLE_YN")); licnDate3 = rs.getTimestamp("LICENCE_DATE_3");
insuranceAmt = rs.getDouble("INSURANCE"); availYN = checkNull(rs.getString("AVAILABLE_YN"));
frghtAmt = rs.getDouble("FREIGHT"); insuranceAmt = rs.getDouble("INSURANCE");
frghtAmt = rs.getDouble("FREIGHT");
System.out.println("\n New values -> ");
System.out.println("\n New values -> ");
System.out.println("\n effDate : "+effDate+" confirm : "+confirm+" chgDate : "+chgDate+" licnNo : "+licnNo+" frghtAmt : "+frghtAmt);
System.out.println("\n licnNo1 : "+licnNo1+" licnNo2 : "+licnNo2+" licnNo3 : "+licnNo3+" insuranceAmt : "+insuranceAmt); System.out.println("\n effDate : "+effDate+" confirm : "+confirm+" chgDate : "+chgDate+" licnNo : "+licnNo+" frghtAmt : "+frghtAmt);
System.out.println("\n licnDate1 : "+licnDate1+" licnDate2 : "+licnDate2+" licnDate3 : "+licnDate3+" availYN : "+availYN); System.out.println("\n licnNo1 : "+licnNo1+" licnNo2 : "+licnNo2+" licnNo3 : "+licnNo3+" insuranceAmt : "+insuranceAmt);
System.out.println("\n licnDate1 : "+licnDate1+" licnDate2 : "+licnDate2+" licnDate3 : "+licnDate3+" availYN : "+availYN);
// ------------------------------
// ------------------------------
}
if(rs!=null){ }
rs.close(); rs.close();
rs=null; rs=null;
} pstmt.close();
if(pstmt!=null){ pstmt=null;
pstmt.close(); System.out.println("tranCode----->>["+tranCode+"]");
pstmt=null; System.out.println("orderDt----->>["+orderDt+"]");
} System.out.println("sOrdDate----->>["+sOrdDate+"]");
System.out.println("tranCode----->>["+tranCode+"]"); System.out.println("custCodeDlv----->>["+custCodeDlv+"]");
System.out.println("orderDt----->>["+orderDt+"]"); valueXmlString.append("<Detail2 domID='" + count + "' objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
System.out.println("sOrdDate----->>["+sOrdDate+"]"); valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n");
System.out.println("custCodeDlv----->>["+custCodeDlv+"]"); valueXmlString.append("<desp_id><![CDATA["+ despId +"]]></desp_id>");
valueXmlString.append("<Detail2 domID='" + count + "' objContext = '"+currentFormNo+"' selected=\"Y\">\r\n"); if(orderDt != null)
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n"); {
valueXmlString.append("<desp_id><![CDATA["+ despId +"]]></desp_id>"); valueXmlString.append("<desp_date><![CDATA["+ sdf.format(orderDt).toString() +"]]></desp_date>");
if(orderDt != null){ }
valueXmlString.append("<desp_date><![CDATA["+ sdf.format(orderDt).toString() +"]]></desp_date>"); if(sOrdDate != null)
} {
if(sOrdDate != null){ valueXmlString.append("<sord_date><![CDATA["+ sdf.format(sOrdDate).toString() +"]]></sord_date>");
valueXmlString.append("<sord_date><![CDATA["+ sdf.format(sOrdDate).toString() +"]]></sord_date>"); }
} valueXmlString.append("<sord_no><![CDATA["+ sorderNo +"]]></sord_no>");
valueXmlString.append("<sord_no><![CDATA["+ sorderNo +"]]></sord_no>"); valueXmlString.append("<cust_code><![CDATA["+ custCode +"]]></cust_code>");
valueXmlString.append("<cust_code><![CDATA["+ custCode +"]]></cust_code>"); valueXmlString.append("<cust_code__dlv><![CDATA["+ custCodeDlv +"]]></cust_code__dlv>");
valueXmlString.append("<cust_code__dlv><![CDATA["+ custCodeDlv +"]]></cust_code__dlv>"); valueXmlString.append("<cust_code__bil><![CDATA["+ custCodeBil +"]]></cust_code__bil>");
valueXmlString.append("<cust_code__bil><![CDATA["+ custCodeBil +"]]></cust_code__bil>"); valueXmlString.append("<stan_code><![CDATA["+ stanCode.trim() +"]]></stan_code>");
valueXmlString.append("<stan_code><![CDATA["+ stanCode.trim() +"]]></stan_code>"); valueXmlString.append("<trans_mode><![CDATA["+ transMode.trim() +"]]></trans_mode>");
valueXmlString.append("<trans_mode><![CDATA["+ transMode.trim() +"]]></trans_mode>");
//valueXmlString.append("<lr_date><![CDATA["+ lrDateVal.toString() +"]]></lr_date>");
//valueXmlString.append("<lr_date><![CDATA["+ lrDateVal.toString() +"]]></lr_date>"); //valueXmlString.append("<shipment_id><![CDATA["+ shipmentId.trim() +"]]></shipment_id>");
//valueXmlString.append("<shipment_id><![CDATA["+ shipmentId.trim() +"]]></shipment_id>"); valueXmlString.append("<curr_code__frt><![CDATA["+ currCodeFrt.trim() +"]]></curr_code__frt>");
valueXmlString.append("<curr_code__frt><![CDATA["+ currCodeFrt.trim() +"]]></curr_code__frt>"); valueXmlString.append("<curr_code__ins><![CDATA["+ currCodeIns.trim() +"]]></curr_code__ins>");
valueXmlString.append("<curr_code__ins><![CDATA["+ currCodeIns.trim() +"]]></curr_code__ins>"); valueXmlString.append("<curr_code><![CDATA["+ currencyCode.trim() +"]]></curr_code>");
valueXmlString.append("<curr_code><![CDATA["+ currencyCode.trim() +"]]></curr_code>"); valueXmlString.append("<exch_rate><![CDATA["+ exchRate1 +"]]></exch_rate>");// CAN NOT BE NULL
valueXmlString.append("<exch_rate><![CDATA["+ exchRate1 +"]]></exch_rate>");// CAN NOT BE NULL valueXmlString.append("<exch_rate__frt><![CDATA["+ exchRate1 +"]]></exch_rate__frt>");
valueXmlString.append("<exch_rate__frt><![CDATA["+ exchRate1 +"]]></exch_rate__frt>"); valueXmlString.append("<exch_rate__ins><![CDATA["+ exchRate1 +"]]></exch_rate__ins>");
valueXmlString.append("<exch_rate__ins><![CDATA["+ exchRate1 +"]]></exch_rate__ins>");
valueXmlString.append("<site_code__ship><![CDATA["+ siteCodeShip +"]]></site_code__ship>");
valueXmlString.append("<site_code__ship><![CDATA["+ siteCodeShip +"]]></site_code__ship>"); if(siteCodeShip.length() > 0)
if(siteCodeShip.length() > 0){ {
siteCodeDesc=checkNull(getColumnDescr(conn, "descr", "site", "site_code", siteCodeShip)); siteCodeDesc=checkNull(getColumnDescr(conn, "descr", "site", "site_code", siteCodeShip));
} }
valueXmlString.append("<site_descr><![CDATA["+ siteCodeDesc+"]]></site_descr>"); valueXmlString.append("<site_descr><![CDATA["+ siteCodeDesc+"]]></site_descr>");
valueXmlString.append("<site_code><![CDATA["+ siteCode +"]]></site_code>"); valueXmlString.append("<site_code><![CDATA["+ siteCode +"]]></site_code>");
if(siteCode.length() > 0){ if(siteCode.length() > 0)
siteCodeDesc=checkNull(getColumnDescr(conn, "descr", "site", "site_code", siteCode)); {
} siteCodeDesc=checkNull(getColumnDescr(conn, "descr", "site", "site_code", siteCode));
}
valueXmlString.append("<descr><![CDATA["+ siteCodeDesc+"]]></descr>"); valueXmlString.append("<descr><![CDATA["+ siteCodeDesc+"]]></descr>");
valueXmlString.append("<state_code__dlv><![CDATA["+ stanCodeDlv.trim()+"]]></state_code__dlv>"); valueXmlString.append("<state_code__dlv><![CDATA["+ stanCodeDlv.trim()+"]]></state_code__dlv>");
valueXmlString.append("<dlv_add1><![CDATA["+ dlvAdd1 +"]]></dlv_add1>"); valueXmlString.append("<dlv_add1><![CDATA["+ dlvAdd1 +"]]></dlv_add1>");
valueXmlString.append("<dlv_add2><![CDATA["+ dlvAdd2 +"]]></dlv_add2>"); valueXmlString.append("<dlv_add2><![CDATA["+ dlvAdd2 +"]]></dlv_add2>");
valueXmlString.append("<dlv_add3><![CDATA["+ dlvAdd3 +"]]></dlv_add3>"); valueXmlString.append("<dlv_add3><![CDATA["+ dlvAdd3 +"]]></dlv_add3>");
valueXmlString.append("<dlv_city><![CDATA["+ dlvCity +"]]></dlv_city>"); valueXmlString.append("<dlv_city><![CDATA["+ dlvCity +"]]></dlv_city>");
valueXmlString.append("<dlv_pin><![CDATA["+ dlvPin +"]]></dlv_pin>"); valueXmlString.append("<dlv_pin><![CDATA["+ dlvPin +"]]></dlv_pin>");
valueXmlString.append("<count_code__dlv><![CDATA["+ countCodeDlv +"]]></count_code__dlv>"); valueXmlString.append("<count_code__dlv><![CDATA["+ countCodeDlv +"]]></count_code__dlv>");
valueXmlString.append("<tran_code><![CDATA["+ tranCode +"]]></tran_code>"); valueXmlString.append("<tran_code><![CDATA["+ tranCode +"]]></tran_code>");
valueXmlString.append("<stan_code__init><![CDATA["+ stanCodeInit +"]]></stan_code__init>"); valueXmlString.append("<stan_code__init><![CDATA["+ stanCodeInit +"]]></stan_code__init>");
valueXmlString.append("<status_remarks><![CDATA["+ statusRemarks +"]]></status_remarks>"); valueXmlString.append("<status_remarks><![CDATA["+ statusRemarks +"]]></status_remarks>");
status = " "; // Added by sandesh status = " "; // Added by sandesh
valueXmlString.append("<status><![CDATA["+ status +"]]></status>"); valueXmlString.append("<status><![CDATA["+ status +"]]></status>");
tranName=getColumnDescr(conn,"tran_name" , "transporter", "tran_code", tranCode); tranName=getColumnDescr(conn,"tran_name" , "transporter", "tran_code", tranCode);
valueXmlString.append("<tran_name><![CDATA["+ tranName +"]]></tran_name>"); valueXmlString.append("<tran_name><![CDATA["+ tranName +"]]></tran_name>");
valueXmlString.append("<remarks><![CDATA["+ remarksDes +"]]></remarks>");
valueXmlString.append("<no_art><![CDATA["+ noArtDes+"]]></no_art>");
valueXmlString.append("<gross_weight>").append("<![CDATA[" + grossWeight + "]]>").append("</gross_weight>");
valueXmlString.append("<nett_weight>").append("<![CDATA[" + netWeight + "]]>").append("</nett_weight>");
valueXmlString.append("<tare_weight>").append("<![CDATA[" + tareWeight + "]]>").append("</tare_weight>");
valueXmlString.append("<add_user>").append("<![CDATA[" + chgUser + "]]>").append("</add_user>");
valueXmlString.append("<add_term>").append("<![CDATA[" + chgTerm + "]]>").append("</add_term>");
valueXmlString.append("<add_date>").append("<![CDATA[" + currAppdate + "]]>").append("</add_date>");
//---------- Added by Sandesh 2-Oct-2014 ---------
if(effDate!=null){
valueXmlString.append("<eff_date>").append("<![CDATA[" + simpleDateFormat.format(effDate).toString()+ "]]>").append("</eff_date>");
}
valueXmlString.append("<confirmed>").append("<![CDATA[" + confirm + "]]>").append("</confirmed>");
if(chgDate!=null){
valueXmlString.append("<chg_date><![CDATA["+ simpleDateFormat.format(chgDate).toString() +"]]></chg_date>");
}
valueXmlString.append("<licence_no_1><![CDATA["+ licnNo1 +"]]></licence_no_1>");
valueXmlString.append("<licence_no_2><![CDATA["+ licnNo2 +"]]></licence_no_2>");
valueXmlString.append("<licence_no_3><![CDATA["+ licnNo3 +"]]></licence_no_3>");
if(licnDate1!=null){
valueXmlString.append("<licence_date_1><![CDATA["+ simpleDateFormat.format(licnDate1).toString()+"]]></licence_date_1>");
}
if(licnDate2!=null){
valueXmlString.append("<licence_date_2><![CDATA["+ simpleDateFormat.format(licnDate2).toString()+"]]></licence_date_2>");
}
if(licnDate3!=null){
valueXmlString.append("<licence_date_3><![CDATA["+ simpleDateFormat.format(licnDate3).toString()+"]]></licence_date_3>");
}
valueXmlString.append("<available_yn><![CDATA["+ availYN +"]]></available_yn>");
valueXmlString.append("<insurance><![CDATA["+ insuranceAmt +"]]></insurance>"); valueXmlString.append("<remarks><![CDATA["+ remarksDes +"]]></remarks>");
valueXmlString.append("<no_art><![CDATA["+ noArtDes+"]]></no_art>");
valueXmlString.append("<freight><![CDATA["+ frghtAmt +"]]></freight>"); valueXmlString.append("<gross_weight>").append("<![CDATA[" + grossWeight + "]]>").append("</gross_weight>");
//------------------------------------------------- valueXmlString.append("<nett_weight>").append("<![CDATA[" + netWeight + "]]>").append("</nett_weight>");
valueXmlString.append("<tare_weight>").append("<![CDATA[" + tareWeight + "]]>").append("</tare_weight>");
valueXmlString.append("</Detail2>");
}
}
}else{ valueXmlString.append("<add_user>").append("<![CDATA[" + chgUser + "]]>").append("</add_user>");
valueXmlString.append(insertNewRecord(sorderNo,currentFormNo,conn)); valueXmlString.append("<add_term>").append("<![CDATA[" + chgTerm + "]]>").append("</add_term>");
valueXmlString.append("<add_date>").append("<![CDATA[" + currAppdate + "]]>").append("</add_date>");
} //---------- Added by Sandesh 2-Oct-2014 ---------
}//end itemDefault condition if(effDate!=null)
{
} //end cnt > 0 condition valueXmlString.append("<eff_date>").append("<![CDATA[" + simpleDateFormat.format(effDate).toString()+ "]]>").append("</eff_date>");
else { }
System.out.println("--------no data found in Despatch-------------");
valueXmlString.append(insertNewRecord(sorderNo,currentFormNo,conn)); valueXmlString.append("<confirmed>").append("<![CDATA[" + confirm + "]]>").append("</confirmed>");
if(chgDate!=null)
{
valueXmlString.append("<chg_date><![CDATA["+ simpleDateFormat.format(chgDate).toString() +"]]></chg_date>");
}
valueXmlString.append("<licence_no_1><![CDATA["+ licnNo1 +"]]></licence_no_1>");
valueXmlString.append("<licence_no_2><![CDATA["+ licnNo2 +"]]></licence_no_2>");
valueXmlString.append("<licence_no_3><![CDATA["+ licnNo3 +"]]></licence_no_3>");
if(licnDate1!=null)
{
valueXmlString.append("<licence_date_1><![CDATA["+ simpleDateFormat.format(licnDate1).toString()+"]]></licence_date_1>");
}
if(licnDate2!=null)
{
valueXmlString.append("<licence_date_2><![CDATA["+ simpleDateFormat.format(licnDate2).toString()+"]]></licence_date_2>");
}
if(licnDate3!=null)
{
valueXmlString.append("<licence_date_3><![CDATA["+ simpleDateFormat.format(licnDate3).toString()+"]]></licence_date_3>");
}
valueXmlString.append("<available_yn><![CDATA["+ availYN +"]]></available_yn>");
valueXmlString.append("<insurance><![CDATA["+ insuranceAmt +"]]></insurance>");
valueXmlString.append("<freight><![CDATA["+ frghtAmt +"]]></freight>");
//-------------------------------------------------
valueXmlString.append("</Detail2>");
}
else
{
valueXmlString.append(insertNewRecord(sorderNo,currentFormNo,conn));
}
} }
if(currentColumn.trim().equalsIgnoreCase("tran_code_123"))//comment else if(currentColumn.trim().equalsIgnoreCase("tran_code_123"))//comment
{ {
System.out.println(">>>>START tran_code38>>>>"); System.out.println(">>>>START tran_code38>>>>");
tranCode = genericUtility.getColumnValue("tran_code",dom); tranCode = genericUtility.getColumnValue("tran_code",dom);
......
...@@ -925,31 +925,14 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss ...@@ -925,31 +925,14 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
//System.out.println("itm_default >>>>> 2>>"); //System.out.println("itm_default >>>>> 2>>");
distOrder = genericUtility.getColumnValue("dist_order1", dom1); distOrder = genericUtility.getColumnValue("dist_order1", dom1);
sql = "select add_user,dist_order from distord_iss where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED END = 'N' and dist_order = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,distOrder);
rs = pstmt.executeQuery();
while(rs.next())
{
addUser = rs.getString("add_user")==null?"":rs.getString("add_user").trim();
addUsers.add(addUser);
gdistOrder = rs.getString("dist_order")==null?"":rs.getString("dist_order").trim();
gdistOrders.add(gdistOrder);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
//chgUser = genericUtility.getColumnValue("chg_user",dom2);
System.out.println("addUser><><jfjf"+addUser+"chgUserDDhfhf"+chgUser+"<D<V<V<Vfff"+distOrder); System.out.println("addUser><><jfjf"+addUser+"chgUserDDhfhf"+chgUser+"<D<V<V<Vfff"+distOrder);
sql = "select count(1) from distord_iss where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED END = 'N' and dist_order = ? and tran_ser = 'D-ISS'"; sql = "select count(1) from distord_iss "
+ " where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED END = 'N' "
+ " and dist_order = ? and tran_ser = 'D-ISS' and add_user = ? ";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,distOrder); pstmt.setString(1,distOrder);
pstmt.setString(2,chgUser);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
...@@ -961,185 +944,164 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss ...@@ -961,185 +944,164 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
rs = null; rs = null;
chgUser = chgUser.trim(); chgUser = chgUser.trim();
if(cnt > 0) if(cnt > 0 && currentColumn.trim().equalsIgnoreCase("itm_default") )
{ {
if(currentColumn.trim().equalsIgnoreCase("itm_default")) System.out.println("in itm default for checked itm_default");
{ sql = "SELECT SITE_A.DESCR,SITE_B.DESCR,LOCATION.DESCR,DISTORD_ISS.TRAN_ID,DISTORD_ISS.TRAN_DATE,DISTORD_ISS.EFF_DATE,DISTORD_ISS.DIST_ORDER,DISTORD_ISS.SITE_CODE,DISTORD_ISS.SITE_CODE__DLV,"
System.out.println("in itm default for check itm_default>>>>>>"+addUser+">>>>>>"+chgUser); +"DISTORD_ISS.DIST_ROUTE,DISTORD_ISS.TRAN_CODE,DISTORD_ISS.LR_NO,DISTORD_ISS.LR_DATE,DISTORD_ISS.LORRY_NO,DISTORD_ISS.GROSS_WEIGHT,"
if(addUsers.contains(chgUser)) +"DISTORD_ISS.TARE_WEIGHT,DISTORD_ISS.NET_WEIGHT,DISTORD_ISS.FRT_AMT,DISTORD_ISS.AMOUNT,DISTORD_ISS.TAX_AMT,DISTORD_ISS.NET_AMT,DISTORD_ISS.REMARKS,"
{ +"DISTORD_ISS.FRT_TYPE,DISTORD_ISS.CHG_USER,DISTORD_ISS.CHG_TERM,DISTORD_ISS.CURR_CODE,DISTORD_ISS.CHG_DATE,"
+"TRANSPORTER.TRAN_NAME,CURRENCY_A.DESCR,DISTORD_ISS.CONFIRMED,DISTORD_ISS.LOC_CODE__GIT,DISTORD_ISS.CONF_DATE,DISTORD_ISS.NO_ART,DISTORD_ISS.TRANS_MODE,"
for(int i = 0;i < addUsers.size(); i++) +"DISTORD_ISS.GP_NO,DISTORD_ISS.GP_DATE,DISTORD_ISS.CONF_PASSWD,DISTORD_ISS.ORDER_TYPE,DISTORD_ISS.GP_SER,DISTORD_ISS.REF_NO,DISTORD_ISS.REF_DATE,DISTORD_ISS.AVAILABLE_YN,"
{ +"SITE_B.ADD1,SITE_B.ADD2,SITE_B.CITY,SITE_B.PIN,SITE_B.STATE_CODE,DISTORD_ISS.EXCH_RATE,DISTORD_ISS.TRAN_TYPE,DISTORD_ISS.EMP_CODE__APRV,DISTORD_ISS.DISCOUNT,DISTORD_ISS.PERMIT_NO,"
+"DISTORD_ISS.SHIPMENT_ID,DISTORD_ISS.CURR_CODE__FRT,DISTORD_ISS.EXCH_RATE__FRT,CURRENCY_B.DESCR,DISTORD_ISS.RD_PERMIT_NO,DISTORD_ISS.DC_NO,DISTORD_ISS.TRAN_SER,DISTORD_ISS.PART_QTY,SPACE(100) "
addUser = addUsers.get(i); +"AS SUNDRY_DETAILS,SPACE(100) AS "
System.out.println("addUser>>>>>>>>>>>LL"+addUser); +"SUNDRY_NAME,DISTORD_ISS.PROJ_CODE,SITE_B.TELE1,SITE_B.TELE2,SITE_B.TELE3,DISTORD_ISS.SITE_CODE__BIL,SITE_C.DESCR,SITE_C.ADD1,SITE_C.ADD2,SITE_C.CITY,SITE_C.PIN,SITE_C.STATE_CODE,"
+"DISTORD_ISS.PALLET_WT,DISTORDER.AUTO_RECEIPT,DISTORD_ISS.CR_TERM,DISTORD_ISS.DLV_TERM,DISTORD_ISS.OUTSIDE_INSPECTION,DISTORD_ISS.LABEL_TYPE,DISTORD_ISS.ADD_USER,DISTORD_ISS.ADD_TERM "
if(chgUser.equalsIgnoreCase(addUser)) +"FROM DISTORD_ISS DISTORD_ISS,SITE SITE_A,SITE SITE_B,LOCATION "
{ +"LOCATION,TRANSPORTER TRANSPORTER,CURRENCY CURRENCY_A,CURRENCY"
+" CURRENCY_B,SITE SITE_C,DISTORDER DISTORDER WHERE ( "
+"DISTORD_ISS.SITE_CODE = SITE_A.SITE_CODE ) AND ( "
+"DISTORD_ISS.SITE_CODE__DLV = SITE_B.SITE_CODE ) AND ( "
+"DISTORD_ISS.LOC_CODE__GIT = LOCATION.LOC_CODE ) AND ( "
+"DISTORD_ISS.CURR_CODE = CURRENCY_A.CURR_CODE ) AND ( "
+"DISTORD_ISS.DIST_ORDER = DISTORDER.DIST_ORDER ) AND ( "
+"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+"' AND DISTORD_ISS.ADD_USER = '"+chgUser+"'"
+ "and CASE WHEN DISTORD_ISS.confirmed IS NULL THEN 'N' ELSE DISTORD_ISS.CONFIRMED END = 'N' ";
System.out.println("in itm default for checked itm_default");
sql = "SELECT SITE_A.DESCR,SITE_B.DESCR,LOCATION.DESCR,DISTORD_ISS.TRAN_ID,DISTORD_ISS.TRAN_DATE,DISTORD_ISS.EFF_DATE,DISTORD_ISS.DIST_ORDER,DISTORD_ISS.SITE_CODE,DISTORD_ISS.SITE_CODE__DLV,"
+"DISTORD_ISS.DIST_ROUTE,DISTORD_ISS.TRAN_CODE,DISTORD_ISS.LR_NO,DISTORD_ISS.LR_DATE,DISTORD_ISS.LORRY_NO,DISTORD_ISS.GROSS_WEIGHT,"
+"DISTORD_ISS.TARE_WEIGHT,DISTORD_ISS.NET_WEIGHT,DISTORD_ISS.FRT_AMT,DISTORD_ISS.AMOUNT,DISTORD_ISS.TAX_AMT,DISTORD_ISS.NET_AMT,DISTORD_ISS.REMARKS,"
+"DISTORD_ISS.FRT_TYPE,DISTORD_ISS.CHG_USER,DISTORD_ISS.CHG_TERM,DISTORD_ISS.CURR_CODE,DISTORD_ISS.CHG_DATE,"
+"TRANSPORTER.TRAN_NAME,CURRENCY_A.DESCR,DISTORD_ISS.CONFIRMED,DISTORD_ISS.LOC_CODE__GIT,DISTORD_ISS.CONF_DATE,DISTORD_ISS.NO_ART,DISTORD_ISS.TRANS_MODE,"
+"DISTORD_ISS.GP_NO,DISTORD_ISS.GP_DATE,DISTORD_ISS.CONF_PASSWD,DISTORD_ISS.ORDER_TYPE,DISTORD_ISS.GP_SER,DISTORD_ISS.REF_NO,DISTORD_ISS.REF_DATE,DISTORD_ISS.AVAILABLE_YN,"
+"SITE_B.ADD1,SITE_B.ADD2,SITE_B.CITY,SITE_B.PIN,SITE_B.STATE_CODE,DISTORD_ISS.EXCH_RATE,DISTORD_ISS.TRAN_TYPE,DISTORD_ISS.EMP_CODE__APRV,DISTORD_ISS.DISCOUNT,DISTORD_ISS.PERMIT_NO,"
+"DISTORD_ISS.SHIPMENT_ID,DISTORD_ISS.CURR_CODE__FRT,DISTORD_ISS.EXCH_RATE__FRT,CURRENCY_B.DESCR,DISTORD_ISS.RD_PERMIT_NO,DISTORD_ISS.DC_NO,DISTORD_ISS.TRAN_SER,DISTORD_ISS.PART_QTY,SPACE(100) "
+"AS SUNDRY_DETAILS,SPACE(100) AS "
+"SUNDRY_NAME,DISTORD_ISS.PROJ_CODE,SITE_B.TELE1,SITE_B.TELE2,SITE_B.TELE3,DISTORD_ISS.SITE_CODE__BIL,SITE_C.DESCR,SITE_C.ADD1,SITE_C.ADD2,SITE_C.CITY,SITE_C.PIN,SITE_C.STATE_CODE,"
+"DISTORD_ISS.PALLET_WT,DISTORDER.AUTO_RECEIPT,DISTORD_ISS.CR_TERM,DISTORD_ISS.DLV_TERM,DISTORD_ISS.OUTSIDE_INSPECTION,DISTORD_ISS.LABEL_TYPE,DISTORD_ISS.ADD_USER,DISTORD_ISS.ADD_TERM "
+"FROM DISTORD_ISS DISTORD_ISS,SITE SITE_A,SITE SITE_B,LOCATION "
+"LOCATION,TRANSPORTER TRANSPORTER,CURRENCY CURRENCY_A,CURRENCY"
+" CURRENCY_B,SITE SITE_C,DISTORDER DISTORDER WHERE ( "
+"DISTORD_ISS.SITE_CODE = SITE_A.SITE_CODE ) AND ( "
+"DISTORD_ISS.SITE_CODE__DLV = SITE_B.SITE_CODE ) AND ( "
+"DISTORD_ISS.LOC_CODE__GIT = LOCATION.LOC_CODE ) AND ( "
+"DISTORD_ISS.CURR_CODE = CURRENCY_A.CURR_CODE ) AND ( "
+"DISTORD_ISS.DIST_ORDER = DISTORDER.DIST_ORDER ) AND ( "
+"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+"' AND DISTORD_ISS.ADD_USER = '"+addUser+"'";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if(rs.next())
{
valueXmlString.append("<Detail2 domID='1' objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n"); pstmt = conn.prepareStatement(sql);
valueXmlString.append("<tran_id>").append("<![CDATA[" + (rs.getString("tran_id")==null?"":rs.getString("tran_id").trim()) + "]]>").append("</tran_id>"); rs = pstmt.executeQuery();
if(rs.next())
{
simpleDateFormat=new SimpleDateFormat(genutility.getApplDateFormat());
currDate = rs.getTimestamp("tran_date"); valueXmlString.append("<Detail2 domID='1' objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
if(currDate != null) valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n");
{ valueXmlString.append("<tran_id>").append("<![CDATA[" + (rs.getString("tran_id")==null?"":rs.getString("tran_id").trim()) + "]]>").append("</tran_id>");
currAppdate = simpleDateFormat.format(currDate);
}
valueXmlString.append("<tran_date>").append("<![CDATA[").append((rs.getDate("tran_date") == null) ? "":sdf.format(rs.getDate("tran_date"))).append("]]>").append("</tran_date>"); simpleDateFormat=new SimpleDateFormat(genutility.getApplDateFormat());
valueXmlString.append("<eff_date>").append("<![CDATA[").append((rs.getDate("eff_date") == null) ? "":sdf.format(rs.getDate("eff_date"))).append("]]>").append("</eff_date>"); currDate = rs.getTimestamp("tran_date");
/*valueXmlString.append("<tran_date><![CDATA["+currAppdate+"]]></tran_date>"); if(currDate != null)
valueXmlString.append("<eff_date><![CDATA["+currAppdate+"]]></eff_date>");*/
valueXmlString.append("<dist_order><![CDATA["+(rs.getString("dist_order")==null?"":rs.getString("dist_order").trim())+"]]></dist_order>");
valueXmlString.append("<site_code><![CDATA["+(rs.getString("site_code")==null?"":rs.getString("site_code").trim())+"]]></site_code>");
valueXmlString.append("<site_code__dlv><![CDATA["+(rs.getString("SITE_CODE__DLV")==null?"":rs.getString("SITE_CODE__DLV").trim())+"]]></site_code__dlv>");
valueXmlString.append("<dist_route><![CDATA["+(rs.getString("DIST_ROUTE")==null?"":rs.getString("DIST_ROUTE"))+"]]></dist_route>");
valueXmlString.append("<tran_code>").append("<![CDATA[" + (rs.getString("tran_code")==null?"":rs.getString("tran_code").trim()) + "]]>").append("</tran_code>");
valueXmlString.append("<lr_no><![CDATA[]]></lr_no>");
valueXmlString.append("<lr_date><![CDATA[]]></lr_date>");
valueXmlString.append("<lorry_no><![CDATA[]]></lorry_no>");
valueXmlString.append("<gross_weight><![CDATA["+(rs.getDouble("gross_weight"))+"]]></gross_weight>");
valueXmlString.append("<tare_weight><![CDATA["+(rs.getDouble("tare_weight"))+"]]></tare_weight>");
valueXmlString.append("<net_weight><![CDATA["+(rs.getDouble("net_weight"))+"]]></net_weight>");
valueXmlString.append("<frt_amt><![CDATA[0]]></frt_amt>");
valueXmlString.append("<amount><![CDATA[0]]></amount>");
/*valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA[0]]></net_amt>");*/
valueXmlString.append("<tax_amt><![CDATA["+rs.getDouble("tax_amt")+"]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA["+rs.getDouble("net_amt")+"]]></net_amt>");
valueXmlString.append("<remarks>").append("<![CDATA[" + (rs.getString("remarks")==null?"":rs.getString("remarks").trim()) + "]]>").append("</remarks>");
valueXmlString.append("<frt_type><![CDATA[T]]></frt_type>");
valueXmlString.append("<chg_user><![CDATA["+(rs.getString("CHG_USER")==null?"":rs.getString("CHG_USER").trim())+"]]></chg_user>");
valueXmlString.append("<chg_term><![CDATA["+(rs.getString("CHG_TERM")==null?"":rs.getString("CHG_TERM").trim())+"]]></chg_term>");
valueXmlString.append("<curr_code><![CDATA["+(rs.getString("curr_code")==null?"":rs.getString("curr_code").trim())+"]]></curr_code>");
valueXmlString.append("<chg_date><![CDATA["+currAppdate+"]]></chg_date>");
valueXmlString.append("<site_descr><![CDATA["+(rs.getString(1)==null?"":rs.getString(1).trim())+"]]></site_descr>");
valueXmlString.append("<site_to_descr><![CDATA["+(rs.getString(2)==null?"":rs.getString(2).trim())+"]]></site_to_descr>");
valueXmlString.append("<location_descr><![CDATA["+(rs.getString(3)==null?"":rs.getString(3).trim())+"]]></location_descr>");
valueXmlString.append("<tran_name>").append("<![CDATA[" + (rs.getString("tran_name")==null?"":rs.getString("tran_name").trim()) + "]]>").append("</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__git")==null?"":rs.getString("loc_code__git"))+"]]></loc_code__git>");
valueXmlString.append("<conf_date>").append("<![CDATA[").append((rs.getDate("conf_date") == null) ? "":sdf.format(rs.getDate("conf_date"))).append("]]>").append("</conf_date>");
valueXmlString.append("<no_art><![CDATA["+(rs.getDouble("no_art"))+"]]></no_art>");
valueXmlString.append("<trans_mode>").append("<![CDATA[" + (rs.getString("trans_mode")==null?"":rs.getString("trans_mode").trim()) + "]]>").append("</trans_mode>");
valueXmlString.append("<gp_no><![CDATA[]]></gp_no>");
valueXmlString.append("<gp_date>").append("<![CDATA[").append((rs.getDate("gp_date") == null) ? "":sdf.format(rs.getDate("gp_date"))).append("]]>").append("</gp_date>");
valueXmlString.append("<conf_passwd/>");
valueXmlString.append("<order_type><![CDATA["+(rs.getString("ORDER_TYPE")==null?"":rs.getString("ORDER_TYPE").trim())+"]]></order_type>");
valueXmlString.append("<gp_ser><![CDATA[I]]></gp_ser>");
valueXmlString.append("<ref_no><![CDATA[]]></ref_no>");
valueXmlString.append("<ref_date><![CDATA[]]></ref_date>");
valueXmlString.append("<available_yn><![CDATA["+(rs.getString("available_yn")==null?"N":rs.getString("available_yn").trim())+"]]></available_yn>");
valueXmlString.append("<site_add1><![CDATA["+(rs.getString("ADD1")==null?"":rs.getString("ADD1").trim())+"]]></site_add1>");
valueXmlString.append("<site_add2><![CDATA["+(rs.getString("ADD2")==null?"":rs.getString("ADD2").trim())+"]]></site_add2>");
valueXmlString.append("<site_city><![CDATA["+(rs.getString("CITY")==null?"":rs.getString("CITY").trim())+"]]></site_city>");
valueXmlString.append("<site_pin><![CDATA["+(rs.getString("PIN")==null?"":rs.getString("PIN").trim())+"]]></site_pin>");
valueXmlString.append("<site_state_code><![CDATA["+(rs.getString("STATE_CODE")==null?"":rs.getString("STATE_CODE").trim())+"]]></site_state_code>");
valueXmlString.append("<exch_rate><![CDATA["+(rs.getDouble("EXCH_RATE"))+" ]]></exch_rate>");
valueXmlString.append("<tran_type><![CDATA["+(rs.getString("TRAN_TYPE")==null?"":rs.getString("TRAN_TYPE").trim())+"]]></tran_type>");
valueXmlString.append("<emp_code__aprv><![CDATA[]]></emp_code__aprv>");
valueXmlString.append("<discount><![CDATA[0]]></discount>");
valueXmlString.append("<permit_no><![CDATA[]]></permit_no>");
valueXmlString.append("<shipment_id><![CDATA[]]></shipment_id>");
valueXmlString.append("<curr_code__frt><![CDATA["+(rs.getString("curr_code__frt")==null?"":rs.getString("curr_code__frt").trim())+"]]></curr_code__frt>");
valueXmlString.append("<exch_rate__frt><![CDATA["+rs.getDouble("exch_rate__frt")+"]]></exch_rate__frt>");
valueXmlString.append("<currency_descr__frt><![CDATA[]]></currency_descr__frt>");
valueXmlString.append("<rd_permit_no><![CDATA[]]></rd_permit_no>");
valueXmlString.append("<dc_no><![CDATA[]]></dc_no>");
valueXmlString.append("<tran_ser><![CDATA[D-ISS ]]></tran_ser>");
valueXmlString.append("<part_qty><![CDATA[A]]></part_qty>");
valueXmlString.append("<sundry_details><![CDATA[]]></sundry_details>");
valueXmlString.append("<sundry_name><![CDATA["+(rs.getString("SUNDRY_NAME")==null?"":rs.getString("SUNDRY_NAME"))+"]]></sundry_name>");
valueXmlString.append("<proj_code><![CDATA["+(rs.getString("PROJ_CODE")==null?"":rs.getString("PROJ_CODE").trim())+"]]></proj_code>");
valueXmlString.append("<site_tele1><![CDATA[]]></site_tele1>");
valueXmlString.append("<site_tele2><![CDATA[]]></site_tele2>");
valueXmlString.append("<site_tele3><![CDATA[]]></site_tele3>");
valueXmlString.append("<site_code__bil><![CDATA[]]></site_code__bil>");
valueXmlString.append("<site_descr_bill><![CDATA[]]></site_descr_bill>");
valueXmlString.append("<site_add1_bill><![CDATA[]]></site_add1_bill>");
valueXmlString.append("<site_add2_bill><![CDATA[]]></site_add2_bill>");
valueXmlString.append("<site_city_bill><![CDATA[]]></site_city_bill>");
valueXmlString.append("<site_pin_bill><![CDATA[]]></site_pin_bill>");
valueXmlString.append("<site_state_code_bill><![CDATA[]]></site_state_code_bill>");
valueXmlString.append("<pallet_wt><![CDATA[]]></pallet_wt>");
valueXmlString.append("<auto_receipt><![CDATA[N]]></auto_receipt>");
System.out.println("chgUser>>"+rs.getString("add_user")==null?"":rs.getString("add_user")+">>>chgTerm"+rs.getString("add_term")==null?"":rs.getString("add_term")+"currAppdate>>>"+currAppdate);
valueXmlString.append("<add_user><![CDATA["+(rs.getString("add_user")==null?"":rs.getString("add_user").trim())+"]]></add_user>");
valueXmlString.append("<add_term><![CDATA["+(rs.getString("add_term")==null?"":rs.getString("add_term").trim())+"]]></add_term>");
valueXmlString.append("<add_date>").append("<![CDATA[" + currAppdate + "]]>").append("</add_date>");
valueXmlString.append("</Detail2>");
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
}
}
}
else
{ {
currAppdate = simpleDateFormat.format(currDate);
}
valueXmlString.append("<tran_date>").append("<![CDATA[").append((rs.getDate("tran_date") == null) ? "":sdf.format(rs.getDate("tran_date"))).append("]]>").append("</tran_date>");
valueXmlString.append("<eff_date>").append("<![CDATA[").append((rs.getDate("eff_date") == null) ? "":sdf.format(rs.getDate("eff_date"))).append("]]>").append("</eff_date>");
/*valueXmlString.append("<tran_date><![CDATA["+currAppdate+"]]></tran_date>");
valueXmlString.append("<eff_date><![CDATA["+currAppdate+"]]></eff_date>");*/
valueXmlString.append("<dist_order><![CDATA["+(rs.getString("dist_order")==null?"":rs.getString("dist_order").trim())+"]]></dist_order>");
valueXmlString.append("<site_code><![CDATA["+(rs.getString("site_code")==null?"":rs.getString("site_code").trim())+"]]></site_code>");
valueXmlString.append("<site_code__dlv><![CDATA["+(rs.getString("SITE_CODE__DLV")==null?"":rs.getString("SITE_CODE__DLV").trim())+"]]></site_code__dlv>");
valueXmlString.append("<dist_route><![CDATA["+(rs.getString("DIST_ROUTE")==null?"":rs.getString("DIST_ROUTE"))+"]]></dist_route>");
valueXmlString.append("<tran_code>").append("<![CDATA[" + (rs.getString("tran_code")==null?"":rs.getString("tran_code").trim()) + "]]>").append("</tran_code>");
valueXmlString.append("<lr_no><![CDATA[]]></lr_no>");
valueXmlString.append("<lr_date><![CDATA[]]></lr_date>");
valueXmlString.append("<lorry_no><![CDATA[]]></lorry_no>");
valueXmlString.append("<gross_weight><![CDATA["+(rs.getDouble("gross_weight"))+"]]></gross_weight>");
valueXmlString.append("<tare_weight><![CDATA["+(rs.getDouble("tare_weight"))+"]]></tare_weight>");
valueXmlString.append("<net_weight><![CDATA["+(rs.getDouble("net_weight"))+"]]></net_weight>");
valueXmlString.append("<frt_amt><![CDATA[0]]></frt_amt>");
valueXmlString.append("<amount><![CDATA[0]]></amount>");
/*valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA[0]]></net_amt>");*/
valueXmlString.append("<tax_amt><![CDATA["+rs.getDouble("tax_amt")+"]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA["+rs.getDouble("net_amt")+"]]></net_amt>");
valueXmlString.append("<remarks>").append("<![CDATA[" + (rs.getString("remarks")==null?"":rs.getString("remarks").trim()) + "]]>").append("</remarks>");
valueXmlString.append("<frt_type><![CDATA[T]]></frt_type>");
valueXmlString.append("<chg_user><![CDATA["+(rs.getString("CHG_USER")==null?"":rs.getString("CHG_USER").trim())+"]]></chg_user>");
valueXmlString.append("<chg_term><![CDATA["+(rs.getString("CHG_TERM")==null?"":rs.getString("CHG_TERM").trim())+"]]></chg_term>");
valueXmlString.append("<curr_code><![CDATA["+(rs.getString("curr_code")==null?"":rs.getString("curr_code").trim())+"]]></curr_code>");
valueXmlString.append("<chg_date><![CDATA["+currAppdate+"]]></chg_date>");
valueXmlString.append("<site_descr><![CDATA["+(rs.getString(1)==null?"":rs.getString(1).trim())+"]]></site_descr>");
valueXmlString.append("<site_to_descr><![CDATA["+(rs.getString(2)==null?"":rs.getString(2).trim())+"]]></site_to_descr>");
valueXmlString.append("<location_descr><![CDATA["+(rs.getString(3)==null?"":rs.getString(3).trim())+"]]></location_descr>");
valueXmlString.append("<tran_name>").append("<![CDATA[" + (rs.getString("tran_name")==null?"":rs.getString("tran_name").trim()) + "]]>").append("</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__git")==null?"":rs.getString("loc_code__git"))+"]]></loc_code__git>");
valueXmlString.append("<conf_date>").append("<![CDATA[").append((rs.getDate("conf_date") == null) ? "":sdf.format(rs.getDate("conf_date"))).append("]]>").append("</conf_date>");
valueXmlString.append("<no_art><![CDATA["+(rs.getDouble("no_art"))+"]]></no_art>");
valueXmlString.append("<trans_mode>").append("<![CDATA[" + (rs.getString("trans_mode")==null?"":rs.getString("trans_mode").trim()) + "]]>").append("</trans_mode>");
valueXmlString.append("<gp_no><![CDATA[]]></gp_no>");
valueXmlString.append("<gp_date>").append("<![CDATA[").append((rs.getDate("gp_date") == null) ? "":sdf.format(rs.getDate("gp_date"))).append("]]>").append("</gp_date>");
valueXmlString.append("<conf_passwd/>");
valueXmlString.append("<order_type><![CDATA["+(rs.getString("ORDER_TYPE")==null?"":rs.getString("ORDER_TYPE").trim())+"]]></order_type>");
valueXmlString.append("<gp_ser><![CDATA[I]]></gp_ser>");
valueXmlString.append("<ref_no><![CDATA[]]></ref_no>");
valueXmlString.append("<ref_date><![CDATA[]]></ref_date>");
valueXmlString.append("<available_yn><![CDATA["+(rs.getString("available_yn")==null?"N":rs.getString("available_yn").trim())+"]]></available_yn>");
valueXmlString.append("<site_add1><![CDATA["+(rs.getString("ADD1")==null?"":rs.getString("ADD1").trim())+"]]></site_add1>");
valueXmlString.append("<site_add2><![CDATA["+(rs.getString("ADD2")==null?"":rs.getString("ADD2").trim())+"]]></site_add2>");
valueXmlString.append("<site_city><![CDATA["+(rs.getString("CITY")==null?"":rs.getString("CITY").trim())+"]]></site_city>");
valueXmlString.append("<site_pin><![CDATA["+(rs.getString("PIN")==null?"":rs.getString("PIN").trim())+"]]></site_pin>");
valueXmlString.append("<site_state_code><![CDATA["+(rs.getString("STATE_CODE")==null?"":rs.getString("STATE_CODE").trim())+"]]></site_state_code>");
valueXmlString.append("<exch_rate><![CDATA["+(rs.getDouble("EXCH_RATE"))+" ]]></exch_rate>");
valueXmlString.append("<tran_type><![CDATA["+(rs.getString("TRAN_TYPE")==null?"":rs.getString("TRAN_TYPE").trim())+"]]></tran_type>");
valueXmlString.append("<emp_code__aprv><![CDATA[]]></emp_code__aprv>");
valueXmlString.append("<discount><![CDATA[0]]></discount>");
valueXmlString.append("<permit_no><![CDATA[]]></permit_no>");
valueXmlString.append("<shipment_id><![CDATA[]]></shipment_id>");
valueXmlString.append("<curr_code__frt><![CDATA["+(rs.getString("curr_code__frt")==null?"":rs.getString("curr_code__frt").trim())+"]]></curr_code__frt>");
valueXmlString.append("<exch_rate__frt><![CDATA["+rs.getDouble("exch_rate__frt")+"]]></exch_rate__frt>");
valueXmlString.append("<currency_descr__frt><![CDATA[]]></currency_descr__frt>");
valueXmlString.append("<rd_permit_no><![CDATA[]]></rd_permit_no>");
valueXmlString.append("<dc_no><![CDATA[]]></dc_no>");
valueXmlString.append("<tran_ser><![CDATA[D-ISS ]]></tran_ser>");
valueXmlString.append("<part_qty><![CDATA[A]]></part_qty>");
valueXmlString.append("<sundry_details><![CDATA[]]></sundry_details>");
valueXmlString.append("<sundry_name><![CDATA["+(rs.getString("SUNDRY_NAME")==null?"":rs.getString("SUNDRY_NAME"))+"]]></sundry_name>");
valueXmlString.append("<proj_code><![CDATA["+(rs.getString("PROJ_CODE")==null?"":rs.getString("PROJ_CODE").trim())+"]]></proj_code>");
valueXmlString.append("<site_tele1><![CDATA[]]></site_tele1>");
valueXmlString.append("<site_tele2><![CDATA[]]></site_tele2>");
valueXmlString.append("<site_tele3><![CDATA[]]></site_tele3>");
valueXmlString.append("<site_code__bil><![CDATA[]]></site_code__bil>");
valueXmlString.append("<site_descr_bill><![CDATA[]]></site_descr_bill>");
valueXmlString.append("<site_add1_bill><![CDATA[]]></site_add1_bill>");
valueXmlString.append("<site_add2_bill><![CDATA[]]></site_add2_bill>");
valueXmlString.append("<site_city_bill><![CDATA[]]></site_city_bill>");
valueXmlString.append("<site_pin_bill><![CDATA[]]></site_pin_bill>");
valueXmlString.append("<site_state_code_bill><![CDATA[]]></site_state_code_bill>");
valueXmlString.append("<pallet_wt><![CDATA[]]></pallet_wt>");
valueXmlString.append("<auto_receipt><![CDATA[N]]></auto_receipt>");
System.out.println("chgUser>>"+rs.getString("add_user")==null?"":rs.getString("add_user")+">>>chgTerm"+rs.getString("add_term")==null?"":rs.getString("add_term")+"currAppdate>>>"+currAppdate);
valueXmlString.append("<add_user><![CDATA["+(rs.getString("add_user")==null?"":rs.getString("add_user").trim())+"]]></add_user>");
valueXmlString.append("<add_term><![CDATA["+(rs.getString("add_term")==null?"":rs.getString("add_term").trim())+"]]></add_term>");
valueXmlString.append("<add_date>").append("<![CDATA[" + currAppdate + "]]>").append("</add_date>");
valueXmlString.append("</Detail2>");
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
}
/*else
{
sql="SELECT D.DIST_ORDER AS DIST_ORDER,D.ORDER_DATE AS ORDER_DATE,D.SITE_CODE__SHIP AS SITE_CODE__SHIP,D.SITE_CODE__DLV AS SITE_CODE__DLV,D.SHIP_DATE AS SHIP_DATE,D.DUE_DATE AS DUE_DATE,D.REMARKS AS REMARKS," sql="SELECT D.DIST_ORDER AS DIST_ORDER,D.ORDER_DATE AS ORDER_DATE,D.SITE_CODE__SHIP AS SITE_CODE__SHIP,D.SITE_CODE__DLV AS SITE_CODE__DLV,D.SHIP_DATE AS SHIP_DATE,D.DUE_DATE AS DUE_DATE,D.REMARKS AS REMARKS,"
+" D.DIST_ROUTE AS DIST_ROUTE,D.PRICE_LIST AS PRICE_LIST,D.CONFIRMED AS CONFIRMED,D.CHG_USER AS CHG_USER,D.CHG_TERM AS CHG_TERM,D.TARGET_WGT AS TARGET_WGT,D.TARGET_VOL AS TARGET_VOL,D.LOC_CODE__GIT AS LOC_CODE__GIT," +" D.DIST_ROUTE AS DIST_ROUTE,D.PRICE_LIST AS PRICE_LIST,D.CONFIRMED AS CONFIRMED,D.CHG_USER AS CHG_USER,D.CHG_TERM AS CHG_TERM,D.TARGET_WGT AS TARGET_WGT,D.TARGET_VOL AS TARGET_VOL,D.LOC_CODE__GIT AS LOC_CODE__GIT,"
+" D.CHG_DATE AS CHG_DATE,SITE_A.DESCR AS SITEA_DESCR,SITE_B.DESCR AS SITEB_DESCR,LOCATION.DESCR AS LOCATION_DESCR,D.CONF_DATE AS CONF_DATE,D.SITE_CODE AS SITE_CODE,D.STATUS AS STATUS,D.SALE_ORDER AS SALE_ORDER," +" D.CHG_DATE AS CHG_DATE,SITE_A.DESCR AS SITEA_DESCR,SITE_B.DESCR AS SITEB_DESCR,LOCATION.DESCR AS LOCATION_DESCR,D.CONF_DATE AS CONF_DATE,D.SITE_CODE AS SITE_CODE,D.STATUS AS STATUS,D.SALE_ORDER AS SALE_ORDER,"
+" D.REMARKS1 AS REMARK1,D.REMARKS2 AS REMARK2,TRIM(D.ORDER_TYPE) AS ORDER_TYPE,SITE_A.ADD1 AS SITEA_ADD1,SITE_A.ADD2 AS SITEA_ADD2,SITE_A.CITY AS SITEA_CITY,SITE_A.PIN AS SITEA_PIN,SITE_A.STATE_CODE AS SITEA_STATE_CODE," +" D.REMARKS1 AS REMARK1,D.REMARKS2 AS REMARK2,TRIM(D.ORDER_TYPE) AS ORDER_TYPE,SITE_A.ADD1 AS SITEA_ADD1,SITE_A.ADD2 AS SITEA_ADD2,SITE_A.CITY AS SITEA_CITY,SITE_A.PIN AS SITEA_PIN,SITE_A.STATE_CODE AS SITEA_STATE_CODE,"
+" SITE_B.ADD1 AS SITEB_ADD1,SITE_B.ADD2 AS SITEB_ADD2,SITE_B.CITY AS SITEB_CITY,SITE_B.PIN AS SITEB_PIN,SITE_B.STATE_CODE AS SITEB_STATE_CODE,D.LOC_CODE__CONS AS LOC_CODE__CONS,D.SUNDRY_TYPE AS SUNDRY_TYPE," +" SITE_B.ADD1 AS SITEB_ADD1,SITE_B.ADD2 AS SITEB_ADD2,SITE_B.CITY AS SITEB_CITY,SITE_B.PIN AS SITEB_PIN,SITE_B.STATE_CODE AS SITEB_STATE_CODE,D.LOC_CODE__CONS AS LOC_CODE__CONS,D.SUNDRY_TYPE AS SUNDRY_TYPE,"
+" D.SUNDRY_CODE AS SUNDRY_CODE,D.AUTO_RECEIPT AS AUTO_RECEIPT,D.TRAN_TYPE AS TRAN_TYPE,D.CURR_CODE AS CURR_CODE,D.EXCH_RATE AS EXCH_RATE,D.SALES_PERS AS SALES_PERS,SALES_PERS.SP_NAME AS SP_NAME," +" D.SUNDRY_CODE AS SUNDRY_CODE,D.AUTO_RECEIPT AS AUTO_RECEIPT,D.TRAN_TYPE AS TRAN_TYPE,D.CURR_CODE AS CURR_CODE,D.EXCH_RATE AS EXCH_RATE,D.SALES_PERS AS SALES_PERS,SALES_PERS.SP_NAME AS SP_NAME,"
+" D.LOC_CODE__GITBF AS LOC_CODE__GITBF,D.CUST_CODE__DLV AS CUST_CODE__DLV,D.DLV_TO AS DLV_TO,D.DLV_ADD1 AS DLV_ADD1,D.DLV_ADD2 AS DLV_ADD2,D.DLV_ADD3 AS DLV_ADD3,D.DLV_CITY AS DLV_CITY," +" D.LOC_CODE__GITBF AS LOC_CODE__GITBF,D.CUST_CODE__DLV AS CUST_CODE__DLV,D.DLV_TO AS DLV_TO,D.DLV_ADD1 AS DLV_ADD1,D.DLV_ADD2 AS DLV_ADD2,D.DLV_ADD3 AS DLV_ADD3,D.DLV_CITY AS DLV_CITY,"
+" D.STATE_CODE__DLV AS STATE_CODE__DLV,D.COUNT_CODE__DLV AS COUNT_CODE__DLV,D.DLV_PIN AS DLV_PIN,D.STAN_CODE AS STAN_CODE,D.TEL1__DLV AS TEL1__DLV,D.TEL2__DLV AS TEL2__DLV,D.TEL3__DLV AS TEL3__DLV," +" D.STATE_CODE__DLV AS STATE_CODE__DLV,D.COUNT_CODE__DLV AS COUNT_CODE__DLV,D.DLV_PIN AS DLV_PIN,D.STAN_CODE AS STAN_CODE,D.TEL1__DLV AS TEL1__DLV,D.TEL2__DLV AS TEL2__DLV,D.TEL3__DLV AS TEL3__DLV,"
+" D.FAX__DLV AS FAX__DLV,D.AVALIABLE_YN AS AVALIABLE_YN,D.PURC_ORDER AS PURC_ORDER,D.TOT_AMT AS TOT_AMT,D.TAX_AMT AS TAX_AMT,D.NET_AMT AS NET_AMT,D.TRAN_SER AS TRAN_SER," +" D.FAX__DLV AS FAX__DLV,D.AVALIABLE_YN AS AVALIABLE_YN,D.PURC_ORDER AS PURC_ORDER,D.TOT_AMT AS TOT_AMT,D.TAX_AMT AS TAX_AMT,D.NET_AMT AS NET_AMT,D.TRAN_SER AS TRAN_SER,"
+" D.PRICE_LIST__CLG AS PRICE_LIST__CLG,SPACE(25) AS LOC,FN_SUNDRY_NAME(D.SUNDRY_TYPE,D.SUNDRY_CODE,'N') AS SUNDRY_NAME," +" D.PRICE_LIST__CLG AS PRICE_LIST__CLG,SPACE(25) AS LOC,FN_SUNDRY_NAME(D.SUNDRY_TYPE,D.SUNDRY_CODE,'N') AS SUNDRY_NAME,"
+" D.PROJ_CODE AS PROJ_CODE,SITE_C.DESCR AS SITEC_DESCR,D.POLICY_NO AS POLICY_NO,D.LOC_CODE__DAMAGED AS LOC_CODE__DAMAGED,D.SITE_CODE__BIL AS SITE_CODE__BIL,SITE_D.DESCR AS SITED_DESCR,SITE_D.ADD1 AS SITED_ADD1," +" D.PROJ_CODE AS PROJ_CODE,SITE_C.DESCR AS SITEC_DESCR,D.POLICY_NO AS POLICY_NO,D.LOC_CODE__DAMAGED AS LOC_CODE__DAMAGED,D.SITE_CODE__BIL AS SITE_CODE__BIL,SITE_D.DESCR AS SITED_DESCR,SITE_D.ADD1 AS SITED_ADD1,"
+" SITE_D.ADD2 AS SITED_ADD2,SITE_D.CITY AS SITED_CITY,SITE_D.PIN SITED_PIN ,SITE_D.STATE_CODE AS SITED_STATE_CODE,D.TRANS_MODE AS TRANS_MODE" +" SITE_D.ADD2 AS SITED_ADD2,SITE_D.CITY AS SITED_CITY,SITE_D.PIN SITED_PIN ,SITE_D.STATE_CODE AS SITED_STATE_CODE,D.TRANS_MODE AS TRANS_MODE"
+" FROM DISTORDER D,SITE SITE_A,SITE SITE_B,LOCATION LOCATION,SALES_PERS SALES_PERS,SITE SITE_C,SITE SITE_D " +" FROM DISTORDER D,SITE SITE_A,SITE SITE_B,LOCATION LOCATION,SALES_PERS SALES_PERS,SITE SITE_C,SITE SITE_D "
+" WHERE ( D.SITE_CODE__SHIP = SITE_A.SITE_CODE ) AND " +" WHERE ( D.SITE_CODE__SHIP = SITE_A.SITE_CODE ) AND "
+" ( D.SITE_CODE__DLV = SITE_B.SITE_CODE (+) ) AND " +" ( D.SITE_CODE__DLV = SITE_B.SITE_CODE (+) ) AND "
+" ( D.LOC_CODE__GIT = LOCATION.LOC_CODE (+) ) AND " +" ( D.LOC_CODE__GIT = LOCATION.LOC_CODE (+) ) AND "
+" ( D.SITE_CODE = SITE_C.SITE_CODE (+) ) AND " +" ( D.SITE_CODE = SITE_C.SITE_CODE (+) ) AND "
+" ( D.SALES_PERS=SALES_PERS.SALES_PERS(+)) AND " +" ( D.SALES_PERS=SALES_PERS.SALES_PERS(+)) AND "
+" ( D.SITE_CODE__BIL=SITE_D.SITE_CODE(+)) " +" ( D.SITE_CODE__BIL=SITE_D.SITE_CODE(+)) "
+" AND ( ( D.DIST_ORDER = '"+distOrder+"' ) ) "; +" AND ( ( D.DIST_ORDER = '"+distOrder+"' ) ) ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
...@@ -1164,8 +1126,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss ...@@ -1164,8 +1126,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<net_weight><![CDATA[0]]></net_weight>"); valueXmlString.append("<net_weight><![CDATA[0]]></net_weight>");
valueXmlString.append("<frt_amt><![CDATA[0]]></frt_amt>"); valueXmlString.append("<frt_amt><![CDATA[0]]></frt_amt>");
valueXmlString.append("<amount><![CDATA[0]]></amount>"); valueXmlString.append("<amount><![CDATA[0]]></amount>");
/* valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>"); // valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA[0]]></net_amt>");*/ // valueXmlString.append("<net_amt><![CDATA[0]]></net_amt>");
valueXmlString.append("<tax_amt><![CDATA["+rs.getDouble("tax_amt")+"]]></tax_amt>"); valueXmlString.append("<tax_amt><![CDATA["+rs.getDouble("tax_amt")+"]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA["+rs.getDouble("net_amt")+"]]></net_amt>"); valueXmlString.append("<net_amt><![CDATA["+rs.getDouble("net_amt")+"]]></net_amt>");
valueXmlString.append("<remarks><![CDATA["+(rs.getString("remarks")==null?"":rs.getString("remarks").trim())+"]]></remarks>"); valueXmlString.append("<remarks><![CDATA["+(rs.getString("remarks")==null?"":rs.getString("remarks").trim())+"]]></remarks>");
...@@ -1245,7 +1207,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss ...@@ -1245,7 +1207,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
} }
} } */
else else
{ {
......
...@@ -343,7 +343,7 @@ public String itemChanged(Document dom, Document dom1, Document dom2, String obj ...@@ -343,7 +343,7 @@ public String itemChanged(Document dom, Document dom1, Document dom2, String obj
String xmlString = ""; String xmlString = "";
String todayDate = ""; String todayDate = "";
String noOfArts = ""; String noOfArts = "";
String shipmentId = "",refID ="",tranCode =""; String shipmentId = "",refID ="",tranCode ="", tranName = "";
try try
{ {
...@@ -383,33 +383,52 @@ public String itemChanged(Document dom, Document dom1, Document dom2, String obj ...@@ -383,33 +383,52 @@ public String itemChanged(Document dom, Document dom1, Document dom2, String obj
shipmentId = genericUtility.getColumnValue("shipment_id1", dom1); shipmentId = genericUtility.getColumnValue("shipment_id1", dom1);
if(currentColumn.trim().equalsIgnoreCase("itm_default")) if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{
sql = "SELECT ref_id,tran_code FROM ship_docs where shipment_id = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,shipmentId);
rs = pstmt.executeQuery();
if(rs.next())
{
refID = rs.getString(1) == null ? "":rs.getString(1).trim();
tranCode = rs.getString(2) == null ? "":rs.getString(2).trim();
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
if (tranCode != null && tranCode.trim().length() > 0 )
{
sql = "SELECT tran_name FROM transporter where tran_code = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,tranCode);
rs = pstmt.executeQuery();
if(rs.next())
{ {
tranName = rs.getString(1) == null ? "":rs.getString(1).trim();
}
sql = "SELECT ref_id,tran_code FROM ship_docs where shipment_id = ?"; pstmt.close();
pstmt=conn.prepareStatement(sql); rs.close();
pstmt.setString(1,shipmentId); pstmt = null;
rs = pstmt.executeQuery(); rs = null;
if(rs.next()) }
{ else
refID = rs.getString(1) == null ? "":rs.getString(1).trim(); {
tranCode = rs.getString(2) == null ? "":rs.getString(2).trim(); tranName= "";
} }
pstmt.close();
rs.close();
pstmt = null;
rs = null;
valueXmlString.append("<Detail2 domID='1' objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n");
valueXmlString.append("<ref_id>").append("<![CDATA[" + refID + "]]>").append("</ref_id>");
valueXmlString.append("<tran_code>").append("<![CDATA[" + tranCode + "]]>").append("</tran_code>");
valueXmlString.append("</Detail2>");
}
valueXmlString.append("<Detail2 domID='1' objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n");
valueXmlString.append("<ref_id>").append("<![CDATA[" + refID + "]]>").append("</ref_id>");
valueXmlString.append("<tran_code>").append("<![CDATA[" + tranCode + "]]>").append("</tran_code>");
valueXmlString.append("<tran_name>").append("<![CDATA[" + tranName + "]]>").append("</tran_name>");
valueXmlString.append("</Detail2>");
}
break; break;
......
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