Skip to content

B
business-java
Commit 394968a7 authored by pgole's avatar pgole
Browse files
Options

Updated ejb component for SRC 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104186 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 21ca9fd0
Show whitespace changes
Inline Side-by-side
Showing with 271 additions and 57 deletions
webitm-dis/ibase/webitm/ejb/dis/CustStock.java
View file @ 394968a7
...@@ -2,7 +2,6 @@ package ibase.webitm.ejb.dis; ...@@ -2,7 +2,6 @@ package ibase.webitm.ejb.dis;
import ibase.utility.*; import ibase.utility.*;
import ibase.system.config.*;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.ejb.*; import ibase.webitm.ejb.*;
...@@ -12,11 +11,7 @@ import java.util.Date; ...@@ -12,11 +11,7 @@ import java.util.Date;
import java.sql.*; import java.sql.*;
import org.w3c.dom.*; import org.w3c.dom.*;
import javax.xml.parsers.*;
import javax.ejb.*;
import javax.naming.InitialContext;
import java.text.*; import java.text.*;
import java.io.File;
import javax.ejb.Stateless; // added for ejb3 import javax.ejb.Stateless; // added for ejb3
@Stateless // added for ejb3 @Stateless // added for ejb3
...@@ -122,7 +117,6 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -122,7 +117,6 @@ public class CustStock extends ValidatorEJB //implements SessionBean
{ {
// Added by Chandni Shah 17-Apr-2012 // Added by Chandni Shah 17-Apr-2012
boolean checkNextCol = true; boolean checkNextCol = true;
String columnName = "";
String columnValue = ""; String columnValue = "";
String userId = ""; String userId = "";
String errString = ""; String errString = "";
...@@ -956,9 +950,6 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -956,9 +950,6 @@ public class CustStock extends ValidatorEJB //implements SessionBean
String custName = ""; String custName = "";
String siteDescr = ""; String siteDescr = "";
String tranDate = ""; String tranDate = "";
String month = "";
int year =0 ;
String firstDate = "";
String lastDate = ""; String lastDate = "";
java.util.Date trnDate = null; java.util.Date trnDate = null;
double saless = 0; double saless = 0;
...@@ -1513,7 +1504,11 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -1513,7 +1504,11 @@ public class CustStock extends ValidatorEJB //implements SessionBean
//Added by chandni 19-Apr-2012 //Added by chandni 19-Apr-2012
calendar.setTime(trnDate); calendar.setTime(trnDate);
if(replPrd > 1)
{
calendar.add(Calendar.DATE,( -( replPrd *30) )); //added by Poonam for set from date and to date calendar.add(Calendar.DATE,( -( replPrd *30) )); //added by Poonam for set from date and to date
}
calendar.set(Calendar.DAY_OF_MONTH,1); calendar.set(Calendar.DAY_OF_MONTH,1);
System.out.println("getApplDateFormat()----"+getApplDateFormat()); System.out.println("getApplDateFormat()----"+getApplDateFormat());
java.text.SimpleDateFormat dtf = new SimpleDateFormat( getApplDateFormat() ); java.text.SimpleDateFormat dtf = new SimpleDateFormat( getApplDateFormat() );
...@@ -2040,7 +2035,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2040,7 +2035,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean
String prevDate = sdtApplDate.format(tsprevDate); String prevDate = sdtApplDate.format(tsprevDate);
selQuery = "SELECT FR_DATE, TO_DATE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE" ; selQuery = "SELECT FR_DATE, TO_DATE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE" ; //added for previous month period code
pstmt = conn.prepareStatement(selQuery); pstmt = conn.prepareStatement(selQuery);
//pstmt.setTimestamp(1,tsprevDate); //pstmt.setTimestamp(1,tsprevDate);
pstmt.setTimestamp(1,tstranDte); pstmt.setTimestamp(1,tstranDte);
...@@ -2056,7 +2051,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2056,7 +2051,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean
rs = null; rs = null;
pstmt = null; pstmt = null;
System.out.println("tsprevDate1["+tsprevDate1+"]"); System.out.println("tsprevDate1["+tsprevDate1+"]tsprevDate["+tsprevDate+"]");
selQuery = "SELECT SUM(DET.CL_STOCK)AS OP_STOCK FROM CUST_STOCK HDR, CUST_STOCK_DET DET " selQuery = "SELECT SUM(DET.CL_STOCK)AS OP_STOCK FROM CUST_STOCK HDR, CUST_STOCK_DET DET "
+ " WHERE HDR.TRAN_ID = DET.TRAN_ID " + " WHERE HDR.TRAN_ID = DET.TRAN_ID "
...@@ -2069,7 +2064,15 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2069,7 +2064,15 @@ public class CustStock extends ValidatorEJB //implements SessionBean
pstmt.setString(1,custCode); pstmt.setString(1,custCode);
// pstmt.setString(2,siteCode); // pstmt.setString(2,siteCode);
pstmt.setString(2,siteCodeCh); //Added by Chandni 11/Apr/2012 pstmt.setString(2,siteCodeCh); //Added by Chandni 11/Apr/2012
if(replPrd > 1)
{
pstmt.setTimestamp(3,tsprevDate1); pstmt.setTimestamp(3,tsprevDate1);
}
else
{
pstmt.setTimestamp(3,tsprevDate);
}
pstmt.setString(4,itemCode); pstmt.setString(4,itemCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
...@@ -2091,7 +2094,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2091,7 +2094,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean
selQuery = "SELECT FR_DATE, TO_DATE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE" ; selQuery = "SELECT FR_DATE, TO_DATE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE" ;
pstmt = conn.prepareStatement(selQuery); pstmt = conn.prepareStatement(selQuery);
//pstmt.setTimestamp(1,tsprevDate); //pstmt.setTimestamp(1,tsprevDate);
pstmt.setTimestamp(1,tstranDte); pstmt.setTimestamp(1,tsprevDate);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
...@@ -2104,7 +2107,14 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2104,7 +2107,14 @@ public class CustStock extends ValidatorEJB //implements SessionBean
rs = null; rs = null;
pstmt = null; pstmt = null;
if(replPrd > 1)
{
invListString = GetInvList(dom2, tsfromDate, preToDate); //Added by Poonam for get 3 months invoice invListString = GetInvList(dom2, tsfromDate, preToDate); //Added by Poonam for get 3 months invoice
}
else
{
invListString = GetInvList(dom2, preFromDate, preToDate); //Commented by poonam
}
System.out.println("invListString::::["+invListString+"]"); System.out.println("invListString::::["+invListString+"]");
...@@ -2150,7 +2160,15 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2150,7 +2160,15 @@ public class CustStock extends ValidatorEJB //implements SessionBean
pstmt.setString(2,itemCode); pstmt.setString(2,itemCode);
pstmt.setString(3,siteCode); pstmt.setString(3,siteCode);
pstmt.setTimestamp(4,tsFromDate); pstmt.setTimestamp(4,tsFromDate);
if(replPrd > 1)
{
pstmt.setTimestamp(5,preToDate); pstmt.setTimestamp(5,preToDate);
}
else
{
pstmt.setTimestamp(5,tsToDate);
}
// ended by chandni // ended by chandni
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
...@@ -2160,25 +2178,8 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2160,25 +2178,8 @@ public class CustStock extends ValidatorEJB //implements SessionBean
{ {
purcRcp = "0"; purcRcp = "0";
} }
//purReceipt = purcRcp; //Commented By poonam for get avarage of sales purReceipt = purcRcp;
valueXmlString.append("<purc_rcp>").append(purcRcp).append("</purc_rcp>\r\n");
if(purcRcp != null && purcRcp.trim().length() > 0)
{
purcRcpDob = Double.parseDouble(purcRcp);
System.out.println("purcRcpDob:["+purcRcpDob+"]replPrd["+replPrd+"]");
purcRcpDob = purcRcpDob/replPrd ;
System.out.println("purcRcpDob divide:["+purcRcpDob+"]");
}
//purReceipt = Double.toString(purcRcpDob);
purReceipt = Double.toString(Math.round(purcRcpDob));
System.out.println("purReceipt parse:["+purReceipt+"]");
//valueXmlString.append("<purc_rcp>").append(purcRcp).append("</purc_rcp>\r\n");
valueXmlString.append("<purc_rcp>").append( Math.round(purcRcpDob)).append("</purc_rcp>\r\n");
} }
rs.close(); rs.close();
pstmt.close(); pstmt.close();
...@@ -2202,7 +2203,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2202,7 +2203,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean
pstmt.setString(1,custCode); pstmt.setString(1,custCode);
//pstmt.setTimestamp(2,preFromDate); //pstmt.setTimestamp(2,preFromDate);
//pstmt.setTimestamp(3,preToDate); //pstmt.setTimestamp(3,preToDate);
pstmt.setTimestamp(2,tsFromDate); pstmt.setTimestamp(2,preFromDate);
pstmt.setTimestamp(3,preToDate); pstmt.setTimestamp(3,preToDate);
pstmt.setString(4,itemCode); pstmt.setString(4,itemCode);
pstmt.setString(5,siteCode); pstmt.setString(5,siteCode);
...@@ -2257,14 +2258,13 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2257,14 +2258,13 @@ public class CustStock extends ValidatorEJB //implements SessionBean
System.out.println("quantity:"+quantity+":retQty:"+retQty+":replQty:"+replQty); System.out.println("quantity:"+quantity+":retQty:"+retQty+":replQty:"+replQty);
quantity = retQty - replQty ; quantity = retQty - replQty ;
salesRet = quantity / replPrd; if(replPrd > 1)
{
purReturn = Double.toString(salesRet) ; //Added by Poonam purReturn = Double.toString(quantity); //Added By poonam for Set purchhase return value.
}
System.out.println("quantity sql [" +quantity+ "]replPrd["+replPrd+"]purReturn["+purReturn+"]"); valueXmlString.append("<purc_ret>").append(quantity).append("</purc_ret>\r\n");
//valueXmlString.append("<purc_ret>").append(quantity).append("</purc_ret>\r\n"); System.out.println("purc_ret [" +quantity+ "]purReturn[ "+purReturn+"]");
valueXmlString.append("<purc_ret>").append(Math.round(salesRet)).append("</purc_ret>\r\n"); //Added by poonam
System.out.println("purc_ret [" +quantity+ "]");
transitQty = 0; transitQty = 0;
...@@ -2339,10 +2339,87 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2339,10 +2339,87 @@ public class CustStock extends ValidatorEJB //implements SessionBean
System.out.println("TestMig custDiscount["+custDiscount+"]"); System.out.println("TestMig custDiscount["+custDiscount+"]");
/*
selQuery = "SELECT B.QUANTITY__STDUOM QUANTITY, B.ITEM_CODE ITEM_CODE, "
+ " A.SITE_CODE SITE_CODE, B.LOC_CODE LOC_CODE, "
+ " B.LOT_NO LOT_NO, B.LOT_SL LOT_SL, B.RET_REP_FLAG RET_REP_FLAG "
+ " FROM SRETURN A, SRETURNDET B "
+ " WHERE A.TRAN_ID = B.TRAN_ID "
+ " AND A.CUST_CODE = ? "
+ " AND A.TRAN_DATE >= ? "
+ " AND A.TRAN_DATE <= ? "
+ " AND B.ITEM_CODE = ? "
+ " AND A.SITE_CODE = ? "
+ " AND B.STATUS = 'S' ";
pstmt = conn.prepareStatement(selQuery);
pstmt.setString(1,custCode);
pstmt.setTimestamp(2,tsFromDate);
pstmt.setTimestamp(3,preToDate);
pstmt.setString(4,itemCode);
pstmt.setString(5,siteCode);
rs = pstmt.executeQuery();
retQty = 0;
replQty = 0;
selQuery = "SELECT INV_STAT FROM STOCK "
+ " WHERE ITEM_CODE = ? "
+ " AND SITE_CODE = ? "
+ " AND LOC_CODE = ? "
+ " AND LOT_NO = ? "
+ " AND LOT_SL = ? " ;
pstmt1 = conn.prepareStatement(selQuery);
while (rs.next())
{
quantity = rs.getDouble("QUANTITY");
rSiteCode = rs.getString("SITE_CODE");
locCode = rs.getString("LOC_CODE");
lotNo = rs.getString("LOT_NO");
lotSl = rs.getString("LOT_SL");
retRepFlag = rs.getString("RET_REP_FLAG");
pstmt1.setString(1,itemCode);
pstmt1.setString(2,rSiteCode);
pstmt1.setString(3,locCode);
pstmt1.setString(4,lotNo);
pstmt1.setString(5,lotSl);
rs1 = pstmt1.executeQuery();
if (rs1.next())
{
invStat = rs1.getString("INV_STAT");
if ("R".equalsIgnoreCase(retRepFlag) && "SALE".equalsIgnoreCase(invStat.trim()) )
{
retQty += quantity;
}
else if ( "P".equalsIgnoreCase(retRepFlag) )
{
replQty += quantity;
}
}
rs1.close();
rs1 = null;
}
pstmt1.close();pstmt1 = null;
rs.close(); pstmt.close();
rs = null;pstmt = null;
purcReturn = retQty - replQty ;
System.out.println("purcReturn:"+purcReturn+":retQty:"+retQty+":replQty:"+replQty);
if(purcRcp != null && purcRcp.trim().length() > 0)
{
purcRcpSales = Double.parseDouble(purcRcp);
}
System.out.println("TestMig status["+status+"]purcRcpSales["+purcRcpSales+"]");
netAmount = purcRcpSales - purcReturn;*/
System.out.println("TestMig netAmount["+netAmount+"]custRate["+custRate+"]custDiscount["+custDiscount+"]"); System.out.println("TestMig netAmount["+netAmount+"]custRate["+custRate+"]custDiscount["+custDiscount+"]");
valueXmlString.append("<rate>").append(custRate).append("</rate>\r\n"); valueXmlString.append("<rate>").append(custRate).append("</rate>\r\n");
valueXmlString.append("<discount>").append(custDiscount).append("</discount>\r\n"); valueXmlString.append("<discount>").append(custDiscount).append("</discount>\r\n");
//valueXmlString.append("<net_amt>").append(netAmount).append("</net_amt>\r\n");
//Added by Poonam on 09-12-2016 for discount, latest rate and net amount :End[D16HVHB005] //Added by Poonam on 09-12-2016 for discount, latest rate and net amount :End[D16HVHB005]
} }
else if (currentColumn.trim().equals("op_stock")) else if (currentColumn.trim().equals("op_stock"))
...@@ -2350,16 +2427,25 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2350,16 +2427,25 @@ public class CustStock extends ValidatorEJB //implements SessionBean
opStock = columnValue; opStock = columnValue;
System.out.println("op_stock currentColumn ["+currentColumn+"]"); System.out.println("op_stock currentColumn ["+currentColumn+"]");
System.out.println("line 1295 opStock["+opStock+"]"); System.out.println("line 1295 opStock["+opStock+"]");
Double OpStockLc= opStock != null ? Double.parseDouble(opStock) : 0 ;
Double purReceiptLc= purReceipt != null ? Double.parseDouble(purReceipt) : 0 ;
Double salesLc= sales != null ? Double.parseDouble(sales) : 0 ;
Double adjQtyLc= adjQty != null ? Double.parseDouble(adjQty) : 0 ;
Double purReturnLc= purReturn != null ? Double.parseDouble(purReturn) : 0 ;
Double clStksLc= clStks != null ? Double.parseDouble(clStks) : 0 ;
if (stockMode.trim().equals("S")) if (stockMode.trim().equals("S"))
{ {
sales = getColumnValue("sales",dom); //, formNo, domID); sales = getColumnValue("sales",dom); //, formNo, domID);
clStk = Double.parseDouble(opStock) + Double.parseDouble(purReceipt) - Double.parseDouble(sales) + Double.parseDouble(adjQty) - Double.parseDouble(purReturn); //clStk = Double.parseDouble(opStock) + Double.parseDouble(purReceipt) - Double.parseDouble(sales) + Double.parseDouble(adjQty) - Double.parseDouble(purReturn);
clStk = OpStockLc + purReceiptLc - salesLc + adjQtyLc - purReturnLc; //Added by poonam for null pointer exception
valueXmlString.append("<cl_stock>").append(clStk).append("</cl_stock>\r\n"); valueXmlString.append("<cl_stock>").append(clStk).append("</cl_stock>\r\n");
} }
else if (stockMode.trim().equals("C")) else if (stockMode.trim().equals("C"))
{ {
clStks = getColumnValue("cl_stock",dom); //, formNo, domID); clStks = getColumnValue("cl_stock",dom); //, formNo, domID);
saless = Double.parseDouble(opStock) + Double.parseDouble(purReceipt) - Double.parseDouble(clStks) + Double.parseDouble(adjQty) - Double.parseDouble(purReturn); //saless = Double.parseDouble(opStock) + Double.parseDouble(purReceipt) - Double.parseDouble(clStks) + Double.parseDouble(adjQty) - Double.parseDouble(purReturn);
saless = OpStockLc + purReceiptLc - clStksLc + adjQtyLc - purReturnLc; //Added by poonam for null pointer exception
valueXmlString.append("<sales>").append(saless).append("</sales>\r\n"); valueXmlString.append("<sales>").append(saless).append("</sales>\r\n");
} }
} }
...@@ -2368,6 +2454,13 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2368,6 +2454,13 @@ public class CustStock extends ValidatorEJB //implements SessionBean
clStks = columnValue; clStks = columnValue;
opStock = getColumnValue("op_stock",dom, formNo); //, domID); opStock = getColumnValue("op_stock",dom, formNo); //, domID);
Double OpStockLc= opStock != null ? Double.parseDouble(opStock) : 0 ;
Double purReceiptLc= purReceipt != null ? Double.parseDouble(purReceipt) : 0 ;
Double salesLc= sales != null ? Double.parseDouble(sales) : 0 ;
Double adjQtyLc= adjQty != null ? Double.parseDouble(adjQty) : 0 ;
Double purReturnLc= purReturn != null ? Double.parseDouble(purReturn) : 0 ;
Double clStksLc= clStks != null ? Double.parseDouble(clStks) : 0 ;
System.out.println(" cl_stock currentColumn ["+currentColumn+"]"); System.out.println(" cl_stock currentColumn ["+currentColumn+"]");
System.out.println("line 1316 opStock["+opStock+"]"); System.out.println("line 1316 opStock["+opStock+"]");
...@@ -2377,7 +2470,8 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2377,7 +2470,8 @@ public class CustStock extends ValidatorEJB //implements SessionBean
} }
else if (stockMode.trim().equals("C")) else if (stockMode.trim().equals("C"))
{ {
saless = Double.parseDouble(opStock) + Double.parseDouble(purReceipt) - Double.parseDouble(clStks) + Double.parseDouble(adjQty) - Double.parseDouble(purReturn); //saless = Double.parseDouble(opStock) + Double.parseDouble(purReceipt) - Double.parseDouble(clStks) + Double.parseDouble(adjQty) - Double.parseDouble(purReturn);
saless = OpStockLc + purReceiptLc - clStksLc + adjQtyLc - purReturnLc; //Added by poonam for null pointer exception
valueXmlString.append("<sales>").append(saless).append("</sales>\r\n"); valueXmlString.append("<sales>").append(saless).append("</sales>\r\n");
} }
} }
...@@ -2433,6 +2527,12 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2433,6 +2527,12 @@ public class CustStock extends ValidatorEJB //implements SessionBean
{ {
purReturn = "0"; purReturn = "0";
} }
Double OpStockLc= opStock != null ? Double.parseDouble(opStock) : 0 ;
Double purReceiptLc= purReceipt != null ? Double.parseDouble(purReceipt) : 0 ;
Double salesLc= sales != null ? Double.parseDouble(sales) : 0 ;
Double adjQtyLc= adjQty != null ? Double.parseDouble(adjQty) : 0 ;
Double purReturnLc= purReturn != null ? Double.parseDouble(purReturn) : 0 ;
Double clStksLc= clStks != null ? Double.parseDouble(clStks) : 0 ;
if (stockMode.trim().equals("S")) if (stockMode.trim().equals("S"))
{ {
sales = getColumnValue("sales",dom); //, formNo, domID); sales = getColumnValue("sales",dom); //, formNo, domID);
...@@ -2440,7 +2540,8 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2440,7 +2540,8 @@ public class CustStock extends ValidatorEJB //implements SessionBean
{ {
sales = "0"; sales = "0";
} }
clStk = Double.parseDouble(opStock) + Double.parseDouble(purReceipt) - Double.parseDouble(sales) + Double.parseDouble(adjQty) - Double.parseDouble(purReturn); //clStk = Double.parseDouble(opStock) + Double.parseDouble(purReceipt) - Double.parseDouble(sales) + Double.parseDouble(adjQty) - Double.parseDouble(purReturn);
clStk = OpStockLc + purReceiptLc - salesLc + adjQtyLc - purReturnLc; //Added by poonam for null pointer exception
valueXmlString.append("<cl_stock>").append(clStk).append("</cl_stock>\r\n"); valueXmlString.append("<cl_stock>").append(clStk).append("</cl_stock>\r\n");
clStks = clStk + ""; clStks = clStk + "";
} }
...@@ -2452,7 +2553,9 @@ public class CustStock extends ValidatorEJB //implements SessionBean ...@@ -2452,7 +2553,9 @@ public class CustStock extends ValidatorEJB //implements SessionBean
clStks = "0"; clStks = "0";
} }
System.out.println( "opStock [" + opStock + "]purReceipt["+purReceipt+"]clStks["+clStks+"]adjQty["+adjQty+"]purReturn["+purReturn+"]"); System.out.println( "opStock [" + opStock + "]purReceipt["+purReceipt+"]clStks["+clStks+"]adjQty["+adjQty+"]purReturn["+purReturn+"]");
saless = Double.parseDouble(opStock) + Double.parseDouble(purReceipt) - Double.parseDouble(clStks) + Double.parseDouble(adjQty) - Double.parseDouble(purReturn); //saless = Double.parseDouble(opStock) + Double.parseDouble(purReceipt) - Double.parseDouble(clStks) + Double.parseDouble(adjQty) - Double.parseDouble(purReturn);
saless = OpStockLc + purReceiptLc - clStksLc + adjQtyLc - purReturnLc; //Added by poonam for null pointer exception
valueXmlString.append("<sales>").append(saless).append("</sales>\r\n"); valueXmlString.append("<sales>").append(saless).append("</sales>\r\n");
sales = saless + ""; sales = saless + "";
} }
......
webitm-dis/ibase/webitm/ejb/dis/adv/CustStockOrder.java
View file @ 394968a7
...@@ -244,7 +244,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo ...@@ -244,7 +244,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
prevScheme= "" ,itemStru = "" , sqlNew = "" , mitCode = "",mitFlg = "" ,sqlin = "" ,sqlinner = "" , mslabOn = "",packCode = "",plistDisc = "", prevScheme= "" ,itemStru = "" , sqlNew = "" , mitCode = "",mitFlg = "" ,sqlin = "" ,sqlinner = "" , mslabOn = "",packCode = "",plistDisc = "",
mpriceList= "",listType = "",mstanCode = "",typeTaxclass = "",mstanCodeSite = "",mtaxClass = "",mtaxChap = "",mtaxEnv = "",itemserProm = "" , mpriceList= "",listType = "",mstanCode = "",typeTaxclass = "",mstanCodeSite = "",mtaxClass = "",mtaxChap = "",mtaxEnv = "",itemserProm = "" ,
mgenTrans = "",morderDtDtr = "",msetLine = "" ,oldInvoiceItemSer = "" , InvoiceItemSer= "" ,locType = "" , itemSerDesc = "",lineNoo = "", mgenTrans = "",morderDtDtr = "",msetLine = "" ,oldInvoiceItemSer = "" , InvoiceItemSer= "" ,locType = "" , itemSerDesc = "",lineNoo = "",
remarks = "" ,termId = "" ,SplitCodeNew = "" ,crTerm = "" ,cctrcodeSal = "" , xmlString = "",tempSplitCode = "",splitCode = "",splitCodeIn=""; remarks = "" ,termId = "" ,SplitCodeNew = "" ,crTerm = "" ,cctrcodeSal = "" , xmlString = "",replPeriod="",tempSplitCode = "",splitCode = "",splitCodeIn="";
String[] acctcodeSal= null; String[] acctcodeSal= null;
HashMap tempMap = null; HashMap tempMap = null;
...@@ -282,7 +282,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo ...@@ -282,7 +282,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
double mminQty = 0.0 ,msales = 0.0 ,mclStock = 0.0 ,integralQty = 0.0 ,mintQty = 0.0 ,mmodqty = 0.0, double mminQty = 0.0 ,msales = 0.0 ,mclStock = 0.0 ,integralQty = 0.0 ,mintQty = 0.0 ,mmodqty = 0.0,
perc = 0.0 , qtyPerc = 0.0 ,lcQty = 0.0 ,batchQty = 0.0 ,discMerge = 0.0 ,lcPlistDisc = 0.0 ,mrate = 0.0 ,sorate = 0.0 , perc = 0.0 , qtyPerc = 0.0 ,lcQty = 0.0 ,batchQty = 0.0 ,discMerge = 0.0 ,lcPlistDisc = 0.0 ,mrate = 0.0 ,sorate = 0.0 ,
exchRate = 0.0,mrateClg = 0.0,mtotOrdAmt = 0.0,mtotTaxAmt = 0.0,mtotNetAmt = 0.0,lcOrderStock = 0.0 ,minOrderQty = 0.0,demandQty= 0.0, exchRate = 0.0,mrateClg = 0.0,mtotOrdAmt = 0.0,mtotTaxAmt = 0.0,mtotNetAmt = 0.0,lcOrderStock = 0.0 ,minOrderQty = 0.0,demandQty= 0.0,
clStockOrg= 0.0 ,schpercTmp = 0.0 ,clStock = 0.0 ,freeQty = 0.0 ,mtaxAmt = 0.0 ,mordAmt =0.0 ,mnetAmt = 0.0 ,orderStock = 0.0 ; clStockOrg= 0.0 ,schpercTmp = 0.0 ,clStock = 0.0 ,freeQty = 0.0 ,mtaxAmt = 0.0 ,mordAmt =0.0 ,mnetAmt = 0.0 ,orderStock = 0.0 ,replPrd = 0.0 ;
Timestamp date = null; Timestamp date = null;
date = new java.sql.Timestamp(System.currentTimeMillis()) ; date = new java.sql.Timestamp(System.currentTimeMillis()) ;
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
...@@ -304,6 +304,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo ...@@ -304,6 +304,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
dlvTerm = distCommon.getDisparams("999999", "DLV_TERM", conn); dlvTerm = distCommon.getDisparams("999999", "DLV_TERM", conn);
sql = "select key_string from transetup where upper(tran_window) = 'W_SORDER'"; sql = "select key_string from transetup where upper(tran_window) = 'W_SORDER'";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -346,6 +348,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo ...@@ -346,6 +348,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
replRate = (String) custStockMap.get("repl_rate"); replRate = (String) custStockMap.get("repl_rate");
System.out.println("replRate"+replRate+"morderDt"+morderDt +"msiteCd"+msiteCd +"invoiceItemSerHdr"+invoiceItemSerHdr); System.out.println("replRate"+replRate+"morderDt"+morderDt +"msiteCd"+msiteCd +"invoiceItemSerHdr"+invoiceItemSerHdr);
if("P".equalsIgnoreCase(asType)) if("P".equalsIgnoreCase(asType))
{ {
if(replRate == null || replRate.trim().length() == 0) if(replRate == null || replRate.trim().length() == 0)
...@@ -653,6 +656,10 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo ...@@ -653,6 +656,10 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
System.out.println("astype >> "+asType); System.out.println("astype >> "+asType);
sqlDet = " select item_code , loc_type , line_no , item_ser , unit , sales , rate ," + sqlDet = " select item_code , loc_type , line_no , item_ser , unit , sales , rate ," +
" case when ? = 'P' then cl_stock else (cl_stock + transit_qty) end as mclStock,cust_item__ref " + " case when ? = 'P' then cl_stock else (cl_stock + transit_qty) end as mclStock,cust_item__ref " +
" from cust_stock_det where tran_id = ? " ; " from cust_stock_det where tran_id = ? " ;
...@@ -675,6 +682,98 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo ...@@ -675,6 +682,98 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
custStockSoGen = new HashMap(); custStockSoGen = new HashMap();
//Added by Poonam on 09-12-2016 for GET REPL_PERIOD FROM DATABASE :Start[D16HVHB005]
System.out.println("custCode... :"+custCode+":itemCode...:"+mitemCd+":");
System.out.println("In S astype....");
sql = "select repl_period from customeritem where cust_code = ? and item_code = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, custCode );
pstmt.setString( 2, mitemCd );
rs = pstmt.executeQuery();
if(rs.next())
{
replPeriod = rs.getString("repl_period");
}
rs.close();rs = null;
pstmt.close();pstmt = null;
sql = "Select item_ser from item where item_code = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, mitemCd );
rs = pstmt.executeQuery();
if(rs.next())
{
itemSer = checkNull(rs.getString("item_ser"));
}
rs.close();rs = null;
pstmt.close();pstmt = null;
System.out.println("mvarValue["+replPeriod+"][itemSer"+itemSer+"]");
if(replPeriod == null || replPeriod.trim().length() == 0)
{
sql = "select repl_period from customer_series where cust_code = ? and item_ser = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, custCode );
pstmt.setString( 2, itemSer );
rs = pstmt.executeQuery();
if(rs.next())
{
replPeriod = rs.getString("repl_period");
}
rs.close();rs = null;
pstmt.close();pstmt = null;
}
if(replPeriod == null || replPeriod.trim().length() == 0)
{
sql = "select repl_period from customer where cust_code = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, custCode );
rs = pstmt.executeQuery();
if(rs.next())
{
replPeriod = rs.getString("repl_period");
}
rs.close();rs = null;
pstmt.close();pstmt = null;
}
if(replPeriod == null || replPeriod.trim().length() == 0)
{
replPeriod = distCommon.getDisparams("999999", "REPL_PERIOD", conn);
if(replPeriod == null || replPeriod.trim().length() == 0)
{
replPeriod = "1";
}
if("NULLFOUND".equalsIgnoreCase(replPeriod))
{
replPeriod = "0";
}
}
System.out.println("replPeriod["+replPeriod +"]");
if(replPeriod != null && replPeriod.trim().length() > 0)
{
replPrd = Integer.parseInt(replPeriod);
}
System.out.println("replPrd["+replPrd +"]msales before["+msales+"]");
if(msales != 0 && replPrd > 1)
{
msales = msales / replPrd ;
msales= Math.round(msales);
}
System.out.println("replPrd["+replPrd +"]msales after["+msales+"]");
//Added by Poonam on 09-12-2016 for GET REPL_PERIOD FROM DATABASE :Start[D16HVHB005]
SplitCodeNew = invoiceItemSer + "@" + mlocType.trim(); SplitCodeNew = invoiceItemSer + "@" + mlocType.trim();
System.out.println("SplitCodeNew First >>>"+SplitCodeNew); System.out.println("SplitCodeNew First >>>"+SplitCodeNew);
...@@ -814,7 +913,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo ...@@ -814,7 +913,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
mvarValue = "0"; mvarValue = "0";
} }
} }
System.out.println("mvarValue["+mvarValue +"]"); System.out.println("mvarValue["+mvarValue +"]msales["+msales+"]");
if(mvarValue != null && mvarValue.trim().length() > 0) if(mvarValue != null && mvarValue.trim().length() > 0)
...@@ -1318,6 +1417,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo ...@@ -1318,6 +1417,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
rs.close();rs = null; rs.close();rs = null;
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
System.out.println("lcQty::::["+lcQty+"]");
if(mmodqty < lcQty) if(mmodqty < lcQty)
{ {
perc = (mclStock/mintQty) ; perc = (mclStock/mintQty) ;
...@@ -2282,6 +2383,10 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo ...@@ -2282,6 +2383,10 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
System.out.println("LINE NO PLAN["+lineNo+"][LINE NO SET["+msetLine +"]"); System.out.println("LINE NO PLAN["+lineNo+"][LINE NO SET["+msetLine +"]");
mclStock = Math.round(mclStock) ;
System.out.println("mclStock IN TEMPMAP*****>>>>>"+mclStock);
System.out.println("lineNo["+lineNo+"]"); System.out.println("lineNo["+lineNo+"]");
tempMap.put("item_code", mitemCd); tempMap.put("item_code", mitemCd);
tempMap.put("item_ser", itemserProm); tempMap.put("item_ser", itemserProm);
...@@ -2352,7 +2457,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo ...@@ -2352,7 +2457,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
tempList = null; tempList = null;
Iterator itrItem = setItem.iterator(); Iterator itrItem = setItem.iterator();
int cnt2 = 0 ; int cnt2 = 0 ;
System.out.println("tempList before while >>>["+tempList +"] "+itrItem.toString()); System.out.println("tempList before while >>>["+tempList +"]"+itrItem.toString());
int w = 0 ; int w = 0 ;
String ordType = ""; String ordType = "";
......
webitm-dis/ibase/webitm/ejb/dis/adv/CustStockSubmit.java
View file @ 394968a7
...@@ -43,6 +43,7 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit ...@@ -43,6 +43,7 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit
String errString = null; String errString = null;
ResultSet rs = null; ResultSet rs = null;
String confirm = "", custCode = "",emailId = "",name = "",msgText= "",subText = "", mailRetStr = ""; String confirm = "", custCode = "",emailId = "",name = "",msgText= "",subText = "", mailRetStr = "";
Date tranDate = null;
try try
{ {
...@@ -51,7 +52,11 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit ...@@ -51,7 +52,11 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit
conn = getConnection(); conn = getConnection();
conn.setAutoCommit(false); conn.setAutoCommit(false);
sql = " select confirmed,cust_code from cust_stock where tran_id = ?"; System.out.println("xtraParams"+xtraParams);
String userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
System.out.println("--login code--"+userId);
sql = " select confirmed,cust_code,tran_date from cust_stock where tran_id = ?";
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, tranId.trim()); pstmt.setString( 1, tranId.trim());
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -59,6 +64,7 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit ...@@ -59,6 +64,7 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit
{ {
confirm = rs.getString("confirmed"); confirm = rs.getString("confirmed");
custCode = rs.getString("cust_code"); custCode = rs.getString("cust_code");
tranDate = rs.getDate("tran_date");
} }
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
...@@ -95,9 +101,9 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit ...@@ -95,9 +101,9 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit
subText = "Auto stock Replenishment generation["+tranId+"]" ; subText = "Auto stock Replenishment generation["+tranId+"]" ;
msgText = "Dear " + name +",\n\n "+ "\t\t Please be inform that Auto stock Replenishment is generated for tran_id : "+tranId +".\n"+ msgText = "Dear " + name +",\n\n "+
"You can check and verify/edit the respected transation."+ "\t\t Kindly check , verify and approve the Auto stock Replenishment for tran_id : "+tranId +" generated on "+tranDate +".\n"+
"\n\n"+ "Thanks and Regards,\n"+ "Development Department."; "\n\n"+ "Thanks and Regards,\n"+ userId +" .";
System.out.println("msgText loop" + msgText); System.out.println("msgText loop" + msgText);
......
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