Skip to content

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

MF89BHU001 merged changes by Mukesh 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91092 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 928aa149
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 33 deletions
webitm-mfg/ibase/webitm/ejb/mfg/adv/RcptBackflushAct.java
View file @ 9024c213
...@@ -151,7 +151,6 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -151,7 +151,6 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
try try
{ {
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
siteCode = genericUtility.getColumnValue("site_code", dom1); siteCode = genericUtility.getColumnValue("site_code", dom1);
itemCode = genericUtility.getColumnValue("item_code", dom1); itemCode = genericUtility.getColumnValue("item_code", dom1);
quantity = Double.parseDouble(genericUtility.getColumnValue("quantity", dom1)); quantity = Double.parseDouble(genericUtility.getColumnValue("quantity", dom1));
...@@ -159,7 +158,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -159,7 +158,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
varValue = mfgCommon.getEnvMfg("999999", "SITE_SPECIFIC", conn); varValue = mfgCommon.getEnvMfg("999999", "SITE_SPECIFIC", conn);
if (varValue.equalsIgnoreCase("Y")) if (varValue.equalsIgnoreCase("Y"))
{ {
sql = "SELECT MFG_LEAD_TIME, QC_LEAD_TIME FROM SITEITEM WHERE SITE_CODE = ? AND ITEM_CODE = ?"; sql = " SELECT MFG_LEAD_TIME, QC_LEAD_TIME FROM SITEITEM WHERE SITE_CODE = ? AND ITEM_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
pstmt.setString(2, itemCode); pstmt.setString(2, itemCode);
...@@ -228,7 +227,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -228,7 +227,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
{ {
Document expDom; Document expDom;
String siteCode = null, itemCode = null; String siteCode = null, itemCode = null;
String allocateStr = null; String allocateStr = null,locCodeWip=null;
double quantity = 0; double quantity = 0;
Node currDetail = null; Node currDetail = null;
int ctr = 0; int ctr = 0;
...@@ -250,9 +249,12 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -250,9 +249,12 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
currDetail = detailList.item(ctr); currDetail = detailList.item(ctr);
siteCode = genericUtility.getColumnValueFromNode("site_code", currDetail); siteCode = genericUtility.getColumnValueFromNode("site_code", currDetail);
itemCode = genericUtility.getColumnValueFromNode("item_code", currDetail); itemCode = genericUtility.getColumnValueFromNode("item_code", currDetail);
System.out.println("siteCode ::: " + siteCode + " itemCode :: " + itemCode);
locCodeWip = genericUtility.getColumnValueFromNode("loc_code__wip", currDetail);
quantity = Double.parseDouble(genericUtility.getColumnValueFromNode("quantity", currDetail)); quantity = Double.parseDouble(genericUtility.getColumnValueFromNode("quantity", currDetail));
allocateStr = allocateItem(dom1, siteCode, itemCode, quantity, xtraParams); // location Code wip added as a parameter in the method below--- 26/03/09 by mukesh for MF89BHU001
allocateStr = allocateItem(dom1, locCodeWip , siteCode, itemCode, quantity, xtraParams);
System.out.println("allocateStr ::: " + allocateStr); System.out.println("allocateStr ::: " + allocateStr);
if (allocateStr.indexOf("<Errors>") > 0) if (allocateStr.indexOf("<Errors>") > 0)
{ {
...@@ -390,7 +392,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -390,7 +392,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
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(5).trim()).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(6).trim()).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(7)).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(9).trim()).append("]]>").append("</site_code>\r\n");
if (expDate != null) if (expDate != null)
{ {
...@@ -401,6 +403,9 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -401,6 +403,9 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
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"); valueXmlString.append("<dimension>").append("<![CDATA[").append(rs.getString(11) == null?"":rs.getString(11).trim()).append("]]>").append("</dimension>\r\n");
// 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("</Detail>\r\n"); valueXmlString.append("</Detail>\r\n");
} }
...@@ -435,7 +440,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -435,7 +440,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
String tranId = null, siteDescr = null, itemCode = null, itemDescr = null, unit = null; String tranId = null, siteDescr = null, itemCode = null, itemDescr = null, unit = null;
String stkLocCode = null,stkLotNo = null, stkLotSl = null, locDescr = null; String stkLocCode = null,stkLotNo = null, stkLotSl = null, locDescr = null,rate=null;;
String siteCode = null; String siteCode = null;
double quantity = 0, remainingQty = 0, inputQty = 0, stkQty = 0; double quantity = 0, remainingQty = 0, inputQty = 0, stkQty = 0;
Node currDetail = null, currDetail1 = null; Node currDetail = null, currDetail1 = null;
...@@ -496,6 +501,9 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -496,6 +501,9 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
stkLotSl = genericUtility.getColumnValueFromNode("lot_sl", currDetail1); stkLotSl = genericUtility.getColumnValueFromNode("lot_sl", currDetail1);
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
//System.out.println("\n The rate is =="+rate);
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 = ?";
...@@ -532,10 +540,11 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -532,10 +540,11 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
valueXmlString.append("<location_descr isSrvCallOnChg='0'>").append("<![CDATA[").append(locDescr).append("]]>").append("</location_descr>\r\n"); valueXmlString.append("<location_descr isSrvCallOnChg='0'>").append("<![CDATA[").append(locDescr).append("]]>").append("</location_descr>\r\n");
valueXmlString.append("<unit__doc isSrvCallOnChg='0'>").append("<![CDATA[").append(unit).append("]]>").append("</unit__doc>\r\n"); valueXmlString.append("<unit__doc isSrvCallOnChg='0'>").append("<![CDATA[").append(unit).append("]]>").append("</unit__doc>\r\n");
valueXmlString.append("<lot_no isSrvCallOnChg='0'>").append("<![CDATA[").append(stkLotNo).append("]]>").append("</lot_no>\r\n"); valueXmlString.append("<lot_no isSrvCallOnChg='0'>").append("<![CDATA[").append(stkLotNo).append("]]>").append("</lot_no>\r\n");
//changed by ALKA on 12/09/07 for no_art column added in the receipt_backflush_set and itemChange enabled for lot_sl for request id "MF78GIN014" //changed by ALKA on 12/09/07 for no_art column added in the receipt_backflush_set and itemChange enabled for lot_sl for request id "MF78GIN014"
// valueXmlString.append("<lot_sl isSrvCallOnChg='0'>").append("<![CDATA[").append(stkLotSl).append("]]>").append("</lot_sl>\r\n"); // valueXmlString.append("<lot_sl isSrvCallOnChg='0'>").append("<![CDATA[").append(stkLotSl).append("]]>").append("</lot_sl>\r\n");
valueXmlString.append("<lot_sl isSrvCallOnChg='1'>").append("<![CDATA[").append(stkLotSl).append("]]>").append("</lot_sl>\r\n"); valueXmlString.append("<lot_sl isSrvCallOnChg='1'>").append("<![CDATA[").append(stkLotSl).append("]]>").append("</lot_sl>\r\n");
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("</Detail>"); valueXmlString.append("</Detail>");
System.out.println("remainingQty at the end of the forloop :::: " + remainingQty); //SOP ADDED BY ALKA TO CHECK THE REMAINING STOCK 19/07/07 System.out.println("remainingQty at the end of the forloop :::: " + remainingQty); //SOP ADDED BY ALKA TO CHECK THE REMAINING STOCK 19/07/07
if (remainingQty == 0) if (remainingQty == 0)
...@@ -564,7 +573,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -564,7 +573,7 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
return valueXmlString.toString(); return valueXmlString.toString();
} }
private String allocateItem(Document dom1, String siteCode, String itemCode, double quantity, String xtraParams)throws RemoteException, ITMException private String allocateItem(Document dom1, String locCodeWip, String siteCode, String itemCode, double quantity, String xtraParams)throws RemoteException, ITMException
{ {
String locDescr = null, itemDescr = null, sql = "", siteDescr = null, tranId = null; String locDescr = null, itemDescr = null, sql = "", siteDescr = null, tranId = null;
String stkLocCode = null, stkLotNo = null, stkLotSl = null, unit = null; String stkLocCode = null, stkLotNo = null, stkLotSl = null, unit = null;
...@@ -572,6 +581,8 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -572,6 +581,8 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
double remainingQty = 0d, inputQty = 0d, stkQtyLot = 0d, rate = 0; double remainingQty = 0d, inputQty = 0d, stkQtyLot = 0d, rate = 0;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
StringBuffer sqlBuf= new StringBuffer();
Connection conn = null; Connection conn = null;
ResultSet rs = null; ResultSet rs = null;
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
...@@ -597,18 +608,33 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -597,18 +608,33 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
} }
remainingQty = quantity; //added by rajendra remainingQty = quantity; //added by rajendra
sql = " SELECT (CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) - " sql = " SELECT (CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) - "
+ " (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END), A.UNIT, A.LOC_CODE, A.LOT_NO, " + " (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END), A.UNIT, A.LOC_CODE, A.LOT_NO, "
+ " A.LOT_SL, A.RATE ,B.DESCR FROM STOCK A, LOCATION B, INVSTAT C WHERE A.LOC_CODE = B.LOC_CODE " + " A.LOT_SL, A.RATE ,B.DESCR FROM STOCK A, LOCATION B, INVSTAT C WHERE A.LOC_CODE = B.LOC_CODE "
+ " AND ((CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) - " + " AND ((CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) - "
+ " (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END)) > 0 AND B.INV_STAT = C.INV_STAT " + " (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END)) > 0 AND B.INV_STAT = C.INV_STAT "
+ " AND A.SITE_CODE = ? AND A.ITEM_CODE = ? " + " AND A.ITEM_CODE = ? AND A.SITE_CODE = ? ";
+ " AND (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END) >= 0 AND C.AVAILABLE = 'Y' " if(locCodeWip !=null && locCodeWip.trim().length()>0 )
{
sql = sql + " AND A.LOC_CODE= ? "; // - added by Mukesh -26/03/09
}
sql= sql + " AND (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END) >= 0 AND C.AVAILABLE = 'Y' "
+ " ORDER BY (CASE WHEN A.EXP_DATE IS NULL THEN A.CREA_DATE ELSE A.EXP_DATE END), A.CREA_DATE, " + " ORDER BY (CASE WHEN A.EXP_DATE IS NULL THEN A.CREA_DATE ELSE A.EXP_DATE END), A.CREA_DATE, "
+ " A.LOT_NO , A.LOT_SL"; + " A.LOT_NO , A.LOT_SL";
System.out.println("site code=="+siteCode+" itemCode code=="+itemCode+" \tlocCodeWip=== "+ locCodeWip + " \n sql= "+sql);
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, itemCode);
pstmt.setString(2, itemCode); pstmt.setString(2, siteCode);
if(locCodeWip !=null && locCodeWip.trim().length()>0 )
{
pstmt.setString(3, locCodeWip);
}
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {
...@@ -631,17 +657,19 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -631,17 +657,19 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
inputQty = stkQtyLot; inputQty = stkQtyLot;
remainingQty = remainingQty - inputQty; remainingQty = remainingQty - inputQty;
} }
//commented by rajendra on 19/05/08 //commented by rajendra on 19/05/08
// sql = "SELECT DESCR FROM LOCATION WHERE LOC_CODE = ?"; // sql = "SELECT DESCR FROM LOCATION WHERE LOC_CODE = ?";
// pstmt = conn.prepareStatement(sql); // pstmt = conn.prepareStatement(sql);
// pstmt.setString(1, stkLocCode); // pstmt.setString(1, stkLocCode);
// rs = pstmt.executeQuery(); // rs = pstmt.executeQuery();
// if (rs.next()) // if (rs.next())
// { // {
// locDescr = rs.getString(1); // locDescr = rs.getString(1);
// } // }
// rs.close(); // rs.close();
// pstmt.close(); // pstmt.close();
siteDescr = genericUtility.getColumnValue("site_descr", dom1); siteDescr = genericUtility.getColumnValue("site_descr", dom1);
tranId = genericUtility.getColumnValue("tran_id", dom1); tranId = genericUtility.getColumnValue("tran_id", dom1);
bkflshType = genericUtility.getColumnValue("backflush_type", dom1); bkflshType = genericUtility.getColumnValue("backflush_type", dom1);
...@@ -656,8 +684,8 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush ...@@ -656,8 +684,8 @@ public class RcptBackflushAct extends ActionHandlerEJB implements RcptBackflush
valueXmlString.append("<location_descr>").append("<![CDATA[").append(locDescr).append("]]>").append("</location_descr>\r\n"); valueXmlString.append("<location_descr>").append("<![CDATA[").append(locDescr).append("]]>").append("</location_descr>\r\n");
valueXmlString.append("<unit__doc>").append("<![CDATA[").append(unit).append("]]>").append("</unit__doc>\r\n"); valueXmlString.append("<unit__doc>").append("<![CDATA[").append(unit).append("]]>").append("</unit__doc>\r\n");
valueXmlString.append("<lot_no>").append("<![CDATA[").append(stkLotNo).append("]]>").append("</lot_no>\r\n"); valueXmlString.append("<lot_no>").append("<![CDATA[").append(stkLotNo).append("]]>").append("</lot_no>\r\n");
//changed by ALKA on 12/09/07 for no_art column added in the receipt_backflush_set and itemChange enabled for lot_sl for request id "MF78GIN014" //changed by ALKA on 12/09/07 for no_art column added in the receipt_backflush_set and itemChange enabled for lot_sl for request id "MF78GIN014"
// valueXmlString.append("<lot_sl>").append("<![CDATA[").append(stkLotSl).append("]]>").append("</lot_sl>\r\n"); // valueXmlString.append("<lot_sl>").append("<![CDATA[").append(stkLotSl).append("]]>").append("</lot_sl>\r\n");
valueXmlString.append("<lot_sl isSrvCallOnChg='1'>").append("<![CDATA[").append(stkLotSl).append("]]>").append("</lot_sl>\r\n"); valueXmlString.append("<lot_sl isSrvCallOnChg='1'>").append("<![CDATA[").append(stkLotSl).append("]]>").append("</lot_sl>\r\n");
valueXmlString.append("<quantity>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<rate>").append("<![CDATA[").append(rate).append("]]>").append("</rate>\r\n"); valueXmlString.append("<rate>").append("<![CDATA[").append(rate).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