Skip to content

B
business-java
Commit ec50fcd4 authored by ngadkari's avatar ngadkari
Browse files
Options

dispatch entry for Non Inventory Item. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@186961 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 530b4c78
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 19 deletions
webitm-dis/ibase/webitm/ejb/dis/PostOrdDespatchGen.java
View file @ ec50fcd4
...@@ -519,13 +519,20 @@ public class PostOrdDespatchGen ...@@ -519,13 +519,20 @@ public class PostOrdDespatchGen
if("0".equals(stkOpt)) if("0".equals(stkOpt))
{ {
//System.out.println("0.equals(stkOpt)"); //System.out.println("0.equals(stkOpt)");
sql=" select line_no, exp_lev, item_code__ord, quantity, item_code, quantity qty_alloc,lot_no,lot_sl," + /*sql=" select line_no, exp_lev, item_code__ord, quantity, item_code, quantity qty_alloc,lot_no,lot_sl," +
"loc_code,unit unit__std,1 conv__qty_stduom, unit,exp_date, site_code,mfg_date,site_code__mfg " + "loc_code,unit unit__std,1 conv__qty_stduom, unit,exp_date, site_code,mfg_date,site_code__mfg " +
"from sorditem " + "from sorditem " +
"where sale_order = ? " + "where sale_order = ? " +
"and line_no =? " + "and line_no =? " +
"and site_code = ? " + "and site_code = ? " +
"and (status <> 'I' or status is null) order by item_code, line_no "; "and (status <> 'I' or status is null) order by item_code, line_no ";*/ //commented by nandkumar gadkari on 27/06/18 for Non Inventory Item.
sql=" select line_no, exp_lev, item_code__ord, quantity, item_code, quantity qty_alloc," +
"unit unit__std,1 conv__qty_stduom, unit, site_code " +
"from sorditem " +
"where sale_order = ? " +
"and line_no =? " +
"and site_code = ? " +
"and (status <> 'I' or status is null) order by item_code, line_no ";// changes in sql by nandkumar gadkari on 27/06/18
} }
else else
{ {
...@@ -565,16 +572,20 @@ public class PostOrdDespatchGen ...@@ -565,16 +572,20 @@ public class PostOrdDespatchGen
quantityStd =rs2.getDouble("quantity"); quantityStd =rs2.getDouble("quantity");
itemCode =rs2.getString("item_code"); itemCode =rs2.getString("item_code");
qtyAllocStd =rs2.getDouble("qty_alloc"); qtyAllocStd =rs2.getDouble("qty_alloc");
lotNo =rs2.getString("lot_no");
lotSl =rs2.getString("lot_sl");
locCode =rs2.getString("loc_code");
unitStd =checkNull(rs2.getString("unit__std")).trim(); unitStd =checkNull(rs2.getString("unit__std")).trim();
convQtyStduom =rs2.getDouble("conv__qty_stduom"); convQtyStduom =rs2.getDouble("conv__qty_stduom");
unit =checkNull(rs2.getString("unit")).trim(); unit =checkNull(rs2.getString("unit")).trim();
expDate =rs2.getDate("exp_date");
siteCde =rs2.getString("site_code"); siteCde =rs2.getString("site_code");
if(!"0".equals(stkOpt))// condition added by nandkumar gadkari on 27/06/18
{
lotNo =rs2.getString("lot_no");
lotSl =rs2.getString("lot_sl");
locCode =rs2.getString("loc_code");
expDate =rs2.getDate("exp_date");
mfgDate =rs2.getDate("mfg_date"); mfgDate =rs2.getDate("mfg_date");
siteCodeMfg =rs2.getString("site_code__mfg"); siteCodeMfg =rs2.getString("site_code__mfg");
}
/*System.out.println("lineNoOrd ======="+lineNoOrd); /*System.out.println("lineNoOrd ======="+lineNoOrd);
System.out.println("expLev ======="+expLev); System.out.println("expLev ======="+expLev);
...@@ -1677,7 +1688,21 @@ public class PostOrdDespatchGen ...@@ -1677,7 +1688,21 @@ public class PostOrdDespatchGen
sumNetAmt+=((Double)sordDetMap.get("quantity__stduom")*(Double)sordDetMap.get("rate__stduom")); sumNetAmt+=((Double)sordDetMap.get("quantity__stduom")*(Double)sordDetMap.get("rate__stduom"));
//System.out.println("Sum Amount After "+lineNumber+" @@@===" + sumNetAmt); //System.out.println("Sum Amount After "+lineNumber+" @@@===" + sumNetAmt);
//Added by nandkumar gadkari on 27/06/18-----------Start---------------
sql = "select stk_opt from item where item_code = ? ";
pstmt3 = conn.prepareStatement(sql);
pstmt3.setString(1,checkNull(sordDetMap.get("item_code").toString()));
rs3 = pstmt3.executeQuery();
if(rs3.next())
{
stkOpt = rs3.getString("stk_opt");
}
rs3.close();
rs3 = null;
pstmt3.close();
pstmt3 = null;
//Added by nandkumar gadkari on 27/06/18-----------end---------------
sql="insert into despatchdet(DESP_ID,LINE_NO,SORD_NO,LINE_NO__SORD,EXP_LEV,ITEM_CODE__ORD,ITEM_CODE," + sql="insert into despatchdet(DESP_ID,LINE_NO,SORD_NO,LINE_NO__SORD,EXP_LEV,ITEM_CODE__ORD,ITEM_CODE," +
"LOT_NO ,LOT_SL,QUANTITY__ORD,QUANTITY,LOC_CODE ,STATUS," + "LOT_NO ,LOT_SL,QUANTITY__ORD,QUANTITY,LOC_CODE ,STATUS," +
"CONV__QTY_STDUOM,UNIT__STD,UNIT,QUANTITY__STDUOM,QUANTITY_REAL," + "CONV__QTY_STDUOM,UNIT__STD,UNIT,QUANTITY__STDUOM,QUANTITY_REAL," +
...@@ -1695,11 +1720,30 @@ public class PostOrdDespatchGen ...@@ -1695,11 +1720,30 @@ public class PostOrdDespatchGen
pstmtdDet.setString(5,checkNull(sordDetMap.get("exp_lev").toString()));// pstmtdDet.setString(5,checkNull(sordDetMap.get("exp_lev").toString()));//
pstmtdDet.setString(6,checkNull(sordDetMap.get("item_code__ord").toString())); pstmtdDet.setString(6,checkNull(sordDetMap.get("item_code__ord").toString()));
pstmtdDet.setString(7,checkNull(sordDetMap.get("item_code").toString())); pstmtdDet.setString(7,checkNull(sordDetMap.get("item_code").toString()));
pstmtdDet.setString(8,checkNull(sordDetMap.get("lot_no").toString())); //Added by nandkumar gadkari on 27/06/18
pstmtdDet.setString(9,checkNull(sordDetMap.get("lot_sl").toString())); if(!"0".equals(stkOpt))
{
pstmtdDet.setString(8,checkNull(sordDetMap.get("lot_no").toString()));
pstmtdDet.setString(9,checkNull(sordDetMap.get("lot_sl").toString()));
pstmtdDet.setString(12,sordDetMap.get("loc_code").toString());
pstmtdDet.setDate(22,(Date) sordDetMap.get("mfg_date"));
pstmtdDet.setDate(23,(Date) sordDetMap.get("exp_date"));//
pstmtdDet.setString(24,sordDetMap.get("site_code__mfg").toString());
}
else
{
pstmtdDet.setString(8," ");
pstmtdDet.setString(9," ");
pstmtdDet.setString(12," ");
pstmtdDet.setDate(22,null);
pstmtdDet.setDate(23,null);//
pstmtdDet.setString(24," ");
}
/* pstmtdDet.setString(8,checkNull(sordDetMap.get("lot_no").toString()));
pstmtdDet.setString(9,checkNull(sordDetMap.get("lot_sl").toString())); *///commented by nandkumar gadkari on 27/06/18
pstmtdDet.setDouble(10,(Double)sordDetMap.get("quantity__ord")); pstmtdDet.setDouble(10,(Double)sordDetMap.get("quantity__ord"));
pstmtdDet.setDouble(11,(Double)sordDetMap.get("quantity")); pstmtdDet.setDouble(11,(Double)sordDetMap.get("quantity"));
pstmtdDet.setString(12,sordDetMap.get("loc_code").toString()); //pstmtdDet.setString(12,sordDetMap.get("loc_code").toString());//commented by nandkumar gadkari on 27/06/18
pstmtdDet.setString(13,sordDetMap.get("status").toString()); pstmtdDet.setString(13,sordDetMap.get("status").toString());
pstmtdDet.setDouble(14,(Double)sordDetMap.get("conv__qty_stduom")); pstmtdDet.setDouble(14,(Double)sordDetMap.get("conv__qty_stduom"));
pstmtdDet.setString(15,sordDetMap.get("unit__std").toString()); pstmtdDet.setString(15,sordDetMap.get("unit__std").toString());
...@@ -1710,9 +1754,9 @@ public class PostOrdDespatchGen ...@@ -1710,9 +1754,9 @@ public class PostOrdDespatchGen
pstmtdDet.setDouble(19,(Double)sordDetMap.get("rate__stduom")); pstmtdDet.setDouble(19,(Double)sordDetMap.get("rate__stduom"));
pstmtdDet.setDouble(20,(Double)sordDetMap.get("no_art"));// pstmtdDet.setDouble(20,(Double)sordDetMap.get("no_art"));//
pstmtdDet.setString(21,sordDetMap.get("site_code").toString()); pstmtdDet.setString(21,sordDetMap.get("site_code").toString());
pstmtdDet.setDate(22,(Date) sordDetMap.get("mfg_date")); /*pstmtdDet.setDate(22,(Date) sordDetMap.get("mfg_date"));
pstmtdDet.setDate(23,(Date) sordDetMap.get("exp_date"));// pstmtdDet.setDate(23,(Date) sordDetMap.get("exp_date"));//
pstmtdDet.setString(24,sordDetMap.get("site_code__mfg").toString()); pstmtdDet.setString(24,sordDetMap.get("site_code__mfg").toString());*///commented by nandkumar gadkari on 27/06/18
pstmtdDet.setDouble(25,(Double)sordDetMap.get("rate__clg")); pstmtdDet.setDouble(25,(Double)sordDetMap.get("rate__clg"));
//pstmt.setDouble(26, checkDoubleNullVal((Double) sordDetMap.get("disc_amt"))); //pstmt.setDouble(26, checkDoubleNullVal((Double) sordDetMap.get("disc_amt")));
......
webitm-dis/ibase/webitm/ejb/dis/PostOrderProcess.java
View file @ ec50fcd4
...@@ -2197,6 +2197,10 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -2197,6 +2197,10 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
unitStd = sordItemBean.getUnitStd(); unitStd = sordItemBean.getUnitStd();
System.out.println("@@@unit["+unit+"]"); System.out.println("@@@unit["+unit+"]");
System.out.println("@@@unitStd["+unitStd+"]"); System.out.println("@@@unitStd["+unitStd+"]");
int stockcnt=0;
if(stockOpt != 0)// Condition Added by Nandkumar Gadkari on 27/06/18 for Non Inventory Item.
{
sql = " select sum(a.quantity - case when a.alloc_qty is null then 0 else a.alloc_qty end - case when a.hold_qty is null then 0 else a.hold_qty end ) as quantity "; sql = " select sum(a.quantity - case when a.alloc_qty is null then 0 else a.alloc_qty end - case when a.hold_qty is null then 0 else a.hold_qty end ) as quantity ";
sql = sql + "from stock a, invstat b, location c "; sql = sql + "from stock a, invstat b, location c ";
...@@ -2258,7 +2262,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -2258,7 +2262,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
pstmt5.setString(1,itemCode); pstmt5.setString(1,itemCode);
pstmt5.setString(2,siteCode); pstmt5.setString(2,siteCode);
rs5 = pstmt5.executeQuery(); rs5 = pstmt5.executeQuery();
int stockcnt=0; //int stockcnt=0; // commented by Nandkumar Gadkari on 27/06/18
//added lockqty by arun //added lockqty by arun
stockTot=0.0; stockTot=0.0;
lockqty=0.0; lockqty=0.0;
...@@ -2325,8 +2329,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -2325,8 +2329,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
System.out.println("stockQtyTot :"+stockQtyTot); System.out.println("stockQtyTot :"+stockQtyTot);
if(stockOpt != 0) /*if(stockOpt != 0)
{ {*/// Condition commented by Nandkumar Gadkari on 27/06/18 for Non Inventory Item.
//1.Check Stock Quantity Avaibality //1.Check Stock Quantity Avaibality
System.out.println("stockQtyTot["+stockQtyTot+"]"+"sordItmQty["+sordItmQty+"]"); System.out.println("stockQtyTot["+stockQtyTot+"]"+"sordItmQty["+sordItmQty+"]");
if(stockQtyTot < sordItmQty) if(stockQtyTot < sordItmQty)
...@@ -3533,7 +3537,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -3533,7 +3537,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
System.out.println("---------------------------------------------------------"); System.out.println("---------------------------------------------------------");
/*----------------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------------*/
}//end of if(stockOpt != 0) //}//end of if(stockOpt != 0) // commented by Nandkumar Gadkari on 27/06/18 for Non Inventory Item.
stockList.add(stockBean); stockList.add(stockBean);
...@@ -3560,8 +3564,82 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -3560,8 +3564,82 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}//end of while }//end of while
rs5.close();
rs5 = null;
pstmt5.close();
pstmt5 = null;
// changes by arun start 30-11-17 // changes by arun start 30-11-17
}//end of if(stockOpt != 0)
else // else condition by Nandkumar Gadkari on 27/06/18 for Non Inventory Item.
{
StockBean stockBean = new StockBean();
stockBean.setSordItemBean(sordItemBean);
if(stockQtyTot < sordItmQty)
{
stockQtyTot=0.0;
sql = "select site_code__supp from siteitem where " +
" site_code = ? and item_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,itemCode);
rs = pstmt.executeQuery();
if(rs.next())
{
siteCodeSupp = checkNull(rs.getString("site_code__supp"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(siteCodeSupp.trim().length() == 0)
{
sql = "select site_code__supp from " +
" site where site_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
siteCodeSupp = checkNull(rs.getString("site_code__supp"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
}// if(stockQty < sordItmQty)
netQuantity = sordItmQty;
System.out.println("netQuantity >>>>>>"+netQuantity);
sql = "select (case when track_shelf_life is null then 'N' else track_shelf_life end )" +
" as track_shelf_life from item where item_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
rs = pstmt.executeQuery();
if(rs.next())
{
trackShelfLife = rs.getString("track_shelf_life");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
records = records + 1;
totAlloc = totAlloc + sordItmQty;
System.out.println("records@["+records+"]");
isRejected=true;
stockBean.setRejected(isRejected);
stockList.add(stockBean);
} //end of else(stockOpt != 0)
/*System.out.println(" Ratefild insert into loop["+rateFailed+"]"); /*System.out.println(" Ratefild insert into loop["+rateFailed+"]");
System.out.println("Before stockTot<>>><<<<<<<>"+stockTot+"]"); System.out.println("Before stockTot<>>><<<<<<<>"+stockTot+"]");
System.out.println("Before netQuantity<>>><<<<<<<>"+netQuantity+"]");*/ System.out.println("Before netQuantity<>>><<<<<<<>"+netQuantity+"]");*/
...@@ -3620,10 +3698,10 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -3620,10 +3698,10 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
System.out.println("@@@@@@@@@@@@@@@@@@@@@@@test stockList[[["+stockList.toString()+"]]]"); System.out.println("@@@@@@@@@@@@@@@@@@@@@@@test stockList[[["+stockList.toString()+"]]]");
System.out.println("stockcnt"+stockcnt); System.out.println("stockcnt"+stockcnt);
rs5.close(); /*rs5.close();
rs5 = null; rs5 = null;
pstmt5.close(); pstmt5.close();
pstmt5 = null; pstmt5 = null;*/
//Pavan R Start 12/JAN/18 //Pavan R Start 12/JAN/18
String sqlAlloc=""; String sqlAlloc="";
......
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