Skip to content

B
business-java
Commit 0de0dc99 authored by cpatil's avatar cpatil
Browse files
Options

change retstring and merge changes 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96681 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 45d9d25d
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 11 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java
View file @ 0de0dc99
......@@ -4407,7 +4407,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
sql = "INSERT INTO RECEIPT_BACKFLUSH_DET(TRAN_ID, LINE_NO, ITEM_CODE, SITE_CODE, QUANTITY, UNIT,UNIT__DOC, LOC_CODE, LOT_NO, LOT_SL, TAX_AMT, DISCOUNT, RATE, AMOUNT, NET_AMT, CONV_QTY_DOC, QTY_DOC, RATE_DOC) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtRbDet = conn.prepareStatement(sql);
sql = "SELECT PORCPDET.PURC_ORDER, PORCPDET.LINE_NO__ORD , PORCPDET.ITEM_CODE , PORCPDET.QUANTITY, PORDDET.QUANTITY ,PORDDET.BOM_CODE , PORCPDET.UNIT, PORCPDET.LINE_NO,PORCPDET.LOT_SL FROM PORCPDET, PORDDET WHERE PORCPDET.TRAN_ID = ? AND PORCPDET.PURC_ORDER = PORDDET.PURC_ORDER AND PORCPDET.LINE_NO__ORD = PORDDET.LINE_NO AND PORDDET.BOM_CODE IS NOT NULL";
sql = "SELECT PORCPDET.PURC_ORDER, PORCPDET.LINE_NO__ORD , PORCPDET.ITEM_CODE , PORCPDET.QUANTITY, PORDDET.QUANTITY ,PORDDET.BOM_CODE , PORCPDET.UNIT, PORCPDET.LINE_NO,PORCPDET.LOT_SL,PORCPDET.LOC_CODE FROM PORCPDET, PORDDET WHERE PORCPDET.TRAN_ID = ? AND PORCPDET.PURC_ORDER = PORDDET.PURC_ORDER AND PORCPDET.LINE_NO__ORD = PORDDET.LINE_NO AND PORDDET.BOM_CODE IS NOT NULL";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
......@@ -4453,6 +4453,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
innerHashMap.put("unitOrd", unitTemp);
innerHashMap.put("lnnoPoRcpDet", lnoPoRcpDet);
innerHashMap.put("poRcpdetlotSL", rs.getString("LOT_SL"));//Added by manoj dtd 25/09/2013 to set lotSL from porcpdet
innerHashMap.put("poRcpdetlocCode", rs.getString("LOC_CODE"));//Added by manoj dtd 27/10/2014 to set locCode from porcpdet
outerHashMap.put(lnoPoRcpDet,innerHashMap);
......@@ -4468,7 +4469,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
Map.Entry entry = (Map.Entry) it.next();
/*ended by swati on 11 sep 2013*/
System.out.println("outerHashMap.get(entry.getKey())--["+outerHashMap.get(entry.getKey())+"]");
currRow = 0;
hdrRow = 0;
sql = "SELECT MFG_DATE, EXPIRY_DATE , GROSS_WEIGHT, NET_WEIGHT , TARE_WEIGHT FROM PORCPDET WHERE TRAN_ID = ? AND ITEM_CODE = ? ";
......@@ -4620,7 +4621,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
System.out.println("Print lotSL----"+((outerHashMap.get(entry.getKey())).get("poRcpdetlotSL")));
pstmtRbHdr.setString(9, ((outerHashMap.get(entry.getKey())).get("poRcpdetlotSL")));
pstmtRbHdr.setString(10, "N");
pstmtRbHdr.setString(11, locHdr);
//pstmtRbHdr.setString(11, locHdr);
pstmtRbHdr.setString(11, ((outerHashMap.get(entry.getKey())).get("poRcpdetlocCode")));
pstmtRbHdr.setTimestamp(12, this.getCurrtDate());
pstmtRbHdr.setTimestamp(13, mfgDt);
pstmtRbHdr.setString(15, userId );
......@@ -4968,7 +4970,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
hashMap.clear();
if(retString != null && retString.trim().length()>0)
{
retString = itmDBAccessLocal.getErrorString("","RETSTRING","");
retString = itmDBAccessLocal.getErrorString("",retString,"");
return retString;
}
}
......@@ -5108,7 +5110,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmtRbHdr.clearParameters();
amountHdr = 0;
amountHdrNoBom=0;
rcbTranIdList.add(generatedTranId);
System.out.println("RECEIPT BACK FLUSH DET COUNT::"+rcpBackFlushDet);
if(rcpBackFlushDet == 0) //ADDED BY KUNAL ON 21/MAY/14
......@@ -5116,6 +5118,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
retString = itmDBAccessLocal.getErrorString("","VTBACKFREC","");
return retString;
}
else
{
rcbTranIdList.add(generatedTranId);
}
} // end of main while
rs.close();
......@@ -5132,8 +5138,17 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
//* Confirmation Logic Come Here RECEIPT_BACKFLUSH
//added by kunal on 20/MAY/14
if(rcbTranIdList.size()>0)
{
for(int backflushId=0;backflushId<rcbTranIdList.size();backflushId++)
{
generatedTranId=(String) rcbTranIdList.get(backflushId);
System.out.println("generatedTranId--["+generatedTranId+"]");
retString = rcpBackflushConf.confirmRcpBackflush(generatedTranId, xtraParams, "", conn,false);//change on 22/may/14 handle connection
System.out.println("retString 4953::"+retString);
}
}
//added by kunal on 20/MAY/14 END
//retString=this.confirmWebService("receipt_backflush", generatedTranId, xtraParams,"",conn);
if(retString !=null && retString.trim().length()> 0 && retString.indexOf("VTCONFIRM")==-1)
......@@ -5314,7 +5329,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
//* Despatch Detail Data*\\
sql = "SELECT ITEM_CODE, LINE_NO ,LOT_NO, LOT_SL FROM PORCPDET WHERE TRAN_ID = ? ";
sql = "SELECT ITEM_CODE, LINE_NO ,LOT_NO, LOT_SL,LOC_CODE FROM PORCPDET WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
......@@ -5530,7 +5545,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
//pstmtDspDtl.setString(25, taxCl );
//pstmtDspDtl.setString(26, taxCh );
//pstmtDspDtl.setString(27, taxEn );
pstmtDspDtl.setString(23, locHdr );
//pstmtDspDtl.setString(23, locHdr );
pstmtDspDtl.setString(23, rs.getString("LOC_CODE") );
pstmtDspDtl.setString(24, packIns );
pstmtDspDtl.setDouble(25, noArt );
......@@ -5588,7 +5604,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
hashMap.put("ref_line",lineNo);
hashMap.put("site_code",sordSite);
hashMap.put("item_code",itemCodeOrd);
hashMap.put("loc_code",locHdr);
//hashMap.put("loc_code",locHdr);
hashMap.put("loc_code",rs.getString("LOC_CODE"));
hashMap.put("lot_no",rs.getString("LOT_NO"));
hashMap.put("lot_sl",rs.getString("LOT_SL"));
hashMap.put("alloc_qty",qtyDesp);
......@@ -5600,9 +5617,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
retString=allocTraceBean.updateInvallocTrace(hashMap, conn);
hashMap.clear();
System.out.println("retString----"+retString);
if(retString !=null && retString.trim().length() >0)
{
retString = itmDBAccessLocal.getErrorString("","RETSTRING","");
retString = itmDBAccessLocal.getErrorString("",retString,"");
return retString;
}
......
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