midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BF [ 2584790 ] Material Receipt error 

https://sourceforge.net/tracker/index.php?func=detail&aid=2584790&group_id=176962&atid=879332

* correctly close ResultSets
This commit is contained in:
teo_sarca 2009-02-13 09:44:51 +00:00
parent 53f27cbd6b
commit 019d1a66a1
2 changed files with 85 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
client/src/org/compiere/grid/VCreateFrom.java
View File

@ -85,6 +85,7 @@ import org.compiere.util.TrxRunnable;
* <li>FR [ 1794050 ] Usability: VCreateFrom OK button always enabled * <li>FR [ 1794050 ] Usability: VCreateFrom OK button always enabled
* <li>FR [ 1974354 ] VCreateFrom.create should be more flexible * <li>FR [ 1974354 ] VCreateFrom.create should be more flexible
* <li>BF [ 2007837 ] VCreateFrom.save() should run in trx * <li>BF [ 2007837 ] VCreateFrom.save() should run in trx
* <li>BF [ 2584790 ] Material Receipt error
* @author Victor Perez, e-Evolucion * @author Victor Perez, e-Evolucion
* <li> RF [1811114] http://sourceforge.net/tracker/index.php?func=detail&aid=1811114&group_id=176962&atid=879335 * <li> RF [1811114] http://sourceforge.net/tracker/index.php?func=detail&aid=1811114&group_id=176962&atid=879335
* @author Karsten Thiemann, Schaeffer AG * @author Karsten Thiemann, Schaeffer AG
@ -444,6 +445,15 @@ public abstract class VCreateFrom extends CDialog
{ {
return p_initOK; return p_initOK;
} // isInitOK } // isInitOK
/**
* Get Warehouse from window's context
* @return warehouse id
*/
public int getM_Warehouse_ID()
{
return Env.getContextAsInt(Env.getCtx(), p_WindowNo, "M_Warehouse_ID");
}
/** /**
* Dynamic Init * Dynamic Init
@ -510,7 +520,8 @@ public abstract class VCreateFrom extends CDialog
} }
// Select All // Select All
// Trifon // Trifon
else if (e.getActionCommand().equals(SELECT_ALL)) { else if (e.getActionCommand().equals(SELECT_ALL))
{
TableModel model = dataTable.getModel(); TableModel model = dataTable.getModel();
int rows = model.getRowCount(); int rows = model.getRowCount();
for (int i = 0; i < rows; i++) for (int i = 0; i < rows; i++)
@ -589,31 +600,39 @@ public abstract class VCreateFrom extends CDialog
+ " AND o.C_Order_ID IN " + " AND o.C_Order_ID IN "
+ "(SELECT ol.C_Order_ID FROM C_OrderLine ol" + "(SELECT ol.C_Order_ID FROM C_OrderLine ol"
+ " WHERE ol.QtyOrdered - ").append(column).append(" != 0) "); + " WHERE ol.QtyOrdered - ").append(column).append(" != 0) ");
if(sameWarehouseOnly) { if(sameWarehouseOnly)
{
sql = sql.append(" AND o.M_Warehouse_ID=? "); sql = sql.append(" AND o.M_Warehouse_ID=? ");
} }
sql = sql.append("ORDER BY o.DateOrdered"); sql = sql.append("ORDER BY o.DateOrdered");
//
PreparedStatement pstmt = null;
ResultSet rs = null;
try try
{ {
PreparedStatement pstmt = DB.prepareStatement(sql.toString(), null); pstmt = DB.prepareStatement(sql.toString(), null);
pstmt.setInt(1, C_BPartner_ID); pstmt.setInt(1, C_BPartner_ID);
if(sameWarehouseOnly) { if(sameWarehouseOnly)
{
//only active for material receipts //only active for material receipts
pstmt.setInt(2, Env.getContextAsInt(Env.getCtx(), p_WindowNo, "M_Warehouse_ID")); pstmt.setInt(2, getM_Warehouse_ID());
} }
ResultSet rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {
pp = new KeyNamePair(rs.getInt(1), rs.getString(2)); pp = new KeyNamePair(rs.getInt(1), rs.getString(2));
orderField.addItem(pp); orderField.addItem(pp);
} }
rs.close();
pstmt.close();
} }
catch (SQLException e) catch (SQLException e)
{ {
log.log(Level.SEVERE, sql.toString(), e); log.log(Level.SEVERE, sql.toString(), e);
} }
finally
{
DB.close(rs, pstmt);
rs = null; pstmt = null;
}
orderField.setSelectedIndex(0); orderField.setSelectedIndex(0);
orderField.addActionListener(this); orderField.addActionListener(this);
this.pack(); this.pack();

107
client/src/org/compiere/grid/VCreateFromShipment.java
View File

@ -69,6 +69,7 @@ import org.compiere.util.Msg;
* *
* @author Teo Sarca, www.arhipac.ro * @author Teo Sarca, www.arhipac.ro
* <li>BF [ 2007837 ] VCreateFrom.save() should run in trx * <li>BF [ 2007837 ] VCreateFrom.save() should run in trx
* <li>BF [ 2584790 ] Material Receipt error
*/ */
public class VCreateFromShipment extends VCreateFrom implements VetoableChangeListener public class VCreateFromShipment extends VCreateFrom implements VetoableChangeListener
{ {
@ -79,44 +80,46 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi
/** /**
* Cell editor specific for the MLocator in this form's table. * Cell editor specific for the MLocator in this form's table.
*
*/ */
public class InnerLocatorTableCellEditor extends AbstractCellEditor public class InnerLocatorTableCellEditor extends AbstractCellEditor
implements TableCellEditor, CellEditorListener implements TableCellEditor, CellEditorListener
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private KeyNamePair m_locatorKey; private KeyNamePair m_locatorKey;
private VLocator v_loc; private VLocator m_editor;
private JTable m_table; private JTable m_table;
private int m_row; private int m_row;
private int m_column; private int m_column;
public InnerLocatorTableCellEditor() { public InnerLocatorTableCellEditor()
{
addCellEditorListener(this); addCellEditorListener(this);
} }
public Object getCellEditorValue() { public Object getCellEditorValue()
return(m_locatorKey); {
return m_locatorKey;
} }
/** /**
* *
* @param table * @param table
* @param value The current value in the cell. In this case, a KeyName pair of the locator * @param value The current value in the cell. In this case, a KeyName pair of the locator
* @param isSelected * @param isSelected
* @param row * @param row
* @param column * @param column
* @return * @return
*/ */
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column)
{
m_table = table; m_table = table;
m_row = row; m_row = row;
m_column = column; m_column = column;
m_locatorKey = (KeyNamePair)value; m_locatorKey = (KeyNamePair)value;
MLocatorLookup mLocatorLookup = new MLocatorLookup(Env.getCtx(), 0); MLocatorLookup mLocatorLookup = new MLocatorLookup(Env.getCtx(), 0);
v_loc = new VLocator("M_Locator_ID", true, false, true, mLocatorLookup, 0); m_editor = new VLocator("M_Locator_ID", true, false, true, mLocatorLookup, 0);
v_loc.setValue(m_locatorKey.getKey()); m_editor.setValue(m_locatorKey.getKey());
return(v_loc); return m_editor;
} }
/** /**
@ -125,11 +128,13 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi
* *
* @param e * @param e
*/ */
public void editingStopped(ChangeEvent e) { public void editingStopped(ChangeEvent e)
{
// Editing ends, save value // Editing ends, save value
if (v_loc.getValue()!=null) { if (m_editor.getValue() != null)
int key = ((Integer)v_loc.getValue()).intValue(); {
MLocator locator = new MLocator(Env.getCtx(), key, null); int key = ((Integer)m_editor.getValue()).intValue();
MLocator locator = MLocator.get(Env.getCtx(), key);
m_locatorKey = new KeyNamePair(key, locator.getValue()); m_locatorKey = new KeyNamePair(key, locator.getValue());
m_table.getModel().setValueAt(m_locatorKey, m_row, m_column); m_table.getModel().setValueAt(m_locatorKey, m_row, m_column);
} }
@ -139,8 +144,8 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi
* When editing stops, do nothing. * When editing stops, do nothing.
* @param e * @param e
*/ */
public void editingCanceled(ChangeEvent e) { public void editingCanceled(ChangeEvent e)
{
} }
} }
@ -569,7 +574,7 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi
KeyNamePair pp = new KeyNamePair(rs.getInt(3), rs.getString(4).trim()); KeyNamePair pp = new KeyNamePair(rs.getInt(3), rs.getString(4).trim());
line.add(pp); // 2-UOM line.add(pp); // 2-UOM
// Add locator // Add locator
line.add(getKeyDefaultLocator(rs.getInt(5), rs.getString(6)));// 3-Locator line.add(getLocatorKeyNamePair(rs.getInt(5)));// 3-Locator
// Add product // Add product
pp = new KeyNamePair(rs.getInt(7), rs.getString(8)); pp = new KeyNamePair(rs.getInt(7), rs.getString(8));
line.add(pp); // 4-Product line.add(pp); // 4-Product
@ -659,7 +664,7 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi
KeyNamePair pp = new KeyNamePair(rs.getInt(3), rs.getString(4).trim()); KeyNamePair pp = new KeyNamePair(rs.getInt(3), rs.getString(4).trim());
line.add(pp); // 2-UOM line.add(pp); // 2-UOM
// Add locator // Add locator
line.add(getKeyDefaultLocator(rs.getInt(5), rs.getString(6))); // 3-Locator line.add(getLocatorKeyNamePair(rs.getInt(5))); // 3-Locator
pp = new KeyNamePair(rs.getInt(7), rs.getString(8)); pp = new KeyNamePair(rs.getInt(7), rs.getString(8));
line.add(pp); // 4-Product line.add(pp); // 4-Product
line.add(rs.getString(9)); // 5-VendorProductNo line.add(rs.getString(9)); // 5-VendorProductNo
@ -748,7 +753,7 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi
line.add(rs.getBigDecimal(3)); // 1-Qty line.add(rs.getBigDecimal(3)); // 1-Qty
KeyNamePair pp = new KeyNamePair(rs.getInt(6), rs.getString(7)); KeyNamePair pp = new KeyNamePair(rs.getInt(6), rs.getString(7));
line.add(pp); // 2-UOM line.add(pp); // 2-UOM
line.add(getKeyDefaultLocator(0,null)); line.add(getLocatorKeyNamePair(0));
pp = new KeyNamePair(rs.getInt(4), rs.getString(5)); pp = new KeyNamePair(rs.getInt(4), rs.getString(5));
line.add(pp); // 4-Product line.add(pp); // 4-Product
line.add(null); //5-Vendor Product No line.add(null); //5-Vendor Product No
@ -1002,37 +1007,29 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi
/** /**
* get KeyNamePair for Locator * Get KeyNamePair for Locator.
* If no locator specified or the specified locator is not valid (e.g. warehouse not match),
* a default one will be used.
* @param M_Locator_ID * @param M_Locator_ID
* @param value
* @return KeyNamePair * @return KeyNamePair
*/ */
protected KeyNamePair getKeyDefaultLocator(int M_Locator_ID, String value) protected KeyNamePair getLocatorKeyNamePair(int M_Locator_ID)
{
KeyNamePair pp = null ;
if(M_Locator_ID == 0)
{
MLocator locator = getM_Locator();
if (locator != null)
{
pp = new KeyNamePair(locator.get_ID(), locator.getValue());
}
}
else
{
pp = new KeyNamePair(M_Locator_ID, value);
}
return pp;
}
/**
* Get Locator from Order or locatorField
* @return MLocator
*/
protected MLocator getM_Locator()
{ {
MLocator locator = null; MLocator locator = null;
if (p_order != null)
// Load desired Locator
if (M_Locator_ID > 0)
{
locator = MLocator.get(Env.getCtx(), M_Locator_ID);
// Validate warehouse
if (locator != null && locator.getM_Warehouse_ID() != getM_Warehouse_ID())
{
locator = null;
}
}
// Try to use default locator from Order Warehouse
if (locator == null && p_order != null && p_order.getM_Warehouse_ID() == getM_Warehouse_ID())
{ {
MWarehouse wh = MWarehouse.get(Env.getCtx(), p_order.getM_Warehouse_ID()); MWarehouse wh = MWarehouse.get(Env.getCtx(), p_order.getM_Warehouse_ID());
if (wh != null) if (wh != null)
@ -1040,14 +1037,26 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi
locator = wh.getDefaultLocator(); locator = wh.getDefaultLocator();
} }
} }
// Try to get from locator field
if (locator == null) if (locator == null)
{ {
Integer M_Locator_ID = (Integer) locatorField.getValue(); Integer id = (Integer) locatorField.getValue();
if (M_Locator_ID != null && M_Locator_ID > 0) if (id != null && id > 0)
{ {
locator = MLocator.get(Env.getCtx(), M_Locator_ID); locator = MLocator.get(Env.getCtx(), id);
} }
} }
return locator; // Validate Warehouse
if (locator == null || locator.getM_Warehouse_ID() != getM_Warehouse_ID())
{
locator = MWarehouse.get(Env.getCtx(), getM_Warehouse_ID()).getDefaultLocator();
}
KeyNamePair pp = null ;
if (locator != null)
{
pp = new KeyNamePair(locator.get_ID(), locator.getValue());
}
return pp;
} }
} // VCreateFromShipment } // VCreateFromShipment