Skip to content

B
business-java
Commit 614ce00d authored by vkadam's avatar vkadam
Browse files
Options

Change error code for tran_id is blank when key_flag is 'M'. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99878 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d9d64890
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 272 deletions
webitm-dis/ibase/webitm/ejb/dis/PlistGenerationIC.java
View file @ 614ce00d
...@@ -219,7 +219,8 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC ...@@ -219,7 +219,8 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC
else if (childNodeName.equalsIgnoreCase("tran_id")) else if (childNodeName.equalsIgnoreCase("tran_id"))
{ {
tranId = genericUtility.getColumnValue("tran_id", dom); tranId = genericUtility.getColumnValue("tran_id", dom);
sql = "select key_flag from transetup where tran_window = 'w_pricelist_tran' ";
sql = "select key_flag from transetup where tran_window = 'w_plist_generation' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
...@@ -231,17 +232,17 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC ...@@ -231,17 +232,17 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("Key flag at tran id :- ["+keyFlag+"]");
if (keyFlag == null) if (keyFlag == null)
{ {
keyFlag = "M"; keyFlag = "M";
tranId = genericUtility.getColumnValue("tran_id", tranId = genericUtility.getColumnValue("tran_id",dom);
dom);
} }
if (keyFlag.equalsIgnoreCase("M") if (keyFlag.equalsIgnoreCase("M") && (tranId == null || tranId.trim().length() == 0))
&& (tranId == null || tranId.trim().length() == 0))
{ {
errCode = "VMCODNULL"; errCode = "VMTIDNULL";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
break; break;
...@@ -455,6 +456,13 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC ...@@ -455,6 +456,13 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC
effFromStr = checkNull(genericUtility.getColumnValue("eff_from",dom)); effFromStr = checkNull(genericUtility.getColumnValue("eff_from",dom));
System.out.println("Valid upto" + validUptoStr); System.out.println("Valid upto" + validUptoStr);
if(validUptoStr==null || validUptoStr.trim().length()==0)
{
errCode = "VTVLUPTONL";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
break;
}
if((validUptoStr!=null && validUptoStr.trim().length() > 0) && (effFromStr!=null && effFromStr.trim().length()> 0)) if((validUptoStr!=null && validUptoStr.trim().length() > 0) && (effFromStr!=null && effFromStr.trim().length()> 0))
{ {
...@@ -761,9 +769,9 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC ...@@ -761,9 +769,9 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC
String sql = ""; String sql = "";
int ctr = 0; int ctr = 0;
String errString = ""; String errString = "";
String refNo="",userId="",loginSite="",termId="",empCode=""; String refNo="",userId="",loginSite="",termId="",empCode="",lotNoFrom="",lotNoTo="",unitPack="",shelfLifeStr="";
int currentFormNo = 0; int currentFormNo = 0;
double shelfLife=0.0; double shelfLife=0.0,shipperSize=0.0;
String pdescr =""; String pdescr ="";
String effFromStr = ""; String effFromStr = "";
Connection conn = null; Connection conn = null;
...@@ -903,270 +911,7 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC ...@@ -903,270 +911,7 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC
ctr++; ctr++;
} }
while (ctr < childNodeListLength && !childNodeName.equals(currentColumn)); while (ctr < childNodeListLength && !childNodeName.equals(currentColumn));
// System.out.println("currentColumn..." + currentColumn);
// if (currentColumn.trim().equalsIgnoreCase("itm_default"))
// {
// priceList = genericUtility.getColumnValue("price_list", dom);
// sql = "Select plist_1,plist_2,plist_3,plist_4,plist_5,plist_6,plist_7,plist_8,plist_9,plist_10,plist_11,plist_12 from pricelist_mst where price_list = ? ";
// pstmt = conn.prepareStatement(sql);
// pstmt.setString(1, priceList);
// rs = pstmt.executeQuery();
// if (rs.next()) {
// plist1 = rs.getString("plist_1");
// plist2 = rs.getString("plist_2");
// plist3 = rs.getString("plist_3");
// plist4 = rs.getString("plist_4");
// plist5 = rs.getString("plist_5");
// plist6 = rs.getString("plist_6");
// plist7 = rs.getString("plist_7");
// plist8 = rs.getString("plist_8");
// plist9 = rs.getString("plist_9");
// plist10 = rs.getString("plist_10");
// plist11 = rs.getString("plist_11");
// plist12 = rs.getString("plist_12");
// }
// rs.close();
// rs = null;
// pstmt.close();
// pstmt = null;
// valueXmlString.append("<rate_1_t>")
// .append("<![CDATA[" + plist1 + "]]>")
// .append("</rate_1_t>");
// valueXmlString.append("<rate_2_t>")
// .append("<![CDATA[" + plist2 + "]]>")
// .append("</rate_2_t>");
// valueXmlString.append("<rate_3_t>")
// .append("<![CDATA[" + plist3 + "]]>")
// .append("</rate_3_t>");
// valueXmlString.append("<rate_4_t>")
// .append("<![CDATA[" + plist4 + "]]>")
// .append("</rate_4_t>");
// valueXmlString.append("<rate_5_t>")
// .append("<![CDATA[" + plist5 + "]]>")
// .append("</rate_5_t>");
// valueXmlString.append("<rate_6_t>")
// .append("<![CDATA[" + plist6 + "]]>")
// .append("</rate_6_t>");
// valueXmlString.append("<rate_7_t>")
// .append("<![CDATA[" + plist7 + "]]>")
// .append("</rate_7_t>");
// valueXmlString.append("<rate_8_t>")
// .append("<![CDATA[" + plist8 + "]]>")
// .append("</rate_8_t>");
// valueXmlString.append("<rate_9_t>")
// .append("<![CDATA[" + plist9 + "]]>")
// .append("</rate_9_t>");
// valueXmlString.append("<rate_10_t>")
// .append("<![CDATA[" + plist10 + "]]>")
// .append("</rate_10_t>");
// valueXmlString.append("<rate_11_t>")
// .append("<![CDATA[" + plist11 + "]]>")
// .append("</rate_11_t>");
// valueXmlString.append("<rate_12_t>")
// .append("<![CDATA[" + plist12 + "]]>")
// .append("</rate_12_t>");
// effFrom = new java.sql.Timestamp(System.currentTimeMillis()) ;
// effFrom = utilMethods.RelativeDate(effFrom, 1);
// effFromStr = new SimpleDateFormat(genericUtility.getApplDateFormat()).format(effFrom);
//
// valueXmlString.append("<eff_from>")
// .append("<![CDATA[" + effFromStr + "]]>")
// .append("</eff_from>");
//
// // effFrom = new
// // SimpleDateFormat(genericUtility.getApplDateFormat()).format(effFrom);
// valueXmlString.append("<list_type protect = \"0\">")
// .append("<![CDATA[" + 0 + "]]>")
// .append("</list_type>");
// valueXmlString.append("<order_type protect = \"0\">")
// .append("<![CDATA[" + 0 + "]]>")
// .append("</order_type>");
// }
// else if (currentColumn.trim().equalsIgnoreCase("itm_default_edit"))
// {
// /*if (currentColumn.equalsIgnoreCase("item_code"))
// {
// itemCode = genericUtility.getColumnValue("item_code",dom);
// sql = "Select descr, unit from item where item_code = ?";
// pstmt = conn.prepareStatement(sql);
// pstmt.setString(1, itemCode);
// rs = pstmt.executeQuery();
// if (rs.next())
// {
// descr = checkNull(rs.getString(1));
// unit = checkNull(rs.getString(2));
// }
// rs.close();
// rs = null;
// pstmt.close();
// pstmt = null;
// /*java.sql.Timestamp date1 =null ;
// date1 = new java.sql.Timestamp(System.currentTimeMillis()) ;
// effFromStr = new SimpleDateFormat(genericUtility.getApplDateFormat()).format(date1);
// System.out.println("inside item 1234566775578457878 ");
//
//
// effFrom = new java.sql.Timestamp(System.currentTimeMillis()) ;
//
// effFromStr = new SimpleDateFormat(genericUtility.getApplDateFormat()).format(effFrom);
//
// valueXmlString.append("<eff_from>")
// .append("<![CDATA[" + effFromStr + "]]>")
// .append("</eff_from>");
// valueXmlString.append("<descr>")
// .append("<![CDATA[" + descr + "]]>")
// .append("</descr>");
// valueXmlString.append("<unit>")
// .append("<![CDATA[" + unit + "]]>")
// .append("</unit>");
//
// }*/
// priceList = genericUtility.getColumnValue("price_list", dom);
// sql = "Select plist_1,plist_2,plist_3,plist_4,plist_5,plist_6,plist_7,plist_8,plist_9,plist_10,plist_11,plist_12 from pricelist_mst where price_list = ? ";
// pstmt = conn.prepareStatement(sql);
// pstmt.setString(1, priceList);
// rs = pstmt.executeQuery();
// if (rs.next()) {
// plist1 = rs.getString("plist_1");
// plist2 = rs.getString("plist_2");
// plist3 = rs.getString("plist_3");
// plist4 = rs.getString("plist_4");
// plist5 = rs.getString("plist_5");
// plist6 = rs.getString("plist_6");
// plist7 = rs.getString("plist_7");
// plist8 = rs.getString("plist_8");
// plist9 = rs.getString("plist_9");
// plist10 = rs.getString("plist_10");
// plist11 = rs.getString("plist_11");
// plist12 = rs.getString("plist_12");
// }
// rs.close();
// rs = null;
// pstmt.close();
// pstmt = null;
// valueXmlString.append("<rate_1_t>")
// .append("<![CDATA[" + plist1 + "]]>")
// .append("</rate_1_t>");
// valueXmlString.append("<rate_2_t>")
// .append("<![CDATA[" + plist2 + "]]>")
// .append("</rate_2_t>");
// valueXmlString.append("<rate_3_t>")
// .append("<![CDATA[" + plist3 + "]]>")
// .append("</rate_3_t>");
// valueXmlString.append("<rate_4_t>")
// .append("<![CDATA[" + plist4 + "]]>")
// .append("</rate_4_t>");
// valueXmlString.append("<rate_5_t>")
// .append("<![CDATA[" + plist5 + "]]>")
// .append("</rate_5_t>");
// valueXmlString.append("<rate_6_t>")
// .append("<![CDATA[" + plist6 + "]]>")
// .append("</rate_6_t>");
// valueXmlString.append("<rate_7_t>")
// .append("<![CDATA[" + plist7 + "]]>")
// .append("</rate_7_t>");
// valueXmlString.append("<rate_8_t>")
// .append("<![CDATA[" + plist8 + "]]>")
// .append("</rate_8_t>");
// valueXmlString.append("<rate_9_t>")
// .append("<![CDATA[" + plist9 + "]]>")
// .append("</rate_9_t>");
// valueXmlString.append("<rate_10_t>")
// .append("<![CDATA[" + plist10 + "]]>")
// .append("</rate_10_t>");
// valueXmlString.append("<rate_11_t>")
// .append("<![CDATA[" + plist11 + "]]>")
// .append("</rate_11_t>");
// valueXmlString.append("<rate_12_t>")
// .append("<![CDATA[" + plist12 + "]]>")
// .append("</rate_12_t>");
//
// effFrom = new java.sql.Timestamp(System.currentTimeMillis()) ;
// effFrom = utilMethods.RelativeDate(effFrom, 1);
// effFromStr = new SimpleDateFormat(genericUtility.getApplDateFormat()).format(effFrom);
//
// valueXmlString.append("<eff_from>")
// .append("<![CDATA[" + effFromStr + "]]>")
// .append("</eff_from>");
//
// // effFrom = new
// // SimpleDateFormat(genericUtility.getApplDateFormat()).format(effFrom);
// valueXmlString.append("<list_type protect = \"0\">")
// .append("<![CDATA[" + 0 + "]]>")
// .append("</list_type>");
// valueXmlString.append("<order_type protect = \"0\">")
// .append("<![CDATA[" + 0 + "]]>")
// .append("</order_type>");
//
//
//
// HashMap<String, Integer> hashMap = new HashMap<String, Integer>();
// hashMap.put("rate", 1);
// hashMap.put("rate_1", 2);
// hashMap.put("rate_2", 3);
// hashMap.put("rate_3", 4);
// hashMap.put("rate_4", 5);
// hashMap.put("rate_5", 6);
// hashMap.put("rate_6", 7);
// hashMap.put("rate_7", 8);
// hashMap.put("rate_8", 9);
// hashMap.put("rate_9", 10);
// hashMap.put("rate_10", 11);
// hashMap.put("rate_11", 12);
// if (hashMap.containsKey("rate"))
// {
// System.out.println("ratevalue:" + hashMap.get("rate"));
// valueXmlString.append("<min_rate>")
// .append("<![CDATA[" + rate + "]]>")
// .append("</min_rate>");
// valueXmlString.append("<max_rate>")
// .append("<![CDATA[" + rate + "]]>")
// .append("</max_rate>");
// } else if (hashMap.containsKey(childNodeName))
// {
// System.out.println("ratevalue:" + hashMap.get(childNodeName));
//
// for (int i = hashMap.get(childNodeName); i < hashMap.size(); i++)
// {
// sql = "DECLARE CUR_RATE_1 DYNAMIC CURSOR FOR SQLSA ";
// pstmt = conn.prepareStatement(sql);
// liNoStr = Integer.toString(i);
// rateStr = "rate" + liNoStr + "_formula";
// rateNo = "rate" + liNoStr;
// sql1 = "Select "
// + rateStr
// + " From Pricelist_mst Where price_list = ?";
// pstmt1 = conn.prepareStatement(sql1);
// pstmt1.setString(1, priceList);
// rs1 = pstmt1.executeQuery();
// if (rs1.next())
// {
// rate = rs1.getInt(1);
//
// }
// rs1.close();
// rs1 = null;
// pstmt1.close();
// pstmt1 = null;
// sql2 = "PREPARE SQLSA FROM " + sql1
// + "OPEN DYNAMIC CUR_RATE_1 using :"
// + priceList + ";"
// + "FETCH CUR_RATE_1; CLOSE CUR_RATE_1 ;";
// pstmt2 = conn.prepareStatement(sql2);
// rs2 = pstmt2.executeQuery();
// if (rs2.next())
// {
// formula = rs2.getString(1);
// }
// rs2.close();
// rs2 = null;
// pstmt2.close();
// pstmt2 = null;
//
// }
// }
//
// }
if (currentColumn.trim().equalsIgnoreCase("itm_default")) if (currentColumn.trim().equalsIgnoreCase("itm_default"))
{ {
...@@ -1182,6 +927,26 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC ...@@ -1182,6 +927,26 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC
if (currentColumn.equalsIgnoreCase("item_code")) if (currentColumn.equalsIgnoreCase("item_code"))
{ {
itemCode = genericUtility.getColumnValue("item_code",dom); itemCode = genericUtility.getColumnValue("item_code",dom);
sql="select unit__pack,shipper_size,shelf_life from item_lot_packsize"
+ " where item_code=? and lot_no__from =(select max(lot_no__from)"
+ " from item_lot_packsize where item_code=?)";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
pstmt.setString(2,itemCode);
rs=pstmt.executeQuery();
if(rs.next())
{
unitPack=checkNull(rs.getString("unit__pack"));
shipperSize=rs.getDouble("shipper_size");
shelfLifeStr=checkNull(rs.getString("shelf_life"));
}
pstmt.close();
pstmt=null;
rs.close();
rs=null;
sql = "Select descr, unit,shelf_life from item where item_code = ?"; sql = "Select descr, unit,shelf_life from item where item_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode); pstmt.setString(1, itemCode);
...@@ -1196,16 +961,77 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC ...@@ -1196,16 +961,77 @@ public class PlistGenerationIC extends ValidatorEJB implements PlistGenerationIC
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
effFrom = new java.sql.Timestamp(System.currentTimeMillis()) ; effFrom = new java.sql.Timestamp(System.currentTimeMillis()) ;
effFrom = utilMethods.RelativeDate(effFrom, 1); effFrom = utilMethods.RelativeDate(effFrom, 1);
effFromStr = new SimpleDateFormat(genericUtility.getApplDateFormat()).format(effFrom); effFromStr = new SimpleDateFormat(genericUtility.getApplDateFormat()).format(effFrom);
if(shelfLifeStr!=null && shelfLifeStr.trim().length()>0)
{
shelfLife=Double.parseDouble(shelfLifeStr);
}
valueXmlString.append("<eff_from>").append("<![CDATA[" + effFromStr + "]]>").append("</eff_from>"); valueXmlString.append("<eff_from>").append("<![CDATA[" + effFromStr + "]]>").append("</eff_from>");
valueXmlString.append("<item_descr>").append("<![CDATA[" + descr + "]]>").append("</item_descr>"); valueXmlString.append("<item_descr>").append("<![CDATA[" + descr + "]]>").append("</item_descr>");
valueXmlString.append("<unit>").append("<![CDATA[" + unit + "]]>").append("</unit>"); valueXmlString.append("<unit>").append("<![CDATA[" + unit + "]]>").append("</unit>");
valueXmlString.append("<shelf_life>").append("<![CDATA[" + shelfLife + "]]>").append("</shelf_life>"); valueXmlString.append("<shelf_life>").append("<![CDATA[" + shelfLife + "]]>").append("</shelf_life>");
valueXmlString.append("<unit__pack>").append("<![CDATA[" + unitPack + "]]>").append("</unit__pack>");
valueXmlString.append("<shipper_size>").append("<![CDATA[" + shipperSize + "]]>").append("</shipper_size>");
} }
// if (currentColumn.equalsIgnoreCase("lot_no__to"))
// {
// itemCode = genericUtility.getColumnValue("item_code",dom);
// lotNoFrom = genericUtility.getColumnValue("lot_no__from",dom);
// lotNoTo = genericUtility.getColumnValue("lot_no__to",dom);
//// shelfLifeStr = genericUtility.getColumnValue("shelf_life",dom);
//
// sql="select unit__pack,shipper_size,shelf_life from item_lot_packsize where item_code=? and lot_no__from=? and lot_no__to=?";
// pstmt=conn.prepareStatement(sql);
// pstmt.setString(1, itemCode);
// pstmt.setString(2, lotNoFrom);
// pstmt.setString(3, lotNoTo);
// rs=pstmt.executeQuery();
// if(rs.next())
// {
// unitPack=checkNull(rs.getString("unit__pack"));
// shipperSize=rs.getDouble("shipper_size");
// shelfLifeStr=checkNull(rs.getString("shelf_life"));
// }
//
// pstmt.close();
// pstmt=null;
// rs.close();
// rs=null;
//
// if(shelfLifeStr!=null && shelfLifeStr.trim().length()>0)
// {
// shelfLife=Double.parseDouble(shelfLifeStr);
// }
// else
// {
// System.out.println("Shelf life not found in item_lot_packsize..");
//
// sql = "Select shelf_life from item where item_code = ?";
// pstmt = conn.prepareStatement(sql);
// pstmt.setString(1, itemCode);
// rs = pstmt.executeQuery();
// if (rs.next())
// {
// shelfLife = rs.getDouble(1);
// }
// rs.close();
// rs = null;
// pstmt.close();
// pstmt = null;
// }
// valueXmlString.append("<unit__pack>").append("<![CDATA[" + unitPack + "]]>").append("</unit__pack>");
// valueXmlString.append("<shipper_size>").append("<![CDATA[" + shipperSize + "]]>").append("</shipper_size>");
// valueXmlString.append("<shelf_life>").append("<![CDATA[" + shelfLife + "]]>").append("</shelf_life>");
//
//
// }
valueXmlString.append("</Detail2>"); 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