Skip to content

B
business-java
Commit 98758d40 authored by mjadhav's avatar mjadhav
Browse files
Options

changes done for cal for primary sales 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98770 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b28d5fa9
Show whitespace changes
Inline Side-by-side
Showing with 76 additions and 40 deletions
webitm-dis/ibase/webitm/ejb/dis/CustStockGWTIC.java
View file @ 98758d40
......@@ -439,7 +439,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
" SELECT distinct( cinv.invoice_id) " +
" FROM CUST_STOCK_INV cinv , " +
" invoice invoice WHERE cinv.invoice_id=invoice.invoice_id and " +
" invoice.cust_code = ? and invoice.item_ser= ? and invoice.confirmed = 'Y'" +
" invoice.cust_code = ? and invoice.item_ser= ? and invoice.inv_type = ? and invoice.confirmed = 'Y'" +
" and CASE WHEN cinv.dlv_flg IS NULL THEN 'N' ELSE cinv.dlv_flg END='N' ";
pstmt3 = conn.prepareStatement(sql);
......@@ -453,6 +453,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
pstmt3.setTimestamp(8,prdTo);
pstmt3.setString(9,custCode.trim());
pstmt3.setString(10,itemSer.trim());
pstmt3.setString(11,orderType.trim());
rs3 = pstmt3.executeQuery();
while (rs3.next())
{
......@@ -1129,7 +1130,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
double transitQtyBon = 0.0,transitQtyFrs=0.0,returnBon=0.0,returnFrs=0.0,receiptBon=0.0,receiptFrs=0.0;
String sretSiteCode = "",sretLocCode = "",sretLotNo="",sretLotSl="",retRepFlag="",selQuery="",invStat="",periodDt="",tranDateStr="";
double rcpQtmDom = 0.0,retQtyDom=0.0,opStkDom=0.0,transitQtyDom=0.0,salesQtyCal=0.0,clStockNew=0.0;
double retQtyAll=0.0,transitCharQty=0.0,replQtyAll=0.0,primarySalesAll=0.0,rcpBonAll=0.0,rcpBonLast=0.0,transitQtyBonLast=0.0,rcpFreesLast=0.0,rcpChargableQty=0.0;
double retQtyAll=0.0,retFreeQtyAll=0.0,transitCharQty=0.0,replQtyAll=0.0,primarySalesAll=0.0,rcpBonAll=0.0,rcpBonLast=0.0,transitQtyBonLast=0.0,rcpFreesLast=0.0,rcpChargableQty=0.0;
SimpleDateFormat sdf;
ArrayList defData = null;
windowName = (new StringBuilder("w_")).append(getObjName(dom, objContext)).toString();
......@@ -1144,13 +1145,13 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
HashMap<String, String> invMap = new HashMap<String, String>();
HashMap<String, String> itemMap = new HashMap<String, String>();
List <String> invList = new ArrayList<String>();
List <String> itemList = new ArrayList<String>();
List <String> itemListLast = new ArrayList<String>();
String selectedInvList ="";
String invoiceIdDom="";
String locality_code="";
String childNodeName = "",lineNoStrDom="",lineNoStr="",stockDlvFlg="",dlvFlagStock="";
String invoiceIdList = "",dlvFlagDom="";
double sretQtyAll=0.0,rateAll=0.0,rcpQtyAll=0.0,sretQtyAllTot=0.0,transitCharQtyAll=0.0,transitQtyFreesLast=0.0,transitQtyFrees=0.0,rcpFreesAll=0.0,totReceiptLast=0.0,rcpChargableLast=0.0;
String invoiceIdList = "",dlvFlagDom="",lineTypeAll="",lineType="";
double sretQtyAll=0.0,rateAll=0.0,retFreeQty=0.0,rcpFreeQtmDom=0.0,retQtyFreeDom=0.0,rcpQtyAll=0.0,sretQtyAllTot=0.0,transitCharQtyAll=0.0,transitQtyFreesLast=0.0,transitQtyFrees=0.0,rcpFreesAll=0.0,totReceiptLast=0.0,rcpChargableLast=0.0;
String sretSiteCodeAll="",sretLocCodeAll="",sretLotNoAll="",sretLotSlAll="",retRepFlagAll="";
int invCnt=0,dlvFlgCnt=0;
......@@ -1760,7 +1761,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
" SELECT distinct cinv.invoice_id ," +
" cinv.INVOICE_DATE,cinv.DLV_FLG ,cinv.net_amt FROM CUST_STOCK_INV cinv , " +
" invoice invoice WHERE cinv.invoice_id=invoice.invoice_id and " +
" invoice.cust_code = ? and invoice.item_ser= ? and invoice.confirmed = 'Y'" +
" invoice.cust_code = ? and invoice.item_ser= ? and invoice.inv_type=? and invoice.confirmed = 'Y'" +
" and CASE WHEN cinv.dlv_flg IS NULL THEN 'N' ELSE cinv.dlv_flg END='N' ";
......@@ -1775,6 +1776,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
pstmt.setTimestamp(8, prdTo);
pstmt.setString(9, custCode);
pstmt.setString(10, itemSer);
pstmt.setString(11, orderType);
rs = pstmt.executeQuery();
while(rs.next())
{
......@@ -1928,7 +1930,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
case 4:
System.out.println("itemChanged : case 4 called!!!");
System.out.println("itemChanged : case 4 called!!!@@@@@@@@@");
Node detailNode3 = dom.getElementsByTagName((new StringBuilder("Detail")).append(currentFormNo).toString()).item(0);
if(currentColumn.trim().equals("itm_default"))
{
......@@ -2267,16 +2269,18 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
replQty=0.0;
retQty=0.0;
returnLast=0.0;
retFreeQty=0.0;
sretSiteCode="";
sretLocCode="";
sretLotSl="";
retRepFlag="";
invStat="";
lineType="";
System.out.println("-------calculate Return Quantity for availble transcaion Id--------");
sql =" 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 "
+ " B.LOT_NO LOT_NO, B.LOT_SL LOT_SL, B.RET_REP_FLAG RET_REP_FLAG,B.line_type "
+ " FROM SRETURN A, SRETURNDET B "
+ " WHERE A.TRAN_ID = B.TRAN_ID "
+ " AND A.CUST_CODE = ? "
......@@ -2303,6 +2307,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
sretLotNo = rs2.getString("LOT_NO");
sretLotSl = rs2.getString("LOT_SL");
retRepFlag = rs2.getString("RET_REP_FLAG");
lineType = rs2.getString("line_type");
System.out.println("sretQty :"+sretQty);
System.out.println("sretSiteCode :"+sretSiteCode);
......@@ -2313,6 +2318,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
retRepFlag = ( retRepFlag == null || retRepFlag.trim().length() == 0 ) ? "" : retRepFlag.trim();
lineType = ( lineType == null || lineType.trim().length() == 0 ) ? "" : lineType.trim();
System.out.println("retRepFlag!!! :"+retRepFlag);
selQuery = "SELECT INV_STAT FROM STOCK "
......@@ -2338,6 +2344,10 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
retQty += sretQty;
}
else if ("F".equalsIgnoreCase(lineType.trim()) )
{
retFreeQty += sretQty;
}
else if ( "P".equalsIgnoreCase(retRepFlag.trim()) )
{
replQty += sretQty;
......@@ -2356,7 +2366,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
pstmt2 = null;////GetRcpQty(String selectedInvList,String itemCode, Connection conn)
System.out.println("retQty :"+retQty);
System.out.println("replQty :"+replQty);
returnLast = retQty - replQty ;
System.out.println("retFreeQty :"+retFreeQty);
returnLast = retQty - replQty -retFreeQty ;
System.out.println("sretQty !!!!!!:"+retQty);
System.out.println("Return quantity cal for avaible transcation id :"+returnLast);
......@@ -2364,18 +2375,20 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
/*------------------------------------------------------------------------------------------------*/
itemList.add(itemCodeLast);
itemListLast.add(itemCodeLast);
System.out.println("replQty :"+replQty);
System.out.println("returnLast :"+returnLast);
System.out.println("receiptLast :"+receiptLast);
System.out.println("retFreeQty :"+retFreeQty);
System.out.println("-------calculate Primary Sales for availble transcaion Id--------");
primarySales=0.0;
if(receiptLast > (returnLast + replQty) )
System.out.println("");
if(receiptLast > (returnLast + retFreeQty) )
{
primarySales = receiptLast - returnLast + replQty;
primarySales = receiptLast - (returnLast + retFreeQty);
}
else
{
......@@ -2419,7 +2432,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<purc_rcp__free>").append("<![CDATA[0.0]]>").append("</purc_rcp__free>");
valueXmlString.append("<purc_ret>").append("<![CDATA["+returnLast+"]]>").append("</purc_ret>");
valueXmlString.append("<purc_ret__repl>").append("<![CDATA["+replQty+"]]>").append("</purc_ret__repl>");
valueXmlString.append("<purc_ret__repl>").append("<![CDATA["+retFreeQty+"]]>").append("</purc_ret__repl>");
valueXmlString.append("<purc_ret__free>").append("<![CDATA[0.0]]>").append("</purc_ret__free>");
valueXmlString.append("<sales>").append("<![CDATA["+salesLast+"]]>").append("</sales>");
......@@ -2501,7 +2514,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
System.out.println("opStkItem :"+opStkItem);
if(!(itemList.contains(itemCode)))
if(!(itemListLast.contains(itemCode)))
{
System.out.println("itemCode of which is not available in last or current transcation "+itemCode);
lineNoItmCnt++;
......@@ -2583,16 +2596,17 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
retQtyAll=0.0;
replQtyAll=0.0;
sretQtyAllTot=0.0;
retFreeQtyAll=0.0;
retRepFlagAll="";
sretSiteCodeAll="";
sretLocCodeAll="";
sretLotSlAll="";
invStat="";
lineTypeAll="";
sql =" 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 "
+ " B.LOT_NO LOT_NO, B.LOT_SL LOT_SL, B.RET_REP_FLAG RET_REP_FLAG,B.line_type "
+ " FROM SRETURN A, SRETURNDET B "
+ " WHERE A.TRAN_ID = B.TRAN_ID "
+ " AND A.CUST_CODE = ? "
......@@ -2620,6 +2634,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
sretLotNoAll = rs.getString("LOT_NO");
sretLotSlAll = rs.getString("LOT_SL");
retRepFlagAll = rs.getString("RET_REP_FLAG");
lineTypeAll = rs.getString("line_type");
System.out.println("sretQtyAll :"+sretQtyAll);
System.out.println("sretSiteCodeAll :"+sretSiteCodeAll);
......@@ -2631,6 +2646,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
retRepFlagAll = ( retRepFlagAll == null || retRepFlagAll.trim().length() == 0 ) ? "" : retRepFlagAll.trim();
lineTypeAll = ( lineTypeAll == null || lineTypeAll.trim().length() == 0 ) ? "" : lineTypeAll.trim();
System.out.println("retRepFlagAll :"+retRepFlagAll);
selQuery = "SELECT INV_STAT FROM STOCK "
......@@ -2656,6 +2672,10 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
retQtyAll += sretQtyAll;
}
else if ( "F".equalsIgnoreCase(lineTypeAll.trim()) )
{
retFreeQtyAll += sretQtyAll;
}
else if ( "P".equalsIgnoreCase(retRepFlag.trim()) )
{
replQtyAll += sretQtyAll;
......@@ -2674,7 +2694,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
pstmt = null;
System.out.println("retQtyAll :"+retQtyAll);
System.out.println("replQty :"+replQty);
sretQtyAllTot= retQtyAll - replQtyAll ;
sretQtyAllTot= retQtyAll - replQtyAll -retFreeQtyAll ;
System.out.println("sretQtyAllTot !!!!!!:"+sretQtyAllTot);
System.out.println("Return quantity for not available in last or current tranaction"+"itemCode :"+itemCode +"Return Quantity :"+sretQtyAllTot);
......@@ -2686,18 +2706,18 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
System.out.println("rcpQty :"+rcpQty);
System.out.println("sretQtyAll :"+sretQtyAll);
System.out.println("replQtyAll :"+replQtyAll);
System.out.println("retFreeQtyAll!!! :"+retFreeQtyAll);
System.out.println("--calculate primary sales which is not included for current or previous month transcation------");
primarySalesAll=0.0;
if(rcpQty > (sretQtyAllTot + replQtyAll))
if(rcpQtyAll > (sretQtyAllTot + retFreeQtyAll))
{
primarySalesAll = rcpQty - sretQtyAllTot + replQtyAll;
primarySalesAll = rcpQtyAll - (sretQtyAllTot + retFreeQtyAll);
}
else
{
primarySalesAll = rcpQty;
primarySalesAll = rcpQtyAll;
}
System.out.println("Primary Sales for not available in last or current tranaction"+"itemCode :"+itemCode +"primarySales :"+primarySales);
System.out.println("Primary Sales for not available in last or current tranaction"+"itemCode :"+itemCode +"primarySales :"+primarySalesAll);
System.out.println("--calculate Transit Quantoty which is not included for current or previous month transcation------");
transitQtyAll=0.0;
......@@ -2743,7 +2763,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
itemMap.put("rcpFreesAll@"+lineNoItmCnt, String.valueOf(rcpFreesAll));
itemMap.put("mquant@"+lineNoItmCnt, String.valueOf(sretQtyAllTot));
itemMap.put("retQty@"+lineNoItmCnt, String.valueOf(retQtyAll));
itemMap.put("replQty@"+lineNoItmCnt, String.valueOf(replQtyAll));
itemMap.put("replQty@"+lineNoItmCnt, String.valueOf(retFreeQtyAll));
itemMap.put("msalesQty@"+lineNoItmCnt, String.valueOf(salesQty));
itemMap.put("rate@"+lineNoItmCnt, String.valueOf(rateAll));
itemMap.put("transitQty@"+lineNoItmCnt, String.valueOf(transitCharQtyAll));
......@@ -2760,10 +2780,10 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
for(int itemDomId = 1 ; itemDomId <= lineNoItmCnt ; itemDomId++)
{
System.out.println("itemList :"+itemList);
System.out.println("itemListLast :"+itemListLast);
System.out.println("itemCode : "+itemMap.get("itemCode@"+itemDomId));
//valueXmlString.append( "<Detail4 dbID='' domID='"+itemDomId+"' objContext='"+currentFormNo+"' selected='N'>\r\n" );
if(itemList.contains(itemMap.get("itemCode@"+itemDomId)))
if(itemListLast.contains(itemMap.get("itemCode@"+itemDomId)))
{
System.out.println("item code in list!!!!!"+itemMap.get("itemCode@"+itemDomId));
//valueXmlString.append("<attribute pkNames=\"\" selected=\"Y\" updateFlag=\"E\" status=\"O\" />");
......@@ -2839,8 +2859,12 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
System.out.println("itemCode1 :"+itemCode1);
rcpQtmDom = Double.parseDouble(genericUtility.getColumnValue("purc_rcp",dom));
System.out.println("rcpQtmDom :"+rcpQtmDom);
rcpFreeQtmDom = Double.parseDouble(genericUtility.getColumnValue("purc_rcp__repl",dom));
System.out.println("rcpFreeQtmDom :"+rcpFreeQtmDom);
retQtyDom = Double.parseDouble(genericUtility.getColumnValue("purc_ret",dom));
System.out.println("retQtyDom :"+retQtyDom);
retQtyFreeDom = Double.parseDouble(genericUtility.getColumnValue("purc_ret__repl",dom));
System.out.println("retQtyFreeDom :"+retQtyFreeDom);
opStkDom = Double.parseDouble(genericUtility.getColumnValue("op_stock",dom));
System.out.println("opStkDom :"+opStkDom);
transitQtyDom = Double.parseDouble(genericUtility.getColumnValue("transit_qty",dom));
......@@ -2880,7 +2904,14 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
}
else if (stockMode.trim().equals("C") || stockMode.trim().equals("A") )
{
salesQtyCal = opStkDom + rcpQtmDom -retQtyDom- clStock;
System.out.println("stockMode :"+stockMode);
System.out.println("opStkDom :"+opStkDom);
System.out.println("rcpQtmDom :"+rcpQtmDom);
System.out.println("rcpFreeQtmDom :"+rcpFreeQtmDom);
System.out.println("retQtyDom :"+retQtyDom);
System.out.println("retQtyFreeDom :"+retQtyFreeDom);
System.out.println("clStock :"+clStock);
salesQtyCal = opStkDom + (rcpQtmDom + rcpFreeQtmDom) -(retQtyDom + retQtyFreeDom)- clStock;
}
System.out.println("salesQtyCal :"+salesQtyCal);
......@@ -3107,7 +3138,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
"UNION " +
" SELECT distinct cinv.invoice_id FROM CUST_STOCK_INV cinv , " +
" invoice invoice WHERE cinv.invoice_id=invoice.invoice_id and invoice.cust_code = ? " +
" and invoice.item_ser= ? and invoice.confirmed = 'Y' and " +
" and invoice.item_ser= ? and invoice.inv_type = ? and invoice.confirmed = 'Y' and " +
"CASE WHEN cinv.dlv_flg IS NULL THEN 'N' ELSE cinv.dlv_flg END='N' and " +
" cinv.invoice_id not in ("+selectedInvList+") ) ";
......@@ -3124,6 +3155,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
pstmt.setTimestamp(9, prdTo );
pstmt.setString(10, custCode );
pstmt.setString(11, itemSer);
pstmt.setString(12, orderType);
rs = pstmt.executeQuery();
while( rs.next() )
......@@ -3423,7 +3455,7 @@ private double GetTransitQty(String tranId, String itemCode, Connection conn) th
"UNION " +
" SELECT distinct cinv.invoice_id FROM CUST_STOCK_INV cinv , " +
" invoice invoice WHERE cinv.invoice_id=invoice.invoice_id and invoice.cust_code = ? " +
" and invoice.item_ser= ? and invoice.confirmed = 'Y' and " +
" and invoice.item_ser= ? and invoice.inv_type = ? and invoice.confirmed = 'Y' and " +
"CASE WHEN cinv.dlv_flg IS NULL THEN 'N' ELSE cinv.dlv_flg END='N' and " +
" cinv.invoice_id not in ("+selectedInvList+") ) ";
......@@ -3440,6 +3472,7 @@ private double GetTransitQty(String tranId, String itemCode, Connection conn) th
pstmt.setTimestamp(9, prdTo );
pstmt.setString(10, custCode );
pstmt.setString(11, itemSer);
pstmt.setString(12, orderType);
rs = pstmt.executeQuery();
while( rs.next() )
......@@ -3717,7 +3750,7 @@ private double GetRcpQty(String custCode, String orderType, String itemSer,Strin
"UNION " +
" SELECT distinct cinv.invoice_id FROM CUST_STOCK_INV cinv , " +
" invoice invoice WHERE cinv.invoice_id=invoice.invoice_id and invoice.cust_code = ? " +
" and invoice.item_ser= ? and invoice.confirmed = 'Y' and " +
" and invoice.item_ser= ? and invoice.inv_type = ? and invoice.confirmed = 'Y' and " +
"CASE WHEN cinv.dlv_flg IS NULL THEN 'N' ELSE cinv.dlv_flg END='N' ) " ;
......@@ -3734,6 +3767,7 @@ private double GetRcpQty(String custCode, String orderType, String itemSer,Strin
pstmt.setTimestamp(9, prdTo );
pstmt.setString(10, custCode );
pstmt.setString(11, itemSer);
pstmt.setString(12, orderType);
rs = pstmt.executeQuery();
while( rs.next() )
......@@ -4094,7 +4128,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
"UNION " +
" SELECT distinct cinv.invoice_id FROM CUST_STOCK_INV cinv , " +
" invoice invoice WHERE cinv.invoice_id=invoice.invoice_id and invoice.cust_code = ? " +
" and invoice.item_ser= ? and invoice.confirmed = 'Y' and " +
" and invoice.item_ser= ? and invoice.inv_type = ? and invoice.confirmed = 'Y' and " +
"CASE WHEN cinv.dlv_flg IS NULL THEN 'N' ELSE cinv.dlv_flg END='N' ) " ;
......@@ -4111,6 +4145,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
pstmt.setTimestamp(9, prdTo );
pstmt.setString(10, custCode );
pstmt.setString(11, itemSer);
pstmt.setString(12, orderType);
rs = pstmt.executeQuery();
while( rs.next() )
......@@ -4691,7 +4726,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
//lds_custstock.settransobject(sqlca)
String tranId="";
System.out.println("calling getItemFromCust @@@@@@@@@@@@@@@@@@@@@@@@!!!!!!!!!!!!!!");
System.out.println("custCode :"+custCode);
System.out.println("itemSer :"+itemSer);
System.out.println("lastTranId :"+lastTranId);
......@@ -4712,12 +4747,12 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
System.out.println("newTranId :"+newTranId);
sql= "select tran_id from cust_stock where cust_code=? and item_ser=? " +
" and tran_id not in (?,?) order by tran_id desc";
" order by tran_id desc";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,custCode);
pstmt.setString(2,itemSer);
pstmt.setString(3,lastTranId);
pstmt.setString(4,newTranId);
//pstmt.setString(3,lastTranId);
//pstmt.setString(4,newTranId);
rs = pstmt.executeQuery();
while( rs.next() )
{
......@@ -4741,7 +4776,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
itemDescr.lsOpStock= rs1.getString("cl_stock");
itemDescr.lsTranId= rs1.getString("tran_id");
System.out.println("item_code >>>"+rs1.getString("item_code"));
System.out.println("item_code which is include >>>"+rs1.getString("item_code"));
defData.add(itemDescr);
itemList.add(itemCode);
......@@ -4765,7 +4800,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
pstmt = null;
/*------------List if Item which are generated for new invoice for new itemcode----------------*/
System.out.println("------List if Item which are generated for new invoice for new itemcode-----");
System.out.println("----!!!!--List if Item which are generated for new invoice for new itemcode-----");
/*sql = "select item_code from invdet where " +
"invoice_id in ("+selectedInvList+") ";*/
......@@ -4788,7 +4823,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
" UNION " +
" SELECT distinct cinv.invoice_id FROM CUST_STOCK_INV cinv ," +
" invoice invoice WHERE cinv.invoice_id=invoice.invoice_id and " +
" invoice.cust_code = ? and invoice.item_ser= ? " +
" invoice.cust_code = ? and invoice.inv_type = ? and invoice.item_ser= ? " +
"and invoice.confirmed = 'Y' and CASE WHEN cinv.dlv_flg IS NULL " +
"THEN 'N' ELSE cinv.dlv_flg END='N')";
......@@ -4804,7 +4839,8 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
pstmt.setTimestamp(7, prdFrDateTstmp);
pstmt.setTimestamp(8, prdToDateTstmp);
pstmt.setString(9, custCode);
pstmt.setString(10, itemSer);
pstmt.setString(10, orderType);
pstmt.setString(11, itemSer);
rs = pstmt.executeQuery();
while( rs.next() )
......@@ -4814,7 +4850,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
if(!(itemList.contains(invItemCode)))
{
System.out.println("New itemcode added :"+invItemCode);
System.out.println("New itemcode added from invoice :"+invItemCode);
itemDescr = new ItemDescr();
itemDescr.lsCode = invItemCode;
itemDescr.lsOpStock= "0.0";
......
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