Skip to content

B
business-java
Commit 5bbd40a6 authored by pshinde's avatar pshinde
Browse files
Options

change in condition in PoRcpConf file 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96813 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c61c9a26
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 50 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java
View file @ 5bbd40a6
...@@ -3235,13 +3235,16 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -3235,13 +3235,16 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt2 = null; pstmt2 = null;
rs2.close(); rs2.close();
rs2 = null; rs2 = null;
if(!"Y".equals(useSuppLot)) //Condition added by sagar on 11/07/14 if(!"Y".equals(useSuppLot)) //Condition added by sagar on 11/07/14
{ {
System.out.println(">>>>>>>in S & Y if useSuppLot is not Y:"+useSuppLot); System.out.println(">>>>>>>in S & Y if useSuppLot is not Y:"+useSuppLot);
if ( "Y".equalsIgnoreCase(genLotAuto) || "M".equalsIgnoreCase(genLotAuto) ) if ( "Y".equalsIgnoreCase(genLotAuto) || "M".equalsIgnoreCase(genLotAuto) )
{ {
if ( (!pordType.equalsIgnoreCase(jobWorkType)) && (!pordType.equalsIgnoreCase(subContractType) ) ) //changes done by priyanka
//change in condition
//!pordType.equalsIgnoreCase(jobWorkType) && !pordType.equalsIgnoreCase(subContractType to pordType.equals(jobWorkType) && !pordType.equals(subContractType
if ( (!pordType.equals(jobWorkType) && !pordType.equals(subContractType) ) )
{ {
lotNoRcp = qcNo; lotNoRcp = qcNo;
} }
...@@ -4402,10 +4405,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4402,10 +4405,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs.close(); rs.close();
rs = null; 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 (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; 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 = 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(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; 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 = 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"; 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 = conn.prepareStatement(sql);
...@@ -4603,8 +4606,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4603,8 +4606,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
System.out.println("generatedTranId is :"+generatedTranId); System.out.println("generatedTranId is :"+generatedTranId);
System.out.println("outer hash key:"+Integer.parseInt(entry.getKey().toString())); 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.setString(1, generatedTranId);
pstmtRbHdr.setTimestamp(2, this.getCurrtDate() ); pstmtRbHdr.setTimestamp(2, this.getCurrtDate() );
pstmtRbHdr.setString(3, sordSite ); pstmtRbHdr.setString(3, sordSite );
...@@ -4892,21 +4894,18 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4892,21 +4894,18 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
if (convrReqd.equalsIgnoreCase("Y")) if (convrReqd.equalsIgnoreCase("Y"))
{ {
conv = 0; 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,unitOrd.get(lnoPoRcpDetInInt), itemCodeDet, updQty, conv, conn);
convQtyList=distCommon.convQtyFactor(unitDet,((outerHashMap.get(entry.getKey())).get("unitOrd")), 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()); conv = Double.parseDouble(convQtyList.get(0).toString());
convQty = Double.parseDouble( convQtyList.get(1).toString()); convQty = Double.parseDouble( convQtyList.get(1).toString());
// 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);
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()); conv = Double.parseDouble(convRateList.get(0).toString());
convRate = Double.parseDouble( convRateList.get(1).toString()); 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);
// amountHdr = amountHdr + (convQty * convRate);
// System.out.println("@@@@@@cpatil:4907generatedTranId["+generatedTranId+"]currRow["+currRow+"]amountHdr["+amountHdr+"]+convQty["+convQty+"]*convRate["+convRate+"]");
if (-999999999==convQty) if (-999999999==convQty)
{ {
retString = itmDBAccessLocal.getErrorString("","VMUCNV1",""); retString = itmDBAccessLocal.getErrorString("","VMUCNV1","");
...@@ -4914,12 +4913,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4914,12 +4913,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} }
}else }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)); 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(1, generatedTranId );
pstmtRbDet.setString(2, ""+currRow); pstmtRbDet.setString(2, ""+currRow);
pstmtRbDet.setString(3, itemCodeDet ); pstmtRbDet.setString(3, itemCodeDet );
...@@ -4941,13 +4936,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4941,13 +4936,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmtRbDet.setDouble(17, convQty ); pstmtRbDet.setDouble(17, convQty );
pstmtRbDet.setDouble(18, convRate ); pstmtRbDet.setDouble(18, convRate );
rcpBackFlushDet++; rcpBackFlushDet++;
pstmtRbDet.executeUpdate(); pstmtRbDet.addBatch();
pstmtRbDet.close(); pstmtRbDet.clearParameters();
//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*\\ //* Allocationg Stock*\\
hashMap.put("tran_date", this.getCurrtDate()); hashMap.put("tran_date", this.getCurrtDate());
...@@ -4992,13 +4982,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4992,13 +4982,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
break; break;
} }
} }
System.out.println("noBom["+noBom+"]");
if (noBom) if (noBom)
{ {
amountHdrNoBom = 0.0; 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 " + 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";
"AND PORDDET.BOM_CODE IS NULL" +
"";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, tranId ); pstmt1.setString(1, tranId );
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
...@@ -5074,8 +5062,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -5074,8 +5062,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
//quantityNoBom = 0 - quantityPoRcpDet.get(lnoPoRcpDetInInt);// replaced by swati //quantityNoBom = 0 - quantityPoRcpDet.get(lnoPoRcpDetInInt);// replaced by swati
quantityNoBom = 0 - Double.parseDouble(((outerHashMap.get(lnoPoRcpDet))).get("quantityPoRcpDet")); 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(1, generatedTranId );
pstmtRbDet.setString(2, ""+currRow ); pstmtRbDet.setString(2, ""+currRow );
//pstmtRbDet.setString(3, itemCodeRcp.get(lnoPoRcpDetInInt)); // replaced by swati //pstmtRbDet.setString(3, itemCodeRcp.get(lnoPoRcpDetInInt)); // replaced by swati
...@@ -5099,14 +5085,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -5099,14 +5085,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmtRbDet.setDouble(17, convQty ); pstmtRbDet.setDouble(17, convQty );
pstmtRbDet.setDouble(18, convRate ); pstmtRbDet.setDouble(18, convRate );
rcpBackFlushDet++; rcpBackFlushDet++;
pstmtRbDet.executeUpdate(); pstmtRbDet.addBatch();
/*pstmtRbDet.addBatch(); pstmtRbDet.clearParameters();
pstmtRbDet.clearParameters();*/
pstmtRbDet.close();
// System.out.println("@@@@@@cpatil:5101generatedTranId["+generatedTranId+"]currRow["+currRow+"]amountHdrNoBom["+amountHdrNoBom+"]+quantityNoBom["+quantityNoBom+"]*rateNoBom["+rateNoBom+"]");
amountHdrNoBom = amountHdrNoBom + (quantityNoBom * rateNoBom); amountHdrNoBom = amountHdrNoBom + (quantityNoBom * rateNoBom);
// System.out.println("@@@@@@cpatil:5103generatedTranId["+generatedTranId+"]currRow["+currRow+"]amountHdrNoBom["+amountHdrNoBom+"]");
} }
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
...@@ -5120,9 +5101,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -5120,9 +5101,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
break; break;
} }
} }
// System.out.println("@@@@@@cpatil:5117generatedTranId["+generatedTranId+"]amountHdr["+amountHdr+"]amountHdrNoBom["+amountHdrNoBom+"]");
amountHdr = amountHdr + amountHdrNoBom; amountHdr = amountHdr + amountHdrNoBom;
// System.out.println("@@@@@@cpatil:5119generatedTranId["+generatedTranId+"]amountHdr["+amountHdr+"]");
pstmtRbHdr.setDouble(20, amountHdr ); pstmtRbHdr.setDouble(20, amountHdr );
pstmtRbHdr.setDouble(21, amountHdr ); pstmtRbHdr.setDouble(21, amountHdr );
pstmtRbHdr.setDouble(22, amountHdr ); pstmtRbHdr.setDouble(22, amountHdr );
...@@ -5130,10 +5109,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -5130,10 +5109,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmtRbHdr.setDouble(24, 0.0); 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(25, ((outerHashMap.get(entry.getKey())).get("purcOrderDet")));//Added by Manoj dtd 25/09/2013 to store porder no.
pstmtRbHdr.setString(26,tranId); pstmtRbHdr.setString(26,tranId);
pstmtRbHdr.executeUpdate(); pstmtRbHdr.addBatch();
pstmtRbHdr.close(); pstmtRbHdr.clearParameters();
//pstmtRbHdr.addBatch();
//pstmtRbHdr.clearParameters();
amountHdr = 0; amountHdr = 0;
amountHdrNoBom=0; amountHdrNoBom=0;
...@@ -5155,10 +5132,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -5155,10 +5132,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
/*pstmtRbHdr.executeBatch(); pstmtRbHdr.executeBatch();
pstmtRbHdr.clearBatch(); pstmtRbHdr.clearBatch();
pstmtRbDet.executeBatch(); pstmtRbDet.executeBatch();
pstmtRbDet.clearBatch();*/ pstmtRbDet.clearBatch();
//conn.commit(); //conn.commit();
//* Confirmation Logic Come Here RECEIPT_BACKFLUSH //* 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