Commit 61da2977 authored by manohar's avatar manohar

column name in used instead of numbers as some column index and actual expectation are different


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93116 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 90115597
...@@ -394,10 +394,10 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -394,10 +394,10 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
} }
// sql = " SELECT A.ITEM_SER, A.ITEM_CODE, A.UNIT, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.QUANTITY, " // sql = " SELECT A.ITEM_SER, A.ITEM_CODE, A.UNIT, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.QUANTITY, "
sql = " SELECT A.ITEM_SER, A.ITEM_CODE, A.UNIT, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.QUANTITY - A.ALLOC_QTY AS QUANTITY, " sql = " SELECT A.ITEM_SER ITEM_SER, A.ITEM_CODE ITEM_CODE, A.UNIT UNIT, A.LOC_CODE LOC_CODE, A.LOT_NO LOT_NO, A.LOT_SL LOT_SL, A.QUANTITY - A.ALLOC_QTY AS QUANTITY, "
+ " (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END) ALLOC_QTY, A.SITE_CODE, " + " (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END) ALLOC_QTY, A.SITE_CODE SITE_CODE, "
+ " A.EXP_DATE , A.RETEST_DATE, A.RATE, A.MFG_DATE, A.SITE_CODE__MFG, A.PACK_CODE, A.GRADE, " + " A.EXP_DATE EXP_DATE, A.RETEST_DATE RETEST_DATE, A.RATE RATE, A.MFG_DATE MFG_DATE, A.SITE_CODE__MFG SITE_CODE__MFG, A.PACK_CODE PACK_CODE, A.GRADE GRADE, "
+ " A.DIMENSION, A.GROSS_WEIGHT, A.TARE_WEIGHT, A.NET_WEIGHT FROM STOCK A, INVSTAT B " + " A.DIMENSION DIMENSION, A.GROSS_WEIGHT GROSS_WEIGHT, A.TARE_WEIGHT TARE_WEIGHT, A.NET_WEIGHT NET_WEIGHT FROM STOCK A, INVSTAT B "
+ " WHERE (A.INV_STAT = B.INV_STAT) " + " WHERE (A.INV_STAT = B.INV_STAT) "
+ " AND (( A.ITEM_CODE = '" + itemCode + "' ) AND (A.SITE_CODE = '" + siteCode + "' ) AND (A.QUANTITY > 0) AND (A.QUANTITY - " + " AND (( A.ITEM_CODE = '" + itemCode + "' ) AND (A.SITE_CODE = '" + siteCode + "' ) AND (A.QUANTITY > 0) AND (A.QUANTITY - "
+ " (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END) > 0 ) " + " (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END) > 0 ) "
...@@ -412,13 +412,13 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -412,13 +412,13 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
while (rs.next()) while (rs.next())
{ {
expDate = rs.getTimestamp(10); expDate = rs.getTimestamp("EXP_DATE");
if (expDate != null) if (expDate != null)
{ {
expDate1 = sdf.format(expDate); expDate1 = sdf.format(expDate);
System.out.println("expDate1 :"+expDate1); System.out.println("expDate1 :"+expDate1);
} }
retestDate = rs.getTimestamp(11); retestDate = rs.getTimestamp("RETEST_DATE");
if (retestDate != null) if (retestDate != null)
{ {
retestDate1 = sdf.format(retestDate); retestDate1 = sdf.format(retestDate);
...@@ -426,24 +426,32 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -426,24 +426,32 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
} }
valueXmlString.append("<Detail>\r\n"); valueXmlString.append("<Detail>\r\n");
valueXmlString.append("<item_ser>").append("<![CDATA[").append(rs.getString(1).trim()).append("]]>").append("</item_ser>\r\n"); valueXmlString.append("<item_ser>").append("<![CDATA[").append(rs.getString("ITEM_SER")).append("]]>").append("</item_ser>\r\n");
valueXmlString.append("<item_code>").append("<![CDATA[").append(rs.getString(2).trim()).append("]]>").append("</item_code>\r\n"); valueXmlString.append("<item_code>").append("<![CDATA[").append(rs.getString("ITEM_CODE")).append("]]>").append("</item_code>\r\n");
valueXmlString.append("<unit>").append("<![CDATA[").append(rs.getString(3)).append("]]>").append("</unit>\r\n"); valueXmlString.append("<unit>").append("<![CDATA[").append(rs.getString("UNIT")).append("]]>").append("</unit>\r\n");
valueXmlString.append("<loc_code>").append("<![CDATA[").append(rs.getString(4).trim()).append("]]>").append("</loc_code>\r\n"); valueXmlString.append("<loc_code>").append("<![CDATA[").append(rs.getString("LOC_CODE")).append("]]>").append("</loc_code>\r\n");
valueXmlString.append("<lot_no>").append("<![CDATA[").append(rs.getString(5).trim()).append("]]>").append("</lot_no>\r\n"); valueXmlString.append("<lot_no>").append("<![CDATA[").append(rs.getString("LOT_NO")).append("]]>").append("</lot_no>\r\n");
valueXmlString.append("<lot_sl>").append("<![CDATA[").append(rs.getString(6).trim()).append("]]>").append("</lot_sl>\r\n"); valueXmlString.append("<lot_sl>").append("<![CDATA[").append(rs.getString("LOT_SL")).append("]]>").append("</lot_sl>\r\n");
valueXmlString.append("<quantity>").append("<![CDATA[").append(rs.getDouble(7)).append("]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity>").append("<![CDATA[").append(rs.getDouble("QUANTITY")).append("]]>").append("</quantity>\r\n");
//valueXmlString.append("<alloc_qty>").append("<![CDATA[").append(rs.getDouble(8)).append("]]>").append("</alloc_qty>\r\n");*/ //valueXmlString.append("<alloc_qty>").append("<![CDATA[").append(rs.getDouble(8)).append("]]>").append("</alloc_qty>\r\n");*/
valueXmlString.append("<site_code>").append("<![CDATA[").append(rs.getString(9).trim()).append("]]>").append("</site_code>\r\n"); valueXmlString.append("<site_code>").append("<![CDATA[").append(rs.getString("SITE_CODE")).append("]]>").append("</site_code>\r\n");
if (expDate != null) if (expDate != null)
{ {
valueXmlString.append("<exp_date>").append("<![CDATA[").append(expDate1).append("]]>").append("</exp_date>\r\n"); valueXmlString.append("<exp_date>").append("<![CDATA[").append(expDate1).append("]]>").append("</exp_date>\r\n");
} }
else
{
valueXmlString.append("<exp_date/>");
}
if (retestDate != null) if (retestDate != null)
{ {
valueXmlString.append("<retest_date>").append("<![CDATA[").append(retestDate1).append("]]>").append("</retest_date>\r\n"); valueXmlString.append("<retest_date>").append("<![CDATA[").append(retestDate1).append("]]>").append("</retest_date>\r\n");
} }
valueXmlString.append("<dimension>").append("<![CDATA[").append(rs.getString(11) == null?"":rs.getString(11).trim()).append("]]>").append("</dimension>\r\n"); else
{
valueXmlString.append("<retest_date/>");
}
valueXmlString.append("<dimension>").append("<![CDATA[").append(rs.getString("DIMENSION") == null?"":rs.getString("DIMENSION")).append("]]>").append("</dimension>\r\n");
// added below by Mukesh 31/03 for MF89BHU001 // added below by Mukesh 31/03 for MF89BHU001
valueXmlString.append("<rate>").append("<![CDATA[").append(rs.getString("rate") == null?"":rs.getString("rate").trim()).append("]]>").append("</rate>\r\n"); valueXmlString.append("<rate>").append("<![CDATA[").append(rs.getString("rate") == null?"":rs.getString("rate").trim()).append("]]>").append("</rate>\r\n");
......
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