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

IDEMPIERE-3441 - peer review - solved bugs and some conceptual errors in the way import is expected to behave

This commit is contained in:
Carlos Ruiz 2017-12-06 15:10:38 +01:00
parent eb729142e7
commit 74cd2d1078
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
org.adempiere.base/src/org/eevolution/process/ImportInventoryMove.java
View File

@ -61,6 +61,8 @@ public class ImportInventoryMove extends SvrProcess
private boolean m_IsImportOnlyNoErrors = true; private boolean m_IsImportOnlyNoErrors = true;
private boolean m_ErrorsFound = false;
private String m_docAction = MMovement.DOCACTION_Prepare; private String m_docAction = MMovement.DOCACTION_Prepare;
private boolean isImported = false; private boolean isImported = false;
@ -127,13 +129,18 @@ public class ImportInventoryMove extends SvrProcess
private void importRecords() private void importRecords()
{ {
if (m_IsImportOnlyNoErrors && m_ErrorsFound)
return; // not importing because error were found
isImported = false; isImported = false;
for(X_I_Movement imove : getRecords(false,m_IsImportOnlyNoErrors)) for(X_I_Movement imove : getRecords(false,true))
{ {
MMovement mov = importMInventoryMove(imove); MMovement mov = importMInventoryMove(imove);
if(mov!= null) if(mov!= null)
{ {
imove.setM_Movement_ID(mov.getM_Movement_ID());
imove.saveEx();
isImported = importMInventoryMoveLine(mov,imove); isImported = importMInventoryMoveLine(mov,imove);
} }
else else
@ -143,7 +150,6 @@ public class ImportInventoryMove extends SvrProcess
if(isImported) if(isImported)
{ {
imove.setM_Movement_ID(mov.getM_Movement_ID());
imove.setI_IsImported(true); imove.setI_IsImported(true);
imove.setProcessed(true); imove.setProcessed(true);
imove.saveEx(); imove.saveEx();
@ -156,7 +162,7 @@ public class ImportInventoryMove extends SvrProcess
else else
{ {
imove.setI_IsImported(false); imove.setI_IsImported(false);
imove.setProcessed(true); imove.setProcessed(false);
imove.saveEx(); imove.saveEx();
notimported++; notimported++;
} }
@ -331,10 +337,15 @@ public class ImportInventoryMove extends SvrProcess
*/ */
private void fillIDValues() private void fillIDValues()
{ {
for(X_I_Movement imove : getRecords(false, m_IsImportOnlyNoErrors)) m_ErrorsFound = false;
for(X_I_Movement imove : getRecords(false, false))
{ {
if(imove.getAD_Org_ID()==0) if(imove.getAD_Org_ID()==0) {
imove.setAD_Org_ID(getID(MOrg.Table_Name,"Value = ?", new Object[]{imove.getOrgValue()})); int orgId = getID(MOrg.Table_Name,"Value = ?", new Object[]{imove.getOrgValue()});
if (orgId >= 0) {
imove.setAD_Org_ID(orgId);
}
}
if(imove.getM_Product_ID()==0) if(imove.getM_Product_ID()==0)
imove.setM_Product_ID(getID(MProduct.Table_Name,"Value = ?", new Object[]{imove.getProductValue()})); imove.setM_Product_ID(getID(MProduct.Table_Name,"Value = ?", new Object[]{imove.getProductValue()}));
if(imove.getM_Locator_ID()==0) if(imove.getM_Locator_ID()==0)
@ -353,10 +364,7 @@ public class ImportInventoryMove extends SvrProcess
imove.setC_Campaign_ID(getID(MCampaign.Table_Name, "Value = ?", new Object[]{imove.getCampaignValue()})); imove.setC_Campaign_ID(getID(MCampaign.Table_Name, "Value = ?", new Object[]{imove.getCampaignValue()}));
if(imove.getAD_OrgTrx_ID()==0) if(imove.getAD_OrgTrx_ID()==0)
imove.setAD_OrgTrx_ID(getID(MOrg.Table_Name, "Value = ?", new Object[]{imove.getOrgTrxValue()})); imove.setAD_OrgTrx_ID(getID(MOrg.Table_Name, "Value = ?", new Object[]{imove.getOrgTrxValue()}));
imove.saveEx();
StringBuilder err = new StringBuilder(""); StringBuilder err = new StringBuilder("");
if(imove.getAD_Org_ID() <=0) if(imove.getAD_Org_ID() <=0)
err.append(" @AD_Org_ID@ @NotFound@,"); err.append(" @AD_Org_ID@ @NotFound@,");
@ -373,12 +381,17 @@ public class ImportInventoryMove extends SvrProcess
if(imove.getC_DocType_ID()<=0) if(imove.getC_DocType_ID()<=0)
err.append(" @C_DocType_ID@ @NotFound@,"); err.append(" @C_DocType_ID@ @NotFound@,");
if(err.toString()!=null && err.toString().length()>0) if (imove.getMovementQty().signum() == 0)
{ err.append(" @MovementQty@ @NotFound@,");
if(err.toString()!=null && err.toString().length()>0) {
notimported++; notimported++;
m_ErrorsFound = true;
imove.setI_ErrorMsg(Msg.parseTranslation(getCtx(), err.toString())); imove.setI_ErrorMsg(Msg.parseTranslation(getCtx(), err.toString()));
imove.saveEx(); } else {
} imove.setI_ErrorMsg(null);
}
imove.saveEx();
} }
} }
@ -397,17 +410,17 @@ public class ImportInventoryMove extends SvrProcess
/** /**
* get all records in X_I_ProductPlanning table * get all records in X_I_Movement table
* @param imported boolean * @param imported boolean
* @param isWithError boolean * @param isWithoutError boolean
* @return collection of X_I_ProductPlanning records * @return collection of X_I_Movement records
*/ */
private Collection<X_I_Movement> getRecords(boolean imported, boolean isWithError) private Collection<X_I_Movement> getRecords(boolean imported, boolean isWithoutError)
{ {
final StringBuffer whereClause = new StringBuffer(X_I_Movement.COLUMNNAME_I_IsImported) final StringBuffer whereClause = new StringBuffer(X_I_Movement.COLUMNNAME_I_IsImported)
.append("=?"); .append("=?");
if(isWithError) if(isWithoutError)
{ {
whereClause.append(" AND ").append(X_I_Movement.COLUMNNAME_I_ErrorMsg).append(" IS NULL"); whereClause.append(" AND ").append(X_I_Movement.COLUMNNAME_I_ErrorMsg).append(" IS NULL");
} }