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

IDEMPIERE-3512:csv import/export:resolve foreign should respect dynamic validate

This commit is contained in:
hieplq 2018-04-17 14:50:34 +02:00
parent a9a3218517
commit a7be63439a
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
org.adempiere.base/src/org/adempiere/impexp/GridTabCSVImporter.java Normal file → Executable file
View File

@ -43,11 +43,13 @@ import org.adempiere.base.IGridTabImporter;
import org.adempiere.exceptions.AdempiereException; import org.adempiere.exceptions.AdempiereException;
import org.adempiere.util.IProcessUI; import org.adempiere.util.IProcessUI;
import org.adempiere.util.ProcessUtil; import org.adempiere.util.ProcessUtil;
import org.apache.commons.lang.StringUtils;
import org.compiere.model.GridField; import org.compiere.model.GridField;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.model.GridWindow; import org.compiere.model.GridWindow;
import org.compiere.model.GridWindowVO; import org.compiere.model.GridWindowVO;
import org.compiere.model.MColumn; import org.compiere.model.MColumn;
import org.compiere.model.MField;
import org.compiere.model.MLocation; import org.compiere.model.MLocation;
import org.compiere.model.MProcess; import org.compiere.model.MProcess;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
@ -962,7 +964,7 @@ public class GridTabCSVImporter implements IGridTabImporter
if("AD_Ref_List".equals(foreignTable)) if("AD_Ref_List".equals(foreignTable))
idS= resolveForeignList(column,foreignColumn,value,null); idS= resolveForeignList(column,foreignColumn,value,null);
else else
id = resolveForeign(foreignTable,foreignColumn,value,null); id = resolveForeign(foreignTable,foreignColumn,value,field,null);
if(idS == null && id < 0){ if(idS == null && id < 0){
//it could be that record still doesn't exist if import mode is inserting or merging //it could be that record still doesn't exist if import mode is inserting or merging
@ -1025,7 +1027,7 @@ public class GridTabCSVImporter implements IGridTabImporter
if(isForeing && !"(null)".equals(value)){ if(isForeing && !"(null)".equals(value)){
String foreignTable = columnName.substring(0,columnName.length()-3); String foreignTable = columnName.substring(0,columnName.length()-3);
int id = resolveForeign(foreignTable,foreignColumn,value,null); int id = resolveForeign(foreignTable,foreignColumn,value,field,null);
if (id < 0) if (id < 0)
return new StringBuilder(Msg.getMsg(Env.getCtx(), id==-2?"ForeignMultipleResolved":"ForeignNotResolved" ,new Object[]{header.get(j),value})); return new StringBuilder(Msg.getMsg(Env.getCtx(), id==-2?"ForeignMultipleResolved":"ForeignNotResolved" ,new Object[]{header.get(j),value}));
} }
@ -1075,11 +1077,11 @@ public class GridTabCSVImporter implements IGridTabImporter
address = new MLocation (Env.getCtx(),C_Location_ID,trx.getTrxName()); address = new MLocation (Env.getCtx(),C_Location_ID,trx.getTrxName());
} }
} }
GridField field = gridTab.getField(columnName);
if(!"(null)".equals(value.toString().trim())){ if(!"(null)".equals(value.toString().trim())){
if(isForeing) { if(isForeing) {
String foreignTable = columnName.substring(0,columnName.length()-3); String foreignTable = columnName.substring(0,columnName.length()-3);
setValue = resolveForeign(foreignTable,foreignColumn,value,trx); setValue = resolveForeign(foreignTable,foreignColumn,value,field,trx);
if("C_City".equals(foreignTable)) if("C_City".equals(foreignTable))
address.setCity(value.toString()); address.setCity(value.toString());
}else }else
@ -1125,7 +1127,7 @@ public class GridTabCSVImporter implements IGridTabImporter
if ("AD_Ref_List".equals(foreignTable)) if ("AD_Ref_List".equals(foreignTable))
idS= resolveForeignList(column, foreignColumn, value,trx); idS= resolveForeignList(column, foreignColumn, value,trx);
else else
id = resolveForeign(foreignTable,foreignColumn,value,trx); id = resolveForeign(foreignTable,foreignColumn,value, field, trx);
if(idS == null && id < 0) if(idS == null && id < 0)
return Msg.getMsg(Env.getCtx(),id==-2?"ForeignMultipleResolved":"ForeignNotResolved",new Object[]{header.get(i),value}); return Msg.getMsg(Env.getCtx(),id==-2?"ForeignMultipleResolved":"ForeignNotResolved",new Object[]{header.get(i),value});
@ -1169,7 +1171,7 @@ public class GridTabCSVImporter implements IGridTabImporter
isThereRow =true; isThereRow =true;
} else { } else {
int id = resolveForeign(foreignTable, foreignColumn, value,trx); int id = resolveForeign(foreignTable, foreignColumn, value,field,trx);
if (id < 0) if (id < 0)
return Msg.getMsg(Env.getCtx(),id==-2?"ForeignMultipleResolved":"ForeignNotResolved",new Object[]{header.get(i),value}); return Msg.getMsg(Env.getCtx(),id==-2?"ForeignMultipleResolved":"ForeignNotResolved",new Object[]{header.get(i),value});
@ -1276,8 +1278,9 @@ public class GridTabCSVImporter implements IGridTabImporter
if(isForeing) if(isForeing)
foreignColumn = columnName.substring(columnName.indexOf("[")+1,columnName.indexOf("]")); foreignColumn = columnName.substring(columnName.indexOf("[")+1,columnName.indexOf("]"));
columnName = getColumnName(false,isForeing,true,columnName); columnName = getColumnName(false,isForeing,true,columnName);
MColumn column = MColumn.get(Env.getCtx(),gridTab.getField(columnName).getAD_Column_ID()); GridField field = gridTab.getField(columnName);
MColumn column = MColumn.get(Env.getCtx(),field.getAD_Column_ID());
if (isForeing){ if (isForeing){
String foreignTable = column.getReferenceTableName(); String foreignTable = column.getReferenceTableName();
if ("AD_Ref_List".equals(foreignTable)) { if ("AD_Ref_List".equals(foreignTable)) {
@ -1287,7 +1290,7 @@ public class GridTabCSVImporter implements IGridTabImporter
setValue = idS; setValue = idS;
} else { } else {
int id = resolveForeign(foreignTable, foreignColumn, setValue,trx); int id = resolveForeign(foreignTable, foreignColumn, setValue, field, trx);
if (id < 0) if (id < 0)
return Msg.getMsg(Env.getCtx(),id==-2?"ForeignMultipleResolved":"ForeignNotResolved",new Object[]{columnName,setValue}); return Msg.getMsg(Env.getCtx(),id==-2?"ForeignMultipleResolved":"ForeignNotResolved",new Object[]{columnName,setValue});
@ -1371,7 +1374,7 @@ public class GridTabCSVImporter implements IGridTabImporter
String idS = resolveForeignList(column, foreignColumn, tmpValue,trx); String idS = resolveForeignList(column, foreignColumn, tmpValue,trx);
setValue = idS; setValue = idS;
}else { }else {
int id = resolveForeign(foreignTable, foreignColumn, tmpValue,trx); int id = resolveForeign(foreignTable, foreignColumn, tmpValue,field,trx);
setValue = id; setValue = id;
} }
}else{ }else{
@ -1400,7 +1403,8 @@ public class GridTabCSVImporter implements IGridTabImporter
if(columnName!=null){ if(columnName!=null){
boolean isForeing = columnName.indexOf("[") > 0 && columnName.indexOf("]")>0; boolean isForeing = columnName.indexOf("[") > 0 && columnName.indexOf("]")>0;
columnwithKey = getColumnName(false,isForeing,true,columnName); columnwithKey = getColumnName(false,isForeing,true,columnName);
MColumn column = MColumn.get(Env.getCtx(),gridTab.getField(columnwithKey).getAD_Column_ID()); GridField field = gridTab.getField(columnwithKey);
MColumn column = MColumn.get(Env.getCtx(), field.getAD_Column_ID());
String foreignColumn = null; String foreignColumn = null;
if(isForeing){ if(isForeing){
foreignColumn = columnName.substring(columnName.indexOf("[")+1,columnName.indexOf("]")); foreignColumn = columnName.substring(columnName.indexOf("[")+1,columnName.indexOf("]"));
@ -1409,7 +1413,7 @@ public class GridTabCSVImporter implements IGridTabImporter
String idS = resolveForeignList(column,foreignColumn,value,trx); String idS = resolveForeignList(column,foreignColumn,value,trx);
value = idS; value = idS;
}else { }else {
int id = resolveForeign(foreignTable,foreignColumn,value,trx); int id = resolveForeign(foreignTable,foreignColumn,value,field,trx);
value = id; value = id;
} }
} }
@ -1462,7 +1466,7 @@ public class GridTabCSVImporter implements IGridTabImporter
return idS; return idS;
} }
private int resolveForeign(String foreignTable, String foreignColumn, Object value,Trx trx) { private int resolveForeign(String foreignTable, String foreignColumn, Object value, GridField field, Trx trx) {
boolean systemAccess = false; boolean systemAccess = false;
if (!"AD_Client".equals(foreignTable)) { if (!"AD_Client".equals(foreignTable)) {
MTable ft = MTable.get(Env.getCtx(), foreignTable); MTable ft = MTable.get(Env.getCtx(), foreignTable);
@ -1480,7 +1484,14 @@ public class GridTabCSVImporter implements IGridTabImporter
StringBuilder postSelect = new StringBuilder(" FROM ") StringBuilder postSelect = new StringBuilder(" FROM ")
.append(foreignTable).append(" WHERE ") .append(foreignTable).append(" WHERE ")
.append(foreignColumn).append("=? AND IsActive='Y' AND AD_Client_ID=?"); .append(foreignColumn).append("=? AND IsActive='Y' AND AD_Client_ID=?");
if (StringUtils.isNotBlank(field.getVO().ValidationCode)) {
String dynamicValid = Env.parseContext(Env.getCtx(), field.getWindowNo(), field.getGridTab().getTabNo(), field.getVO().ValidationCode, false);
if (StringUtils.isBlank(dynamicValid)) {
return 0;// it's parse error but simple consider like ForeignNotResolved
}else {
postSelect.append(" AND ").append(dynamicValid);
}
}
StringBuilder selectCount = new StringBuilder("SELECT COUNT(*)").append(postSelect); StringBuilder selectCount = new StringBuilder("SELECT COUNT(*)").append(postSelect);
StringBuilder selectId = new StringBuilder("SELECT ").append(foreignTable).append("_ID").append(postSelect); StringBuilder selectId = new StringBuilder("SELECT ").append(foreignTable).append("_ID").append(postSelect);
int count = DB.getSQLValueEx(trxName, selectCount.toString(), value, thisClientId); int count = DB.getSQLValueEx(trxName, selectCount.toString(), value, thisClientId);