Commit 70ee1c19 authored by caluka's avatar caluka

updateStockMovement comment release and also compared PB code


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101735 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f9e0097b
...@@ -771,7 +771,7 @@ public class StockUpdate ...@@ -771,7 +771,7 @@ public class StockUpdate
pstmt.close(); pstmt.close();
} }
//errString = updateStockMovement(conn); errString = updateStockMovement(conn);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
return errString; return errString;
...@@ -2590,7 +2590,8 @@ public class StockUpdate ...@@ -2590,7 +2590,8 @@ public class StockUpdate
totIssQty = totIssQty + qty; totIssQty = totIssQty + qty;
totIssValue = totIssValue + amount; totIssValue = totIssValue + amount;
} }
sql = "select sum(qty),sum(val) from (select sum(a.quantity) qty,sum(a.quantity * case when a.rate is null then 0 else a.rate end) val " + //commented by chandrashekar on 27-may-2016
/* sql = "select sum(qty),sum(val) from (select sum(a.quantity) qty,sum(a.quantity * case when a.rate is null then 0 else a.rate end) val " +
"from stock a , invstat b , location c " + "from stock a , invstat b , location c " +
"where a.loc_code = c.loc_code " + "where a.loc_code = c.loc_code " +
"and b.inv_stat = c.inv_stat " + "and b.inv_stat = c.inv_stat " +
...@@ -2620,7 +2621,7 @@ public class StockUpdate ...@@ -2620,7 +2621,7 @@ public class StockUpdate
closeQty = openQty + qty; closeQty = openQty + qty;
closeValue = openValue+ amount; closeValue = openValue+ amount;
rs.close(); rs.close();
pstmt.close(); pstmt.close();*/
sql = "SELECT CODE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE"; sql = "SELECT CODE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE";
System.out.println("SQL :"+sql); System.out.println("SQL :"+sql);
...@@ -2633,6 +2634,13 @@ public class StockUpdate ...@@ -2633,6 +2634,13 @@ public class StockUpdate
rs.close(); rs.close();
pstmt.close(); pstmt.close();
//Start added by chandrashekar on 27-may-2016
if(prdCode == null || prdCode.trim().length()==0)
{
errString = itmDBAccessEJB.getErrorString("","VTPRD1","","",conn);
return errString;
}
//End added by chandrashekar on 27-may-2016
sql = "select count(*) from stock_movement " + sql = "select count(*) from stock_movement " +
"where site_code = '"+this.siteCode+"' and period_code = '"+prdCode+"' " + "where site_code = '"+this.siteCode+"' and period_code = '"+prdCode+"' " +
"and item_code = '"+this.itemCode+"' and lot_no = '"+this.lotNo+"'"; "and item_code = '"+this.itemCode+"' and lot_no = '"+this.lotNo+"'";
...@@ -2645,13 +2653,42 @@ public class StockUpdate ...@@ -2645,13 +2653,42 @@ public class StockUpdate
rs.close(); rs.close();
pstmt.close(); pstmt.close();
if(count == 0){ if(count == 0){
//Start added by chandrashekar on 27-may-2016
sql = "select case when close_qty is null then 0 else close_qty end as close_qty," +
"case when close_value is null then 0 else close_value end as close_value from stock_movement where " +
" site_code = '"+this.siteCode+"' and item_code = '"+this.itemCode+"' " +
" and lot_no = '"+this.lotNo+"' and inv_stat ='"+this.invStat+"' " +
" and period_code = ( select max(period_code) from stock_movement" +
" where site_code = '"+this.siteCode+"' and period_code < ? " +
" and item_code = '"+this.itemCode+"' and lot_no = '"+this.lotNo+"' " +
" and inv_stat ='"+this.invStat+"')";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,prdCode);
rs = pstmt.executeQuery();
if(rs.next()){
openQty = rs.getDouble(1);
openValue = rs.getDouble(2);
}
rs.close();
pstmt.close();
if(this.tranType.equalsIgnoreCase("R")){
closeQty = openQty + qty;
closeValue = openValue+ amount;
}else
{
closeQty = openQty - qty;
closeValue = openValue - amount;
}
//End added by chandrashekar on 27-may-2016
sql = "insert into stock_movement (site_code,period_code,item_code,lot_no," + sql = "insert into stock_movement (site_code,period_code,item_code,lot_no," +
"open_qty,open_value,po_rcp_qty,po_rcp_value,dis_rcp_qty,dis_rcp_value," + "open_qty,open_value,po_rcp_qty,po_rcp_value,dis_rcp_qty,dis_rcp_value," +
"sret_rcp_qty,sret_rcp_value,tot_rcp_qty,tot_rcp_value,wo_iss_qty,wo_iss_value," + "sret_rcp_qty,sret_rcp_value,tot_rcp_qty,tot_rcp_value,wo_iss_qty,wo_iss_value," +
"dis_iss_qty,dis_iss_value,sal_iss_qty,sal_iss_value,po_ret_qty,po_ret_value," + "dis_iss_qty,dis_iss_value,sal_iss_qty,sal_iss_value,po_ret_qty,po_ret_value," +
"sret_iss_qty,sret_iss_value,con_iss_qty,con_iss_value,pm_iss_qty,pm_iss_value," + "sret_iss_qty,sret_iss_value,con_iss_qty,con_iss_value,pm_iss_qty,pm_iss_value," +
"tot_iss_qty,tot_iss_value,adj_qty,adj_value,close_qty,close_value) values (?,?,?,?,?,?," + "tot_iss_qty,tot_iss_value,adj_qty,adj_value,close_qty,close_value,inv_stat) values (?,?,?,?,?,?," +
"?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
System.out.println("SQL :"+sql); System.out.println("SQL :"+sql);
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,this.siteCode); pstmt.setString(1,this.siteCode);
...@@ -2688,81 +2725,90 @@ public class StockUpdate ...@@ -2688,81 +2725,90 @@ public class StockUpdate
pstmt.setDouble(32,adjValue); pstmt.setDouble(32,adjValue);
pstmt.setDouble(33,closeQty); pstmt.setDouble(33,closeQty);
pstmt.setDouble(34,closeValue); pstmt.setDouble(34,closeValue);
pstmt.setString(35,this.invStat);//added by chandrashekar on 27-may-2016
pstmt.executeUpdate(); pstmt.executeUpdate();
}else{ }else{
sql = "update stock_movement " + //Start added by chandrashekar on 27-may-2016
"set open_qty = ?, " + if(!"R".equalsIgnoreCase(this.tranType))
"open_value = ?," + {
"po_rcp_qty = ?," + closeQty = qty * (-1);
"po_rcp_value = ?," + closeValue = amount * (-1);
"dis_rcp_qty = ?," + }
"dis_rcp_value = ?," + //End added by chandrashekar on 27-may-2016
"sret_rcp_qty = ?," + sql = "update stock_movement set " +
"sret_rcp_value = ?," + //" open_qty = ?, " +
"tot_rcp_qty = ?," + //"open_value = ?," +
"tot_rcp_value = ?," + "po_rcp_qty = (case when po_rcp_qty is null then 0 else po_rcp_qty end)+ ?," +
"wo_iss_qty = ?," + "po_rcp_value = (case when po_rcp_value is null then 0 else po_rcp_value end)+?," +
"wo_iss_value = ?," + "dis_rcp_qty = (case when dis_rcp_qty is null then 0 else dis_rcp_qty end)+ ?," +
"dis_iss_qty = ?," + "dis_rcp_value = (case when dis_rcp_value is null then 0 else dis_rcp_value end)+?," +
"dis_iss_value = ?," + "sret_rcp_qty = (case when sret_rcp_qty is null then 0 else sret_rcp_qty end)+ ?," +
"sal_iss_qty = ?," + "sret_rcp_value = (case when sret_rcp_value is null then 0 else sret_rcp_value end) +?," +
"sal_iss_value = ?," + "tot_rcp_qty = (case when tot_rcp_qty is null then 0 else tot_rcp_qty end)+ ?," +
"po_ret_qty = ?," + "tot_rcp_value =(case when tot_rcp_value is null then 0 else tot_rcp_value end)+ ?," +
"po_ret_value = ?," + "wo_iss_qty = (case when wo_iss_qty is null then 0 else wo_iss_qty end) + ?," +
"sret_iss_qty = ?," + "wo_iss_value = (case when wo_iss_value is null then 0 else wo_iss_value end) + ?," +
"sret_iss_value = ?," + "dis_iss_qty = (case when dis_iss_qty is null then 0 else dis_iss_qty end) + ?," +
"con_iss_qty = ?," + "dis_iss_value = (case when dis_iss_value is null then 0 else dis_iss_value end) + ?," +
"con_iss_value = ?," + "sal_iss_qty = (case when sal_iss_qty is null then 0 else sal_iss_qty end)+ ?," +
"pm_iss_qty = ?," + "sal_iss_value = (case when sal_iss_value is null then 0 else sal_iss_value end)+ ?," +
"pm_iss_value = ?," + "po_ret_qty = (case when po_ret_qty is null then 0 else po_ret_qty end) + ?," +
"tot_iss_qty = ?," + "po_ret_value = (case when po_ret_value is null then 0 else po_ret_value end) + ?," +
"tot_iss_value = ?," + "sret_iss_qty = (case when sret_iss_qty is null then 0 else sret_iss_qty end) + ?," +
"adj_qty = ?," + "sret_iss_value = (case when sret_iss_value is null then 0 else sret_iss_value end)+ ?," +
"adj_value = ?," + "con_iss_qty = (case when con_iss_qty is null then 0 else con_iss_qty end) + ?," +
"close_qty = ?," + "con_iss_value = (case when con_iss_value is null then 0 else con_iss_value end) + ?," +
"close_value = ? " + "pm_iss_qty = (case when pm_iss_qty is null then 0 else pm_iss_qty end) + ?," +
"pm_iss_value = (case when pm_iss_value is null then 0 else pm_iss_value end) + ?," +
"tot_iss_qty = (case when tot_iss_qty is null then 0 else tot_iss_qty end) + ?," +
"tot_iss_value = (case when tot_iss_value is null then 0 else tot_iss_value end) + ?," +
"adj_qty = (case when adj_qty is null then 0 else adj_qty end)+ ?," +
"adj_value = (case when adj_value is null then 0 else adj_value end) + ?," +
"close_qty = (case when close_qty is null then 0 else close_qty end)+ ?," +
"close_value = (case when close_value is null then 0 else close_value end) + ? " +
"where site_code = ? " + "where site_code = ? " +
"and period_code = ? " + "and period_code = ? " +
"and item_code = ? " + "and item_code = ? " +
"and lot_no = ? "; "and lot_no = ? and inv_stat = ? ";
System.out.println("SQL :: "+sql); System.out.println("SQL :: "+sql);
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,openQty); // pstmt.setDouble(1,openQty);
pstmt.setDouble(2,openValue); // pstmt.setDouble(2,openValue);
pstmt.setDouble(3,poRcpQty); pstmt.setDouble(1,poRcpQty);
pstmt.setDouble(4,poRcpValue); pstmt.setDouble(2,poRcpValue);
pstmt.setDouble(5,disRcpQty); pstmt.setDouble(3,disRcpQty);
pstmt.setDouble(6,disRcpValue); pstmt.setDouble(4,disRcpValue);
pstmt.setDouble(7,sretRcpQty); pstmt.setDouble(5,sretRcpQty);
pstmt.setDouble(8,sretRcpValue); pstmt.setDouble(6,sretRcpValue);
pstmt.setDouble(9,totRcpQty); pstmt.setDouble(7,totRcpQty);
pstmt.setDouble(10,totRcpValue); pstmt.setDouble(8,totRcpValue);
pstmt.setDouble(11,woIssQty); pstmt.setDouble(9,woIssQty);
pstmt.setDouble(12,woIssValue); pstmt.setDouble(10,woIssValue);
pstmt.setDouble(13,disIssQty); pstmt.setDouble(11,disIssQty);
pstmt.setDouble(14,disIssValue); pstmt.setDouble(12,disIssValue);
pstmt.setDouble(15,salIssQty); pstmt.setDouble(13,salIssQty);
pstmt.setDouble(16,salIssValue); pstmt.setDouble(14,salIssValue);
pstmt.setDouble(17,poRetQty); pstmt.setDouble(15,poRetQty);
pstmt.setDouble(18,poRetValue); pstmt.setDouble(16,poRetValue);
pstmt.setDouble(19,sretIssQty); pstmt.setDouble(17,sretIssQty);
pstmt.setDouble(20,sretIssValue); pstmt.setDouble(18,sretIssValue);
pstmt.setDouble(21,conIssQty); pstmt.setDouble(19,conIssQty);
pstmt.setDouble(22,conIssValue); pstmt.setDouble(20,conIssValue);
pstmt.setDouble(23,0); pstmt.setDouble(21,0);
pstmt.setDouble(24,0); pstmt.setDouble(22,0);
pstmt.setDouble(25,totIssQty); pstmt.setDouble(23,totIssQty);
pstmt.setDouble(26,totIssValue); pstmt.setDouble(24,totIssValue);
pstmt.setDouble(27,adjQty); pstmt.setDouble(25,adjQty);
pstmt.setDouble(28,adjValue); pstmt.setDouble(26,adjValue);
pstmt.setDouble(29,closeQty); pstmt.setDouble(27,closeQty);
pstmt.setDouble(30,closeValue); pstmt.setDouble(28,closeValue);
pstmt.setString(31,this.siteCode); pstmt.setString(29,this.siteCode);
pstmt.setString(32,prdCode); pstmt.setString(30,prdCode);
pstmt.setString(33,this.itemCode); pstmt.setString(31,this.itemCode);
pstmt.setString(34,this.lotNo); pstmt.setString(32,this.lotNo);
pstmt.setString(33,this.invStat);//added by chandrashekar on 27-may-2016
pstmt.executeUpdate(); pstmt.executeUpdate();
} }
......
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