Commit d3740180 authored by sshinde's avatar sshinde

remove tax_enc,tax_chap,tax_class,discount,pending_qty while insrting data...

remove tax_enc,tax_chap,tax_class,discount,pending_qty  while insrting data into despatchdet  in autobackflush  method


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93605 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a0057759
...@@ -4948,7 +4948,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4948,7 +4948,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
return retString; return retString;
} }
sql = "INSERT INTO DESPATCH(DESP_ID,DESP_DATE, SITE_CODE, SORD_NO, SORD_DATE, CUST_CODE, CUST_CODE__DLV, EFF_DATE, DLV_ADD1, DLV_ADD2, DLV_ADD3, DLV_CITY, DLV_PIN, COUNT_CODE__DLV, CURR_CODE, EXCH_RATE, CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, REMARKS,GP_SER, STAN_CODE, TRAN_CODE, TRANS_MODE, STAN_CODE__INIT, TOT_VALUE, GROSS_WEIGHT, TARE_WEIGHT, NETT_WEIGHT) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; sql = "INSERT INTO DESPATCH(DESP_ID,DESP_DATE, SITE_CODE, SORD_NO, SORD_DATE, CUST_CODE, CUST_CODE__DLV, EFF_DATE, DLV_ADD1, DLV_ADD2, DLV_ADD3, DLV_CITY, DLV_PIN, COUNT_CODE__DLV, CURR_CODE, EXCH_RATE, CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, REMARKS,GP_SER, STAN_CODE, TRAN_CODE, TRANS_MODE, STAN_CODE__INIT, TOT_VALUE, GROSS_WEIGHT, TARE_WEIGHT, NETT_WEIGHT) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtDspHdr = conn.prepareStatement(sql); pstmtDspHdr = conn.prepareStatement(sql);
pstmtDspHdr.setString(1,generatedTranId); pstmtDspHdr.setString(1,generatedTranId);
...@@ -5000,10 +5000,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -5000,10 +5000,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
int linePoRcpDetInInt=0; int linePoRcpDetInInt=0;
sql = "INSERT INTO DESPATCHDET(DESP_ID, LINE_NO, ITEM_CODE__ORD, QUANTITY__ORD, SORD_NO, LINE_NO__SORD, SITE_CODE, EXP_LEV, ITEM_CODE, LOT_NO, LOT_SL, UNIT__STD, CONV__QTY_STDUOM, UNIT, QUANTITY__STDUOM, GROSS_WEIGHT,TARE_WEIGHT, NETT_WEIGHT,PENDING_QTY,QUANTITY, QUANTITY_REAL, RATE__STDUOM, RATE__CLG, DISCOUNT,TAX_CLASS, TAX_CHAP, TAX_ENV, LOC_CODE, PACK_INSTR, NO_ART, TAX_AMT) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; sql = "INSERT INTO DESPATCHDET(DESP_ID, LINE_NO, ITEM_CODE__ORD, QUANTITY__ORD, SORD_NO, LINE_NO__SORD, SITE_CODE, EXP_LEV, ITEM_CODE, LOT_NO, LOT_SL, UNIT__STD, CONV__QTY_STDUOM, UNIT, QUANTITY__STDUOM, GROSS_WEIGHT,TARE_WEIGHT, NETT_WEIGHT, QUANTITY, QUANTITY_REAL, RATE__STDUOM, RATE__CLG, LOC_CODE, PACK_INSTR, NO_ART, TAX_AMT) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtDspDtl = conn.prepareStatement(sql); pstmtDspDtl = conn.prepareStatement(sql);
while (rs.next()) while (rs.next())
{ {
itemDes = checkNull(rs.getString("ITEM_CODE")); itemDes = checkNull(rs.getString("ITEM_CODE"));
...@@ -5144,7 +5143,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -5144,7 +5143,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmtDspDtl.setDouble(16, grWgh ); pstmtDspDtl.setDouble(16, grWgh );
pstmtDspDtl.setDouble(17, tareWgh ); pstmtDspDtl.setDouble(17, tareWgh );
pstmtDspDtl.setDouble(18, netWgh ); pstmtDspDtl.setDouble(18, netWgh );
pstmtDspDtl.setDouble(19, pendingQty-minusQty); //pstmtDspDtl.setDouble(19, pendingQty-minusQty);
if (bomCode == null || bomCode.length() == 0) if (bomCode == null || bomCode.length() == 0)
{ {
...@@ -5164,33 +5163,33 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -5164,33 +5163,33 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
pstmtDspDtl.setDouble(19, qtyDesp * -1 );
pstmtDspDtl.setDouble(20, qtyDesp * -1 ); pstmtDspDtl.setDouble(20, qtyDesp * -1 );
pstmtDspDtl.setDouble(21, qtyDesp * -1 ); pstmtDspDtl.setDouble(21, rateNoBom );
pstmtDspDtl.setDouble(22, rateNoBom ); pstmtDspDtl.setDouble(22, rateNoBom );
pstmtDspDtl.setDouble(23, rateNoBom ); // pstmtDspDtl.setDouble(24, 0.0);
pstmtDspDtl.setDouble(24, 0.0);
itemRate = rateStd; itemRate = rateStd;
amtHdrDesp = amtHdrDesp + (qtyDesp * itemRate); amtHdrDesp = amtHdrDesp + (qtyDesp * itemRate);
} }
else else
{ {
pstmtDspDtl.setDouble(19, qtyDesp );
pstmtDspDtl.setDouble(20, qtyDesp ); pstmtDspDtl.setDouble(20, qtyDesp );
pstmtDspDtl.setDouble(21, qtyDesp ); pstmtDspDtl.setDouble(21, rateStd );
pstmtDspDtl.setDouble(22, rateStd ); pstmtDspDtl.setDouble(22, rateClg );
pstmtDspDtl.setDouble(23, rateClg ); //pstmtDspDtl.setDouble(24, discountDes );
pstmtDspDtl.setDouble(24, discountDes );
itemRate = rateStd; itemRate = rateStd;
amtHdrDesp = amtHdrDesp + ( (qtyDesp * itemRate) - (qtyDesp * itemRate * discountDes / 100)); amtHdrDesp = amtHdrDesp + ( (qtyDesp * itemRate) - (qtyDesp * itemRate * discountDes / 100));
} }
pstmtDspDtl.setString(25, taxCl ); //pstmtDspDtl.setString(25, taxCl );
pstmtDspDtl.setString(26, taxCh ); //pstmtDspDtl.setString(26, taxCh );
pstmtDspDtl.setString(27, taxEn ); //pstmtDspDtl.setString(27, taxEn );
pstmtDspDtl.setString(28, locHdr ); pstmtDspDtl.setString(23, locHdr );
pstmtDspDtl.setString(29, packIns ); pstmtDspDtl.setString(24, packIns );
pstmtDspDtl.setDouble(30, noArt ); pstmtDspDtl.setDouble(25, noArt );
additionalCost = 0; additionalCost = 0;
if ( ordType.equalsIgnoreCase(jobWorkType) || ordType.equalsIgnoreCase(subContractType) ) if ( ordType.equalsIgnoreCase(jobWorkType) || ordType.equalsIgnoreCase(subContractType) )
...@@ -5398,7 +5397,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -5398,7 +5397,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1 = null; rs1 = null;
amtHdrDesp = amtHdrDesp + taxAmt; amtHdrDesp = amtHdrDesp + taxAmt;
pstmtDspDtl.setDouble(31, taxAmt); pstmtDspDtl.setDouble(26, taxAmt);
pstmtDspDtl.addBatch(); pstmtDspDtl.addBatch();
pstmtDspDtl.clearParameters(); pstmtDspDtl.clearParameters();
......
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