Commit 6001a275 authored by rtiwari's avatar rtiwari

Modify for set no_art for request C03ASUN002


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93555 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8ce754df
...@@ -332,7 +332,8 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -332,7 +332,8 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
INVSTAT.AVAILABLE = 'Y' --- EXPIRY DATE IS NULL OR EXPIRY DATE IS > HEADER EFF_DATE INVSTAT.AVAILABLE = 'Y' --- EXPIRY DATE IS NULL OR EXPIRY DATE IS > HEADER EFF_DATE
RETEST_DATE > HEADER EFF_DATE ---- QUANTITY - ALLOC_QTY > 0 RETEST_DATE > HEADER EFF_DATE ---- QUANTITY - ALLOC_QTY > 0
IF QC_REQD = 'Y' THEN ONLY EXPIRY DATE AND RETEST DATE TO BE CONSIDERED IF QC_REQD = 'Y' THEN ONLY EXPIRY DATE AND RETEST DATE TO BE CONSIDERED
*/ */
String available = "", backflushType = "", trackShelfLife = ""; String available = "", backflushType = "", trackShelfLife = "";
String siteCode = "", itemCode = "", qcReqd = ""; String siteCode = "", itemCode = "", qcReqd = "";
String sql = ""; String sql = "";
...@@ -343,7 +344,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -343,7 +344,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
ResultSet rs = null; ResultSet rs = null;
Connection conn = null; Connection conn = null;
StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n"); StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
if (dom == null) { if (dom == null) {
valueXmlString.append("</Root>\r\n"); valueXmlString.append("</Root>\r\n");
return valueXmlString.toString(); return valueXmlString.toString();
...@@ -392,19 +393,19 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -392,19 +393,19 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
{ {
available = "('Y','N')"; available = "('Y','N')";
} }
// 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 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, " 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 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 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.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 DIMENSION, A.GROSS_WEIGHT GROSS_WEIGHT, A.TARE_WEIGHT TARE_WEIGHT, A.NET_WEIGHT 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,A.NO_ART 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 ) "
+ " AND B.AVAILABLE IN " + available + " AND (A.EXP_DATE IS NULL OR (A.EXP_DATE > ? )) " + " AND B.AVAILABLE IN " + available + " AND (A.EXP_DATE IS NULL OR (A.EXP_DATE > ? )) "
+ " AND ( A.LOT_NO NOT IN ( SELECT LOT_NO FROM QC_ORDER WHERE SITE_CODE = '" + siteCode + "' AND ITEM_CODE = '" + itemCode + "' " + " AND ( A.LOT_NO NOT IN ( SELECT LOT_NO FROM QC_ORDER WHERE SITE_CODE = '" + siteCode + "' AND ITEM_CODE = '" + itemCode + "' "
+ " AND STATUS = 'U' )) AND ( B.STAT_TYPE <> 'S' ))"; + " AND STATUS = 'U' )) AND ( B.STAT_TYPE <> 'S' ))";
// SQL CHANGED BY RITESH ON 30/AUG/13 FOR REQUEST C03ASUN002.
System.out.println("sql :: "+ sql); System.out.println("sql :: "+ sql);
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, Timestamp.valueOf(genericUtility.getValidDateString(retestDt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat())+ " 00:00:00")); pstmt.setTimestamp(1, Timestamp.valueOf(genericUtility.getValidDateString(retestDt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat())+ " 00:00:00"));
...@@ -455,6 +456,8 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -455,6 +456,8 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
// 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");
valueXmlString.append("<no_art>").append("<![CDATA[").append(rs.getDouble("NO_ART")).append("]]>").append("</no_art>\r\n");//ADDED BY RITESH ON 30/AUG/13. FOR REQUEST C03ASUN002
valueXmlString.append("</Detail>\r\n"); valueXmlString.append("</Detail>\r\n");
} }
...@@ -499,10 +502,10 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -499,10 +502,10 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
GenericUtility genericUtility = GenericUtility.getInstance(); GenericUtility genericUtility = GenericUtility.getInstance();
ArrayList unitList = null; ArrayList unitList = null;
Object factOb = null,qtyOb = null; Object factOb = null,qtyOb = null;
double noArt = 0;//ADDED BY RITESH ON 30/AUG/13. FOR REQUEST C03ASUN002
try { try {
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;
tranId = genericUtility.getColumnValue("tran_id", dom1); tranId = genericUtility.getColumnValue("tran_id", dom1);
siteCode = genericUtility.getColumnValue("site_code", dom1); siteCode = genericUtility.getColumnValue("site_code", dom1);
siteDescr = genericUtility.getColumnValue("site_descr", dom1); siteDescr = genericUtility.getColumnValue("site_descr", dom1);
...@@ -518,8 +521,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -518,8 +521,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
} }
System.out.println("stkQty :" + stkQty); System.out.println("stkQty :" + stkQty);
System.out.println("remainingQty :" + remainingQty); System.out.println("remainingQty :" + remainingQty);
// if (stkQty < quantity)
// if (stkQty < quantity)
if (quantity != 0 && stkQty < quantity) //CHANGED BY ALKA 19/07/07 FOR HANDLING NO QUANTITY ENTERED. if (quantity != 0 && stkQty < quantity) //CHANGED BY ALKA 19/07/07 FOR HANDLING NO QUANTITY ENTERED.
{ {
errCode = "VTSTOCK1"; errCode = "VTSTOCK1";
...@@ -553,8 +555,9 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -553,8 +555,9 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
unit = genericUtility.getColumnValueFromNode("unit", currDetail1); unit = genericUtility.getColumnValueFromNode("unit", currDetail1);
stkQty = Double.parseDouble(genericUtility.getColumnValueFromNode("quantity", currDetail1)); stkQty = Double.parseDouble(genericUtility.getColumnValueFromNode("quantity", currDetail1));
rate= genericUtility.getColumnValueFromNode("rate", currDetail1);// added by Mukesh -31/03/09 rate= genericUtility.getColumnValueFromNode("rate", currDetail1);// added by Mukesh -31/03/09
noArt = Double.parseDouble(genericUtility.getColumnValueFromNode("no_art", currDetail1));//added by ritesh on 30/aug/13. FOR REQUEST C03ASUN002
//System.out.println("\n The rate is =="+rate); //System.out.println("\n The rate is =="+rate);
System.out.println("= NO ARTS= "+noArt);
System.out.println("stkQty ==> :" + stkQty); System.out.println("stkQty ==> :" + stkQty);
sql = "SELECT DESCR FROM LOCATION WHERE LOC_CODE = ?"; sql = "SELECT DESCR FROM LOCATION WHERE LOC_CODE = ?";
...@@ -597,6 +600,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -597,6 +600,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<rate isSrvCallOnChg='0'>").append("<![CDATA[").append(rate).append("]]>").append("</rate>\r\n"); valueXmlString.append("<rate isSrvCallOnChg='0'>").append("<![CDATA[").append(rate).append("]]>").append("</rate>\r\n");
// 29/01/10 manoharan // 29/01/10 manoharan
valueXmlString.append("<no_art isSrvCallOnChg='0'>").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n");//added by ritesh on 30/aug/13. FOR REQUEST C03ASUN002
if (!unit.trim().equals(unitDoc.trim())) if (!unit.trim().equals(unitDoc.trim()))
{ {
unitList = null; unitList = null;
......
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