Skip to content

B
business-java
Commit 3da049f6 authored by cpatil's avatar cpatil
Browse files
Options

changes for header amount 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96739 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 27291c10
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 22 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java
View file @ 3da049f6
......@@ -4402,10 +4402,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs.close();
rs = null;
sql = "INSERT INTO RECEIPT_BACKFLUSH( TRAN_ID,TRAN_DATE, SITE_CODE, ITEM_CODE, BOM_CODE, QUANTITY, UNIT, BACKFLUSH_TYPE,LOT_SL, QC_REQD, LOC_CODE, CHG_DATE, MFG_DATE, EXP_DATE, CHG_USER, CHG_TERM, ACCT_CODE__CONV_GL, CCTR_CODE__CONV_GL,LOT_NO, AMOUNT, NET_AMT, INV_VALUE, TAX_AMT, DISCOUNT,ORDER_NO,REF_NO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtRbHdr = conn.prepareStatement(sql);
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 = "INSERT INTO RECEIPT_BACKFLUSH( TRAN_ID,TRAN_DATE, SITE_CODE, ITEM_CODE, BOM_CODE, QUANTITY, UNIT, BACKFLUSH_TYPE,LOT_SL, QC_REQD, LOC_CODE, CHG_DATE, MFG_DATE, EXP_DATE, CHG_USER, CHG_TERM, ACCT_CODE__CONV_GL, CCTR_CODE__CONV_GL,LOT_NO, AMOUNT, NET_AMT, INV_VALUE, TAX_AMT, DISCOUNT,ORDER_NO,REF_NO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtRbHdr = conn.prepareStatement(sql);*/
/*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,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);
......@@ -4603,7 +4603,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
System.out.println("generatedTranId is :"+generatedTranId);
System.out.println("outer hash key:"+Integer.parseInt(entry.getKey().toString()));
sql = "INSERT INTO RECEIPT_BACKFLUSH( TRAN_ID,TRAN_DATE, SITE_CODE, ITEM_CODE, BOM_CODE, QUANTITY, UNIT, BACKFLUSH_TYPE,LOT_SL, QC_REQD, LOC_CODE, CHG_DATE, MFG_DATE, EXP_DATE, CHG_USER, CHG_TERM, ACCT_CODE__CONV_GL, CCTR_CODE__CONV_GL,LOT_NO, AMOUNT, NET_AMT, INV_VALUE, TAX_AMT, DISCOUNT,ORDER_NO,REF_NO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtRbHdr = conn.prepareStatement(sql);
pstmtRbHdr.setString(1, generatedTranId);
pstmtRbHdr.setTimestamp(2, this.getCurrtDate() );
pstmtRbHdr.setString(3, sordSite );
......@@ -4891,18 +4892,21 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
if (convrReqd.equalsIgnoreCase("Y"))
{
conv = 0;
// System.out.println("unitDet["+unitDet+"]((outerHashMap.get(entry.getKey())).get('unitOrd'))["+(outerHashMap.get(entry.getKey()).get("unitOrd"))+"]itemCodeDet["+itemCodeDet+"]updQty["+updQty+"]conv["+conv+"]");
// convQtyList=distCommon.convQtyFactor(unitDet,unitOrd.get(lnoPoRcpDetInInt), itemCodeDet, updQty, conv, conn);
convQtyList=distCommon.convQtyFactor(unitDet,((outerHashMap.get(entry.getKey())).get("unitOrd")), itemCodeDet, updQty, conv, conn);
// System.out.println("@@@@@@cpatil:4998convQtyList["+convQtyList+"]");
conv = Double.parseDouble(convQtyList.get(0).toString());
convQty = Double.parseDouble( convQtyList.get(1).toString());
convRateList= distCommon.convQtyFactor(unitDet,((outerHashMap.get(entry.getKey())).get("unitOrd")), itemCodeDet, rateMap.get(iRow), conv,conn);
// System.out.println("unitDet["+unitDet+"]((outerHashMap.get(entry.getKey())).get('unitOrd'))["+(outerHashMap.get(entry.getKey()).get("unitOrd"))+"]itemCodeDet["+itemCodeDet+"]rateMap.get(iRow)["+rateMap.get(iRow)+"]conv["+conv+"]");
convRateList= distCommon.convQtyFactor(unitDet,((outerHashMap.get(entry.getKey())).get("unitOrd")), itemCodeDet, rateMap.get(iRow), conv,conn);
// System.out.println("@@@@@@cpatil:4901convRateList["+convRateList+"]");
conv = Double.parseDouble(convRateList.get(0).toString());
convRate = Double.parseDouble( convRateList.get(1).toString());
amountHdr = amountHdr + (convQty * convRate);
convRate = Double.parseDouble( convRateList.get(1).toString());
// convRate = rateMap.get(iRow);
// System.out.println("@@@@@@cpatil:4905generatedTranId["+generatedTranId+"]currRow["+currRow+"]amountHdr["+amountHdr+"]+convQty["+convQty+"]*convRate["+convRate+"]");
// amountHdr = amountHdr + (convQty * convRate);
// System.out.println("@@@@@@cpatil:4907generatedTranId["+generatedTranId+"]currRow["+currRow+"]amountHdr["+amountHdr+"]+convQty["+convQty+"]*convRate["+convRate+"]");
if (-999999999==convQty)
{
retString = itmDBAccessLocal.getErrorString("","VMUCNV1","");
......@@ -4910,8 +4914,12 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
}
}else
{
// System.out.println("@@@@@@cpatil:4915generatedTranId["+generatedTranId+"]currRow["+currRow+"]amountHdr["+amountHdr+"]+updQty["+updQty+"]*rateMap.get(iRow)["+rateMap.get(iRow)+"]");
amountHdr = amountHdr + (updQty * rateMap.get(iRow));
// System.out.println("@@@@@@cpatil:4917generatedTranId["+generatedTranId+"]currRow["+currRow+"]amountHdr["+amountHdr+"]+updQty["+updQty+"]*rateMap.get(iRow)["+rateMap.get(iRow)+"]");
}
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);
pstmtRbDet.setString(1, generatedTranId );
pstmtRbDet.setString(2, ""+currRow);
pstmtRbDet.setString(3, itemCodeDet );
......@@ -4933,8 +4941,13 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmtRbDet.setDouble(17, convQty );
pstmtRbDet.setDouble(18, convRate );
rcpBackFlushDet++;
pstmtRbDet.addBatch();
pstmtRbDet.clearParameters();
pstmtRbDet.executeUpdate();
pstmtRbDet.close();
//System.out.println("@@@@amountHdr["+amountHdr+"]updQty["+updQty+"]rateMap.get(iRow)["+rateMap.get(iRow)+"]");
amountHdr = amountHdr +updQty * rateMap.get(iRow);
//System.out.println("@@@@amountHdr["+amountHdr+"]updQty["+updQty+"]rateMap.get(iRow)["+rateMap.get(iRow)+"]");
/*pstmtRbDet.addBatch();
pstmtRbDet.clearParameters();*/
//* Allocationg Stock*\\
hashMap.put("tran_date", this.getCurrtDate());
......@@ -4979,11 +4992,13 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
break;
}
}
System.out.println("noBom["+noBom+"]");
if (noBom)
{
amountHdrNoBom = 0.0;
sql = "SELECT PORCPDET.PURC_ORDER,PORCPDET.LINE_NO__ORD, PORCPDET.ITEM_CODE,PORCPDET.QUANTITY,PORDDET.QUANTITY , PORDDET.BOM_CODE, PORCPDET.UNIT , PORCPDET.LINE_NO 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 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 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 NULL" +
"";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, tranId );
rs1 = pstmt1.executeQuery();
......@@ -5059,6 +5074,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
//quantityNoBom = 0 - quantityPoRcpDet.get(lnoPoRcpDetInInt);// replaced by swati
quantityNoBom = 0 - Double.parseDouble(((outerHashMap.get(lnoPoRcpDet))).get("quantityPoRcpDet"));
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);
pstmtRbDet.setString(1, generatedTranId );
pstmtRbDet.setString(2, ""+currRow );
//pstmtRbDet.setString(3, itemCodeRcp.get(lnoPoRcpDetInInt)); // replaced by swati
......@@ -5082,9 +5099,14 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmtRbDet.setDouble(17, convQty );
pstmtRbDet.setDouble(18, convRate );
rcpBackFlushDet++;
pstmtRbDet.addBatch();
pstmtRbDet.clearParameters();
pstmtRbDet.executeUpdate();
/*pstmtRbDet.addBatch();
pstmtRbDet.clearParameters();*/
pstmtRbDet.close();
// System.out.println("@@@@@@cpatil:5101generatedTranId["+generatedTranId+"]currRow["+currRow+"]amountHdrNoBom["+amountHdrNoBom+"]+quantityNoBom["+quantityNoBom+"]*rateNoBom["+rateNoBom+"]");
amountHdrNoBom = amountHdrNoBom + (quantityNoBom * rateNoBom);
// System.out.println("@@@@@@cpatil:5103generatedTranId["+generatedTranId+"]currRow["+currRow+"]amountHdrNoBom["+amountHdrNoBom+"]");
}
rs1.close();
rs1 = null;
......@@ -5098,7 +5120,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
break;
}
}
// System.out.println("@@@@@@cpatil:5117generatedTranId["+generatedTranId+"]amountHdr["+amountHdr+"]amountHdrNoBom["+amountHdrNoBom+"]");
amountHdr = amountHdr + amountHdrNoBom;
// System.out.println("@@@@@@cpatil:5119generatedTranId["+generatedTranId+"]amountHdr["+amountHdr+"]");
pstmtRbHdr.setDouble(20, amountHdr );
pstmtRbHdr.setDouble(21, amountHdr );
pstmtRbHdr.setDouble(22, amountHdr );
......@@ -5106,8 +5130,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmtRbHdr.setDouble(24, 0.0);
pstmtRbHdr.setString(25, ((outerHashMap.get(entry.getKey())).get("purcOrderDet")));//Added by Manoj dtd 25/09/2013 to store porder no.
pstmtRbHdr.setString(26,tranId);
pstmtRbHdr.addBatch();
pstmtRbHdr.clearParameters();
pstmtRbHdr.executeUpdate();
pstmtRbHdr.close();
//pstmtRbHdr.addBatch();
//pstmtRbHdr.clearParameters();
amountHdr = 0;
amountHdrNoBom=0;
......@@ -5129,10 +5155,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt.close();
pstmt=null;
pstmtRbHdr.executeBatch();
/*pstmtRbHdr.executeBatch();
pstmtRbHdr.clearBatch();
pstmtRbDet.executeBatch();
pstmtRbDet.clearBatch();
pstmtRbDet.clearBatch();*/
//conn.commit();
//* Confirmation Logic Come Here RECEIPT_BACKFLUSH
......
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