Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 414 additions and 463 deletions
webitm-dis/ibase/webitm/ejb/dis/DespatchWiz.java
View file @ a846eb7a
......@@ -835,7 +835,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
valueXmlString = new StringBuffer("<?xml version = \"1.0\"?> <Root> <header> <editFlag>");
valueXmlString.append(editFlag).append("</editFlag> </header>");
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
switch (currentFormNo) {
switch (currentFormNo)
{
case 1 :
break;
......@@ -846,68 +847,42 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
sorderNo = checkNull(genericUtility.getColumnValue("sale_order_no", dom1));
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 "
+ "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.setString(1,sorderNo);
pstmt.setString(2,chgUser);
rs = pstmt.executeQuery();
if(rs.next()){
if(rs.next())
{
cnt = rs.getInt(1);
}
if(rs!=null){
rs.close();
rs=null;
}
if(pstmt!=null){
pstmt.close();
pstmt=null;
}
System.out.println("sorderNo cnt123/@-@/>>----->>["+cnt+"]");//GROSS_WEIGHT, TARE_WEIGHT, NETT_WEIGHT
if(cnt > 0)
{
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{
System.out.println("addUsersList22------>>["+addUsersList+"]");
System.out.println("chgUser11------>>["+chgUser+"]");
if(addUsersList.contains(chgUser))
{
for(int i = 0;i < addUsersList.size(); i++)
{
addUser = addUsersList.get(i);
System.out.println("addUser------------>>["+addUser+"]");
if(chgUser.equalsIgnoreCase(addUser))
if (cnt > 0 )
{
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 = ?";
+ " from despatch d,sorder s where d.sord_no = ? and d.sord_no = s.sale_order and d.add_user = ? "
+ " and CASE WHEN d.confirmed IS NULL THEN 'N' ELSE d.confirmed END = 'N'";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,sorderNo);
pstmt.setString(2,addUser);
pstmt.setString(2,chgUser);
rs = pstmt.executeQuery();
if(rs.next()){
if(rs.next())
{
System.out.println("Data found3334455...................");
despId=checkNull(rs.getString("desp_id"));
siteCode = checkNull(rs.getString("site_code"));
......@@ -978,14 +953,10 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
}
if(rs!=null){
rs.close();
rs=null;
}
if(pstmt!=null){
pstmt.close();
pstmt=null;
}
System.out.println("tranCode----->>["+tranCode+"]");
System.out.println("orderDt----->>["+orderDt+"]");
System.out.println("sOrdDate----->>["+sOrdDate+"]");
......@@ -993,10 +964,12 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
valueXmlString.append("<Detail2 domID='" + count + "' objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n");
valueXmlString.append("<desp_id><![CDATA["+ despId +"]]></desp_id>");
if(orderDt != null){
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_no><![CDATA["+ sorderNo +"]]></sord_no>");
......@@ -1017,12 +990,14 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
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));
}
valueXmlString.append("<site_descr><![CDATA["+ siteCodeDesc+"]]></site_descr>");
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));
}
......@@ -1057,13 +1032,15 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
//---------- Added by Sandesh 2-Oct-2014 ---------
if(effDate!=null){
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){
if(chgDate!=null)
{
valueXmlString.append("<chg_date><![CDATA["+ simpleDateFormat.format(chgDate).toString() +"]]></chg_date>");
}
......@@ -1071,13 +1048,16 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
valueXmlString.append("<licence_no_2><![CDATA["+ licnNo2 +"]]></licence_no_2>");
valueXmlString.append("<licence_no_3><![CDATA["+ licnNo3 +"]]></licence_no_3>");
if(licnDate1!=null){
if(licnDate1!=null)
{
valueXmlString.append("<licence_date_1><![CDATA["+ simpleDateFormat.format(licnDate1).toString()+"]]></licence_date_1>");
}
if(licnDate2!=null){
if(licnDate2!=null)
{
valueXmlString.append("<licence_date_2><![CDATA["+ simpleDateFormat.format(licnDate2).toString()+"]]></licence_date_2>");
}
if(licnDate3!=null){
if(licnDate3!=null)
{
valueXmlString.append("<licence_date_3><![CDATA["+ simpleDateFormat.format(licnDate3).toString()+"]]></licence_date_3>");
}
......@@ -1091,22 +1071,12 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
valueXmlString.append("</Detail2>");
}
}
}else{
else
{
valueXmlString.append(insertNewRecord(sorderNo,currentFormNo,conn));
}
}//end itemDefault condition
} //end cnt > 0 condition
else {
System.out.println("--------no data found in Despatch-------------");
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>>>>");
tranCode = genericUtility.getColumnValue("tran_code",dom);
......
webitm-dis/ibase/webitm/ejb/dis/DistIssWiz.java
View file @ a846eb7a
......@@ -925,31 +925,14 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
//System.out.println("itm_default >>>>> 2>>");
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);
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.setString(1,distOrder);
pstmt.setString(2,chgUser);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -961,24 +944,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
rs = null;
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 check itm_default>>>>>>"+addUser+">>>>>>"+chgUser);
if(addUsers.contains(chgUser))
{
for(int i = 0;i < addUsers.size(); i++)
{
addUser = addUsers.get(i);
System.out.println("addUser>>>>>>>>>>>LL"+addUser);
if(chgUser.equalsIgnoreCase(addUser))
{
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,"
......@@ -1002,7 +969,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
+"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+"'";
+"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' ";
......@@ -1110,14 +1078,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
rs.close();
pstmt = null;
rs = null;
}
}
}
else
/*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,"
......@@ -1164,8 +1126,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<net_weight><![CDATA[0]]></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[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><![CDATA["+(rs.getString("remarks")==null?"":rs.getString("remarks").trim())+"]]></remarks>");
......@@ -1245,7 +1207,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
}
}
} */
else
{
......
webitm-dis/ibase/webitm/ejb/dis/LoadClose.java
View file @ a846eb7a
......@@ -343,7 +343,7 @@ public String itemChanged(Document dom, Document dom1, Document dom2, String obj
String xmlString = "";
String todayDate = "";
String noOfArts = "";
String shipmentId = "",refID ="",tranCode ="";
String shipmentId = "",refID ="",tranCode ="", tranName = "";
try
{
......@@ -400,12 +400,31 @@ public String itemChanged(Document dom, Document dom1, Document dom2, String obj
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();
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
}
else
{
tranName= "";
}
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>");
}
......
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