Importazione inventario Slim2k + nuova regola su inventari

git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5694 7169d44f-50de-5945-979c-d5cbc11e8a2d

ems-common/.classpath

@@ -23,10 +23,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

ems-core/src/main/java/it/integry/ems/datasource/DataSource.java

@@ -64,8 +64,6 @@ public class DataSource {
 	}
 	
 	public synchronized void initialize(String profileDB, String pathConnectionIni, String connectionName) throws Exception {
-		boolean decryptPsw = true;
-		
 		if(UtilityString.isNullOrEmpty(profileDB)){
 			throw new Exception("Profile DB non valorizzato - controllare la chiamata del servizio");
 		}		
@@ -87,14 +85,15 @@ public class DataSource {
 				throw new SyncException("Configurazione DB non trovata o dati mancanti", profileDB);
 			}
 			
+			String decryptPsw = props.getProperty("DECRYPT_DB_PSW_" + profileDB.toUpperCase(), "S");
+			
 			String dns = params[0];
 			setDbName(dns);
 			DB_USER = params[1]; 
 			DB_PASSWORD = params[2]; 
 		
-			if(decryptPsw){
+			if("S".equals(decryptPsw)){
 				DB_PASSWORD = CryptoUtils.decrypt(DB_PASSWORD);				
-				
 			}
 			if(EmsRestConstants.TypeDbMYSQL.equals(typeDb)){
 				if(params.length < 4)

ems-core/src/main/java/it/integry/ems/response/ServiceRestResponse.java

@@ -228,12 +228,12 @@ public class ServiceRestResponse {
 		this.report = report;
 	}
 
-//	@JsonProperty("entity") //In modo da essere serializzato con il nome entity
+	//@JsonProperty("entity") //In modo da essere serializzato con il nome entity
 	public void setJsonObject(JsonNode jsonNode){
 		this.jsonNode = jsonNode;
 	}
 
-//	@JsonProperty("entity") //In modo da essere serializzato con il nome entity
+	//@JsonProperty("entity") //In modo da essere serializzato con il nome entity
 	public JsonNode getJsonObject(){
 		return jsonNode;
 	}

ems-core/src/main/java/it/integry/ems/rules/completing/InventariRules.java

@@ -98,16 +98,17 @@ public class InventariRules extends CommonRules {
 	
 
 	public static BigDecimal completeNumConf(Connection conn, String codMart, BigDecimal qtaInv) throws Exception {
-	
 		String sql = "SELECT qta_cnf FROM mtb_aart WHERE cod_mart = " + UtilityDB.valueToString(codMart);
 		Map<String, Object> map = execSingleQuery(conn, sql);
 		
 		BigDecimal qtaCnf = new BigDecimal (map.get("qta_cnf").toString());
 		
-		if (qtaCnf.equals(BigDecimal.ZERO) ) 
+		BigDecimal numConf = BigDecimal.ZERO;
-			qtaCnf = BigDecimal.ONE;
+		if (qtaCnf.equals(BigDecimal.ZERO)|| qtaInv.equals(BigDecimal.ZERO) ) {
-		
+			numConf = BigDecimal.ONE;
-		BigDecimal numConf = qtaInv.divide(qtaCnf, 0 ,RoundingMode.CEILING);
+		} else {
+			numConf = qtaInv.divide(qtaCnf, 0 ,RoundingMode.CEILING);
+		}
 		
 		
 		return numConf;

ems-core/src/main/java/it/integry/ems/rules/completing/PackagesRules.java

@@ -5,6 +5,7 @@ import it.integry.ems.annotation.SqlField;
 import it.integry.ems.entity.MtbColt;
 import it.integry.ems.entity.MtbPartitaMag;
 import it.integry.ems.resolver.SqlFieldHolder;
+import it.integry.ems.types.OperationType;
 import it.integry.ems.utility.UtilityString;
 
 import java.lang.reflect.Field;
@@ -49,6 +50,7 @@ public class PackagesRules extends QueryRules {
 		if (dataScad != null){
 			partita.setDataScad(dataScad);
 		}
+		partita.setOperation(OperationType.INSERT_OR_UPDATE);
 		return partita;
 	}
 	

ems-core/src/main/resources/rules/inventari.drl

@@ -70,8 +70,18 @@ then
 		setCodTagl( $t.get("cod_tagl").toString() ) 
 	}
 end
+
+rule "completeParitaMagInventario"
+no-loop
+when
+	eval(checkRulesEnabled == 0)
+	$invR : MtbInvenr( codMart != null && partitaMag != null && mtbPartitaMag == null)	
+	$partita: MtbPartitaMag() from PackagesRules.completePartitaMag($invR.codMart, $invR.partitaMag, $invR.dataScadPartitaMag)		
+then
+	modify ( $invR ) { setMtbPartitaMag($partita) }
+end 
 /*
-rule "checkBarCodeInv"
+rule "checkBarCodeInv"\
 no-loop
 when
 	eval(checkRulesEnabled == 1)

ems-document/.classpath

@@ -23,10 +23,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

ems-logistic/src/main/java/it/integry/ems/logistic/controller/Slim2kLogisticController.java

@@ -85,4 +85,23 @@ public class Slim2kLogisticController {
 			return list;
 		}
 	}
+	
+	@RequestMapping(value = EmsRestConstants.PATH_IMPORT_INVENTARIO_SLIM2K, method = RequestMethod.POST)
+	public @ResponseBody List<ServiceRestResponse> importInventarioSlim2k(HttpServletRequest request,
+			@RequestParam(CommonConstants.PROFILE_DB) String configuration) {
+		List<ServiceRestResponse> list = new ArrayList<ServiceRestResponse>();;
+		try {
+			ds.initialize(configuration, properties.getGlobalConnectionIniPath());
+			String username = request.getHeader("username");
+			String password = request.getHeader("password");
+			slim2kLogisticService.setUsername(username);
+			slim2kLogisticService.setPassword(password);
+			list = slim2kLogisticService.importInventario();
+		} catch (Exception e) {
+			logger.error(e.toString());
+			list.add(new ServiceRestResponse(EsitoType.KO, ds.getProfile(), e));			
+		} finally {
+			return list;
+		}
+	}
 }

ems-logistic/src/main/java/it/integry/ems/logistic/service/Slim2kLogisticService.java

@@ -1,14 +1,14 @@
 package it.integry.ems.logistic.service;
 
-import java.util.Date;
 import java.io.StringWriter;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.Timestamp;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 import javax.ws.rs.client.Client;
@@ -22,21 +22,24 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.google.common.base.Joiner;
 
 import it.integry.common.var.CommonConstants;
 import it.integry.ems.config.EmsRestConstants;
 import it.integry.ems.datasource.DataSource;
 import it.integry.ems.entity.MtbColr;
 import it.integry.ems.entity.MtbColt;
+import it.integry.ems.entity.MtbInvenr;
+import it.integry.ems.entity.MtbInvent;
 import it.integry.ems.entity.MtbPartitaMag;
 import it.integry.ems.json.JSONObjectMapper;
 import it.integry.ems.properties.EmsProperties;
 import it.integry.ems.response.EsitoType;
 import it.integry.ems.response.ServiceRestResponse;
+import it.integry.ems.service.HttpRestWrapper;
 import it.integry.ems.service.SetupGest;
 import it.integry.ems.types.OperationType;
 import it.integry.ems.utility.UtilityDB;
+import it.integry.ems.utility.UtilityDate;
 import it.integry.ems.utility.UtilityString;
 import it.integry.ems.utility.UtilityXML;
 import it.integry.security.utility.RestUtil;
@@ -52,6 +55,26 @@ public class Slim2kLogisticService {
 	private SetupGest setupGest;
 	@Autowired
 	private JSONObjectMapper jsonObjectMapper;
+	@Autowired
+	private HttpRestWrapper httpRestWrapper;
+	
+	private String username, password;
+	
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
 	
 	
 	// IMPORTAZIONE COLLI DI VENDITA DA SHIPPINGPLAN_EXPORT
@@ -489,4 +512,77 @@ public class Slim2kLogisticService {
 		}
 	}
 
+	public List<ServiceRestResponse> importInventario()throws Exception {
+		List<ServiceRestResponse> respList = new ArrayList<ServiceRestResponse>();
+		String profileSlim2k = (String) setupGest.getSetup(ds.getConnection(), "IMPORT_INVENTARIO", "SLIM2K", "PROFILE", "");
+		String codMdep = (String) setupGest.getSetup(ds.getConnection(), "IMPORT_INVENTARIO", "SLIM2K", "COD_MDEP", "");
+		
+		if (UtilityString.isNullOrEmpty(profileSlim2k)) {
+			throw new Exception("Profile non configurato");
+		}
+		
+		if (UtilityString.isNullOrEmpty(codMdep)) {
+			throw new Exception("Deposito non configurato");
+		}			
+		
+		DataSource dsSlim2k = new DataSource(); 
+		dsSlim2k.initialize(profileSlim2k, properties.getGlobalConnectionIniPath());
+		Date dataInventario = new Date();
+		dataInventario = UtilityDate.RelativeDateTime(dataInventario, -1);
+		//TODO -Mina valutare se bisogna lavorare a data -1
+		//Date dataInventario = UtilityString.parseDate("2017/03/05");
+		
+		String query =
+			"SELECT trim(' ' from i.item) as item, "
+				+ " trim(' ' from s.workorder ) as partita_mag, "
+				+ " max(to_timestamp(s.stockdate)) as dataScad, "
+				+ " sum(s.qtystock) as Giacenza, "
+				+ " i.unit "
+		   + " FROM stocksintime s, items i "
+		  + " WHERE s.item=i.item AND "
+		        + " s.firm=i.firm AND "
+		        + " to_timestamp(s.stdate) = " + UtilityDB.valueDateToString(dataInventario, CommonConstants.DATE_FORMAT_YMD)
+		  + " GROUP BY s.stdate, i.item, s.workorder, i.unit "
+		  + " ORDER BY s.stdate, i.item, s.workorder ";
+		
+		PreparedStatement ps = dsSlim2k.getConnection().prepareStatement(query);
+		ResultSet rs = ps.executeQuery();
+		
+		MtbInvent mtbInvent = new MtbInvent();
+		List<MtbInvenr> righeInv = new ArrayList<MtbInvenr>();
+		while(rs.next()){
+			if (rs.getRow() == 1 ){
+				mtbInvent.setCodMdep(codMdep);
+				mtbInvent.setDataInventario(dataInventario);
+				mtbInvent.setMtbInvenr(righeInv);
+				mtbInvent.setOperation(OperationType.INSERT);
+			}
+			MtbInvenr mtbInvenr = new MtbInvenr();
+			mtbInvenr.setCodMart(rs.getString(1));
+			mtbInvenr.setPartitaMag(rs.getString(2));
+			mtbInvenr.setDataScadPartitaMag(rs.getDate(3));
+			mtbInvenr.setQtaInv(rs.getBigDecimal(4));
+			righeInv.add(mtbInvenr);	
+			break;
+		}
+		
+		rs.close();ps.close();
+
+		ArrayNode array = jsonObjectMapper.createArrayNode();
+		array.addPOJO(mtbInvent);
+		
+		//CHIAMATA A PROCESS ENTITY LIST
+		if(array.size() > 0){
+			StringWriter writer = new StringWriter();
+			jsonObjectMapper.writeValue(writer, array);
+
+			String jsonBody = writer.toString();			
+			
+			respList = httpRestWrapper.callProcessEntityList(ds.getProfile(), username, password, jsonBody, true);
+		}	else {
+			throw new Exception("Non ci sono movimenti in data " + new SimpleDateFormat("dd/MM/yyyy").format(dataInventario));						
+		}
+		return respList;
+	}
+
 }

ems-model/.classpath

@@ -23,10 +23,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

ems-model/src/main/java/it/integry/ems/base/EntityBase.java

@@ -87,15 +87,15 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 	@JsonIgnore
 	protected DroolsDataCompleting dataCompleting;
 
-	//QUERY NATIVA
+	// QUERY NATIVA
 	private String nativeSql;
 
-	//CAMPO PER ALTRE SET CHE VOGLIONO ESSERE INVIATE ALLA ENTITY.
+	// CAMPO PER ALTRE SET CHE VOGLIONO ESSERE INVIATE ALLA ENTITY.
 	// USATO TIPICAMENTE PER IL CAMBIO CHIAVE DOVE SONO PASSATE LE CHIAVI NUOVE
-	private String otherSet="";
+	private String otherSet = "";
 
-	//USERNAME DI CHI STA ESEGUENDO L'OPERAZIONE
+	// USERNAME DI CHI STA ESEGUENDO L'OPERAZIONE
-	protected String username="";
+	protected String username = "";
 
 	protected String applicationName = "";
 
@@ -104,7 +104,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 	protected String whereCond;
 
 	private OperationType operation;
-	//private long ruleExecTime = 0L;
+	// private long ruleExecTime = 0L;
 	private Boolean loadedFromDb = false;
 
 	// BOOLEANO PER L'ESECUZIONE DEI RICALCOLI
@@ -138,8 +138,8 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		for (Field field : fiedList) {
 			field.setAccessible(true);
 			Object child = field.get(this);
-			if(child != null) {
+			if (child != null) {
-				if(child instanceof List) {
+				if (child instanceof List) {
 					List<EntityInterface> list = (List<EntityInterface>) child;
 					List<Object> listCloned = new ArrayList<Object>();
 					for (EntityInterface entityInterface : list) {
@@ -148,8 +148,8 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 					}
 					field.set(cloned, listCloned);
 				} else {
-					((EntityInterface)child).setEntityHolder(this.getEntityHolder());
+					((EntityInterface) child).setEntityHolder(this.getEntityHolder());
-					field.set(cloned, ((EntityInterface)child).deepClone());
+					field.set(cloned, ((EntityInterface) child).deepClone());
 				}
 			}
 		}
@@ -158,11 +158,11 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		for (Field field : priorityList) {
 			field.setAccessible(true);
 			Priority priority = field.getAnnotation(Priority.class);
-			if(priority!=null) {				
+			if (priority != null) {
 				Object child = field.get(this);
 				if (child instanceof List) {
 					List<EntityInterface> list = (List<EntityInterface>) child;
-					if (list.size() > 0 ) {					
+					if (list.size() > 0) {
 						List<Object> listCloned = new ArrayList<Object>();
 						for (EntityInterface entityInterface : list) {
 							entityInterface.setEntityHolder(this.getEntityHolder());
@@ -171,25 +171,23 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 						field.set(cloned, listCloned);
 					}
 				} else {
-					if(child != null) {
+					if (child != null) {
-						((EntityInterface)child).setEntityHolder(this.getEntityHolder());
+						((EntityInterface) child).setEntityHolder(this.getEntityHolder());
-						field.set(cloned, ((EntityInterface)child).deepClone());
+						field.set(cloned, ((EntityInterface) child).deepClone());
 					}
 				}
-				/*if(child != null) {
+				/*
-					if(child instanceof List) {
+				 * if(child != null) { if(child instanceof List) {
-						List<EntityInterface> list = (List<EntityInterface>) child;
+				 * List<EntityInterface> list = (List<EntityInterface>) child;
-						List<Object> listCloned = new ArrayList<Object>();
+				 * List<Object> listCloned = new ArrayList<Object>(); for
-						for (EntityInterface entityInterface : list) {
+				 * (EntityInterface entityInterface : list) {
-							entityInterface.setEntityHolder(this.getEntityHolder());
+				 * entityInterface.setEntityHolder(this.getEntityHolder());
-							listCloned.add(entityInterface.deepClone());							
+				 * listCloned.add(entityInterface.deepClone()); }
-						}
+				 * field.set(cloned, listCloned); } else {
-						field.set(cloned, listCloned);
+				 * ((EntityInterface)child).setEntityHolder(this.getEntityHolder
-					} else {
+				 * ()); field.set(cloned, ((EntityInterface)child).deepClone());
-						((EntityInterface)child).setEntityHolder(this.getEntityHolder());
+				 * } }
-						field.set(cloned, ((EntityInterface)child).deepClone());
+				 */
-					}
-				}	*/
 			}
 		}
 
@@ -219,7 +217,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 						child.trimPK();
 					}
 				}
-			}else if(childs != null) {
+			} else if (childs != null) {
 				Object object = field.get(this);
 				if (object != null) {
 					if (object instanceof List) {
@@ -247,9 +245,9 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		}
 	}
 
-	public String getTableName(){
+	public String getTableName() {
 		Table t = getClass().getAnnotation(Table.class);
-		if(t != null)
+		if (t != null)
 			return t.value();
 		else
 			return "";
@@ -268,7 +266,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 	}
 
 	public void setUsername(String username) {
-		if(UtilityString.isNullOrEmpty(username))
+		if (UtilityString.isNullOrEmpty(username))
 			username = "";
 		this.username = username;
 	}
@@ -282,14 +280,15 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 	}
 
 	public void setApplicationNameDB(Connection conn) throws Exception {
-		if (UtilityDB.existDatabaseObject(conn, "azienda", TypeDbObject.TABLE)){
+		if (UtilityDB.existDatabaseObject(conn, "azienda", TypeDbObject.TABLE)) {
-			String sql ="SELECT application_name FROM azienda";
+			String sql = "SELECT application_name FROM azienda";
 			PreparedStatement ps = conn.prepareStatement(sql);
 			ResultSet rs = ps.executeQuery();
-			if (rs.next() ) {
+			if (rs.next()) {
 				this.applicationName = rs.getString(1);
 			}
-			rs.close();ps.close(); 			
+			rs.close();
+			ps.close();
 		}
 	}
 
@@ -364,7 +363,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 	}
 
 	public void setRecalcColumns(List<String> recalcColumns) throws Exception {
-		if(recalcColumns == null || recalcColumns.isEmpty())
+		if (recalcColumns == null || recalcColumns.isEmpty())
 			this.recalcColumns = new ArrayList<String>();
 
 		for (String sqlField : recalcColumns) {
@@ -393,18 +392,18 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 
 	public Object select(Connection connection) throws Exception {
 		String query = "";
-		if(nativeSql != null){
+		if (nativeSql != null) {
 
 			String columnList;
 			int sIdx = nativeSql.toUpperCase().indexOf("SELECT");
 			int fIdx = nativeSql.toUpperCase().indexOf("FROM");
-			int wIdx = nativeSql.toUpperCase().indexOf("WHERE") ;
+			int wIdx = nativeSql.toUpperCase().indexOf("WHERE");
 
 			String fields = nativeSql.substring(sIdx + "SELECT".length(), fIdx).trim();
-			String table = nativeSql.substring(fIdx + "FROM".length() , wIdx).trim();
+			String table = nativeSql.substring(fIdx + "FROM".length(), wIdx).trim();
 			String where = nativeSql.substring(wIdx + "WHERE".length());
 
-			if("*".equals(fields)) {
+			if ("*".equals(fields)) {
 				columnList = entityHolder.getColumnList(this.getClass());
 			} else {
 				List<String> colList = new ArrayList<String>();
@@ -422,7 +421,8 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 			String wherePK = entityHolder.getWherePK(this);
 			String columnList = entityHolder.getColumnList(this.getClass());
 			if (wherePK != "")
-				query = "SELECT "+columnList+", '" + getTableName() + "' as type FROM " + getTableName() + " WHERE " + wherePK;
+				query = "SELECT " + columnList + ", '" + getTableName() + "' as type FROM " + getTableName() + " WHERE "
+						+ wherePK;
 			else
 				return null;
 		}
@@ -451,7 +451,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 
 		String json = writer.toString();
 		JsonArray array = new JsonParser().parse(json).getAsJsonArray();
-		if(array.size() == 0)
+		if (array.size() == 0)
 			return null;
 
 		return json;
@@ -462,7 +462,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		wherePK = entityHolder.getWherePK(entity);
 
 		String columnList = entityHolder.getColumnList(entity.getClass());
-		String query = "SELECT "+columnList+" FROM " + entity.getTableName() + " WHERE " + wherePK;
+		String query = "SELECT " + columnList + " FROM " + entity.getTableName() + " WHERE " + wherePK;
 		PreparedStatement ps = connection.prepareStatement(query);
 		ResultSet rs = ps.executeQuery();
 		EntityBase entityDB = mergeEntityDBToObject(rs, entity);
@@ -470,7 +470,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		return entityDB;
 	}
 
-	//seleziona le righe da db di un detail
+	// seleziona le righe da db di un detail
 	public List<EntityBase> selectEntityRowList(Connection connection, EntityBase entity,
 			Class<? extends EntityBase> rowClass, String tableName, Document doc) throws Exception {
 		String whereConds = UtilityXML.XML2WhereCond(doc);
@@ -489,7 +489,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 	private List<EntityBase> selectEntityRowListInternal(Connection connection, EntityBase entity,
 			Class<? extends EntityBase> rowClass, String tableName, String whereConds) throws Exception {
 
-		if(!UtilityString.isNullOrEmpty(whereConds)) {
+		if (!UtilityString.isNullOrEmpty(whereConds)) {
 			whereConds = " AND " + whereConds;
 		}
 
@@ -498,7 +498,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		wherePK = entityHolder.getWherePK(entity);
 
 		String columnList = entityHolder.getColumnList(rowClass, true);
-		query = "SELECT "+columnList+" FROM " + tableName + " WHERE " + wherePK + whereConds;			
+		query = "SELECT " + columnList + " FROM " + tableName + " WHERE " + wherePK + whereConds;
 
 		PreparedStatement ps = connection.prepareStatement(query);
 		ResultSet rs = ps.executeQuery();
@@ -507,12 +507,12 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 	}
 
 	public boolean equalsDB(EntityBase entityCmp) throws Exception {
-		if(this.getClass().equals(entityCmp.getClass())) {
+		if (this.getClass().equals(entityCmp.getClass())) {
 			List<String> pks = (List<String>) entityHolder.getPkField(this.getClass());
 			for (String pk : pks) {
 				Field field = entityHolder.getFieldBySql(this.getClass().getSimpleName(), pk);
 				field.setAccessible(true);
-				if(!field.get(this).equals(field.get(entityCmp)))
+				if (!field.get(this).equals(field.get(entityCmp)))
 					return false;
 			}
 			return true;
@@ -521,30 +521,30 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 	}
 
 	private EntityBase mergeEntityDBToObject(ResultSet rs, EntityBase entity) throws Exception {
-		if(rs != null){
+		if (rs != null) {
 			try {
-				if(rs.next()) {
+				if (rs.next()) {
 					ResultSetMetaData rsmd = rs.getMetaData();
-					for (int i=0;i<rsmd.getColumnCount();i++) {
+					for (int i = 0; i < rsmd.getColumnCount(); i++) {
 						String columnName = rsmd.getColumnName(i + 1);
 						Object columnValue = rs.getObject(i + 1);
 
 						Field field = entity.getClass().getDeclaredField(columnName);
 						field.setAccessible(true);
 						Object object = field.get(entity);
-						if(object == null && columnValue != null){
+						if (object == null && columnValue != null) {
-							if(field.isAnnotationPresent(it.integry.ems.annotation.Clob.class))
+							if (field.isAnnotationPresent(it.integry.ems.annotation.Clob.class))
 								columnValue = Base64.encodeBase64String(columnValue.toString().getBytes());
 							field.set(entity, SqlFieldHolder.applyConvert(columnValue, field.getGenericType()));
 						}
 					}
 					return entity;
 				} else {
-					if(entity.getOperation() == OperationType.SELECT_OBJECT)
+					if (entity.getOperation() == OperationType.SELECT_OBJECT)
 						return null;
-					else if(entity.getOperation() == OperationType.INSERT_OR_UPDATE)
+					else if (entity.getOperation() == OperationType.INSERT_OR_UPDATE)
 						return entity;
-					else if(entity.getOperation() == OperationType.SUBSTITUTE)
+					else if (entity.getOperation() == OperationType.SUBSTITUTE)
 						return entity;
 					else
 						throw new Exception("Dati entity " + entity.getTableName() + " non trovati su DB");
@@ -561,9 +561,9 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 
 		Object entity = null;
 		String[] split = sqlField.split("\\.");
-		if(split.length > 1) {			
+		if (split.length > 1) {
 			Field f = this.getClass().getDeclaredField(UtilityString.sqlToField(split[0]));
-			if(f==null)
+			if (f == null)
 				throw new Exception("Impossibile escludere: campo " + sqlField + " non presente nella entity");
 			f.setAccessible(true);
 			entity = f.get(this);
@@ -571,35 +571,35 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		} else
 			entity = this.clone();
 
-		if(entity instanceof List) {
+		if (entity instanceof List) {
 			List<EntityInterface> list = (List<EntityInterface>) entity;
 			List<EntityInterface> listCloned = new ArrayList<EntityInterface>();
 			for (EntityInterface entityInterface : list) {
 				EntityInterface entityCloned = entityInterface.clone();
 
 				Field f = entityCloned.getClass().getSuperclass().getDeclaredField(columnName);
-				if(f==null)
+				if (f == null)
 					throw new Exception("Impossibile escludere: campo " + sqlField + " non presente nella entity");
 				f.setAccessible(true);
-				List<String> exclCol = (List<String>)f.get(entityCloned);	
+				List<String> exclCol = (List<String>) f.get(entityCloned);
 				List<String> exclColCloned = new ArrayList<String>();
 				exclColCloned.addAll(exclCol);
-				//cloning	
+				// cloning
 				exclColCloned.add(sqlField);
 				f.set(entityCloned, exclColCloned);
 				listCloned.add(entityCloned);
 			}
 			Field f = this.getClass().getDeclaredField(UtilityString.sqlToField(split[0]));
-			if(f==null)
+			if (f == null)
 				throw new Exception("Impossibile escludere: campo " + sqlField + " non presente nella entity");
 			f.setAccessible(true);
 			f.set(this, listCloned);
 		} else {
 			Field f = entity.getClass().getSuperclass().getDeclaredField(columnName);
-			if(f==null)
+			if (f == null)
 				throw new Exception("Impossibile escludere: campo " + sqlField + " non presente nella entity");
 			f.setAccessible(true);
-			List<String> exclCol = (List<String>)f.get(entity);
+			List<String> exclCol = (List<String>) f.get(entity);
 			exclCol.add(sqlField);
 		}
 	}
@@ -609,9 +609,9 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 
 		Object entity = null;
 		String[] split = sqlField.trim().split("\\.");
-		if(split.length > 1) {			
+		if (split.length > 1) {
 			Field f = this.getClass().getDeclaredField(UtilityString.sqlToField(split[0]));
-			if(f==null)
+			if (f == null)
 				throw new Exception("Impossibile escludere: campo " + sqlField + " non presente nella entity");
 			f.setAccessible(true);
 			entity = f.get(this);
@@ -619,10 +619,10 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		} else
 			entity = this;
 
-		if(entity instanceof List) {
+		if (entity instanceof List) {
 			List<EntityInterface> list = (List<EntityInterface>) entity;
 
-			if("*".equals(sqlField) && split.length > 1) {
+			if ("*".equals(sqlField) && split.length > 1) {
 				List cloneList = (List) ((ArrayList) entity).clone();
 				cloneList.clear();
 				Field f = this.getClass().getDeclaredField(UtilityString.sqlToField(split[0]));
@@ -632,32 +632,34 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 				for (EntityInterface entityInterface : list) {
 
 					Field f = entityInterface.getClass().getSuperclass().getDeclaredField(columnName);
-					if(f==null)
+					if (f == null)
-						throw new Exception("Impossibile escludere: campo " + columnName + " non presente nella entity");
+						throw new Exception(
+								"Impossibile escludere: campo " + columnName + " non presente nella entity");
 					f.setAccessible(true);
 
-					Field fieldToSetRecalc = entityInterface.getClass().getDeclaredField(UtilityString.sqlToField(sqlField));
+					Field fieldToSetRecalc = entityInterface.getClass()
-					if(fieldToSetRecalc != null) {
+							.getDeclaredField(UtilityString.sqlToField(sqlField));
+					if (fieldToSetRecalc != null) {
 						fieldToSetRecalc.setAccessible(true);
 						fieldToSetRecalc.set(entityInterface, null);
 					}
 
-					List<String> exclCol = (List<String>)f.get(entityInterface);	
+					List<String> exclCol = (List<String>) f.get(entityInterface);
 					List<String> exclColCloned = new ArrayList<String>();
 					exclColCloned.addAll(exclCol);
-					//cloning	
+					// cloning
 					exclColCloned.add(sqlField);
 					f.set(entityInterface, exclColCloned);
 				}
 			}
 		} else {
 			Field f = entity.getClass().getSuperclass().getDeclaredField(columnName);
-			if(f==null)
+			if (f == null)
 				throw new Exception("Impossibile escludere: campo " + columnName + " non presente nella entity");
 			f.setAccessible(true);
 
 			Field fieldToSetRecalc = entity.getClass().getDeclaredField(UtilityString.sqlToField(sqlField));
-			if(fieldToSetRecalc != null) {
+			if (fieldToSetRecalc != null) {
 				fieldToSetRecalc.setAccessible(true);
 				if (fieldToSetRecalc.getAnnotation(EntityChild.class) != null) {
 					ArrayList<EntityBase> rows = new ArrayList<EntityBase>();
@@ -666,7 +668,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 					fieldToSetRecalc.set(entity, null);
 				}
 			}
-			List<String> exclCol = (List<String>)f.get(entity);
+			List<String> exclCol = (List<String>) f.get(entity);
 			exclCol.add(sqlField);
 		}
 	}
@@ -679,41 +681,44 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 
 	private void executeManage() throws Exception {
 		managePriorityPre();
-		if(getOperation() == OperationType.NO_OP) {
+		if (getOperation() == OperationType.NO_OP) {
-			// FABIO 20.1.2017: se la entity era in sincronizzazione cond altri DB ed aveva NO_OP sul master e sulle righe SUBSTITUTE 
+			// FABIO 20.1.2017: se la entity era in sincronizzazione cond altri
-			//					invocando manageChilds andava a cancellare le righe del detail dei database in sincronizzazione, infatti anche il 
+			// DB ed aveva NO_OP sul master e sulle righe SUBSTITUTE
-			//                  commento dello stesso metodo più sotto era stato fatto da Sante, ma evidentemente gli era sviggito il problema su NO_OP 			
+			// invocando manageChilds andava a cancellare le righe del detail
-//			manageChilds();
+			// dei database in sincronizzazione, infatti anche il
+			// commento dello stesso metodo più sotto era stato fatto da Sante,
+			// ma evidentemente gli era sviggito il problema su NO_OP
+			// manageChilds();
 			updateChilds();
-		} else if(getOperation() == OperationType.SUBSTITUTE){			
+		} else if (getOperation() == OperationType.SUBSTITUTE) {
 			deleteChilds();
 			deleteEntity();
 			insertEntity();
 			insertChilds();
-		} else if(getOperation() == OperationType.INSERT_OR_UPDATE) {
+		} else if (getOperation() == OperationType.INSERT_OR_UPDATE) {
 			Boolean insertOk = false, updateOk = false;
 			try {
 				insertEntity();
 				insertOk = true;
-			}catch(SQLException e) {
+			} catch (SQLException e) {
-				//pk violation code o index unique sql server or mysql
+				// pk violation code o index unique sql server or mysql
-				if(e.getErrorCode() == 2627 || e.getErrorCode() == 2601 || e.getErrorCode() == 1062) {
+				if (e.getErrorCode() == 2627 || e.getErrorCode() == 2601 || e.getErrorCode() == 1062) {
 					updateEntity();
 					updateOk = true;
 				} else {
 					throw e;
 				}
 			}
-			if(insertOk)
+			if (insertOk)
 				insertChilds();
-			else if(updateOk)
+			else if (updateOk)
 				updateChilds();
-			//manageChilds();
+			// manageChilds();
 		} else {
 			manage();
 		}
 		managePriorityPost();
-		if(this.getClass().getAnnotation(Master.class) != null)
+		if (this.getClass().getAnnotation(Master.class) != null)
 			checkSyncOffline();
 	}
 
@@ -722,12 +727,13 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 				+ " WHERE object_id = OBJECT_ID(N'dbo.stb_publications_detail') AND type in (N'U')";
 		PreparedStatement psExist = (PreparedStatement) connection.prepareStatement(sqlExist);
 		ResultSet rsExist = psExist.executeQuery();
-		if(rsExist.next()) {
+		if (rsExist.next()) {
-			//OFFLINE
+			// OFFLINE
-			logger.debug("CHECK SYNC OFFLINE ABILITATA (DB " + connection.getCatalog() + ") SU " + getTableName().toUpperCase());
+			logger.debug("CHECK SYNC OFFLINE ABILITATA (DB " + connection.getCatalog() + ") SU "
+					+ getTableName().toUpperCase());
 			PreparedStatement ps = (PreparedStatement) connection
-					.prepareStatement("SELECT publication_id from stb_publications_detail "
+					.prepareStatement("SELECT publication_id from stb_publications_detail " + "where entity_name='"
-							+ "where entity_name='"	+ getTableName().toUpperCase() + "' and syncronize='R'");
+							+ getTableName().toUpperCase() + "' and syncronize='R'");
 			ResultSet rs = ps.executeQuery();
 			if (rs.next()) {
 				logger.debug("SYNC OFFLINE ABILITATA SU " + getTableName().toUpperCase());
@@ -742,7 +748,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 
 	@SuppressWarnings("unchecked")
 	private void manageChilds() throws Exception {
-		//ordinamento dei campi secondo legami di inserimento
+		// ordinamento dei campi secondo legami di inserimento
 		List<Field> fields = entityHolder.getEntityChildField(getClass());
 		Collections.sort(fields, new EntityChildComparator());
 
@@ -757,7 +763,8 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 
 					for (int i = 0; i < chain.size(); i++) {
 						EntityBase child = chain.get(i);
-						child.manageWithParentConnection(connection, child.getOperation(), dataCompleting, entityHolder);
+						child.manageWithParentConnection(connection, child.getOperation(), dataCompleting,
+								entityHolder);
 					}
 				} else {
 					EntityBase child = ((EntityBase) object);
@@ -793,18 +800,17 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		}
 	}
 
-	
 	private void settingPriority(EntityBase child, OperationType operation, Boolean copyPk) throws Exception {
-		//SETTING DEGLI HOLDER
+		// SETTING DEGLI HOLDER
 		child.setEntityHolder(entityHolder);
 		child.setCompletingManager(dataCompleting);
 
-		if(copyPk)
+		if (copyPk)
 			child.setParentPKAndImportFromParent(this);
 		else
 			child.setImportFromParent(this);
 		///////////////////////////////////////
-		if(child.getOperation() == OperationType.INSERT && child.select(connection) != null){
+		if (child.getOperation() == OperationType.INSERT && child.select(connection) != null) {
 			child.setOperation(OperationType.UPDATE);
 		}
 
@@ -838,7 +844,8 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		}
 	}
 
-	private void manageWithParentConnection(Connection connection, OperationType op, DroolsDataCompleting dataCompleting) throws Exception {
+	private void manageWithParentConnection(Connection connection, OperationType op,
+			DroolsDataCompleting dataCompleting) throws Exception {
 		this.connection = connection;
 		this.dataCompleting = dataCompleting;
 		if (getOperation() == null)
@@ -847,12 +854,14 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		executeManage();
 	}
 
-	public void manageWithParentConnection(Connection connection, OperationType op, DroolsDataCompleting dataCompleting, EntityPropertyHolder propertyHolder) throws Exception {
+	public void manageWithParentConnection(Connection connection, OperationType op, DroolsDataCompleting dataCompleting,
+			EntityPropertyHolder propertyHolder) throws Exception {
 		this.entityHolder = propertyHolder;
 		manageWithParentConnection(connection, op, dataCompleting);
 	}
 
-	public void manageWithParentConnection(Connection connection, OperationType op, DroolsDataCompleting dataCompleting, EntityPropertyHolder propertyHolder, String applicationName) throws Exception {
+	public void manageWithParentConnection(Connection connection, OperationType op, DroolsDataCompleting dataCompleting,
+			EntityPropertyHolder propertyHolder, String applicationName) throws Exception {
 		this.entityHolder = propertyHolder;
 		this.applicationName = applicationName;
 		manageWithParentConnection(connection, op, dataCompleting);
@@ -870,10 +879,10 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 				field.setAccessible(true);
 				Object object = field.get(this);
 
-				//NB: aiuta a rispettare la regola del default nel troncare la data anche se passata dall'esterno
+				// NB: aiuta a rispettare la regola del default nel troncare la
-				if(object != null && object instanceof Date && 
+				// data anche se passata dall'esterno
-						(CommonConstants.SYSDATE.equals(format) || 
+				if (object != null && object instanceof Date
-								CommonConstants.SYSDATE.equals(defaultValue))) {					
+						&& (CommonConstants.SYSDATE.equals(format) || CommonConstants.SYSDATE.equals(defaultValue))) {
 					field.set(this, DateUtils.truncate(object, Calendar.DAY_OF_MONTH));
 				}
 
@@ -891,21 +900,21 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 	public void dataCompletingSync(Connection connection) throws Exception {
 		if (UtilityString.isNullOrEmpty(getNativeSql()) && getOperation() != OperationType.DELETE) {
 
-			//controllo sui campi fired di testata
+			// controllo sui campi fired di testata
-			if(getOperation() == OperationType.INSERT || (entityHolder.getFieldToFireMap(getClass().getSimpleName()) != null && 
+			if (getOperation() == OperationType.INSERT
-					!entityHolder.getFieldToFireMap(getClass().getSimpleName()).isEmpty())) {
+					|| (entityHolder.getFieldToFireMap(getClass().getSimpleName()) != null
+							&& !entityHolder.getFieldToFireMap(getClass().getSimpleName()).isEmpty())) {
 				executeRecalc = true;
 			}
 
-			if (getOperation() == OperationType.UPDATE || 
+			if (getOperation() == OperationType.UPDATE || getOperation() == OperationType.SUBSTITUTE
-					getOperation() == OperationType.SUBSTITUTE || 
+					|| getOperation() == OperationType.INSERT_OR_UPDATE) {
-					getOperation() == OperationType.INSERT_OR_UPDATE) {
 				selectAndMergeEntity(connection, this);
 			}
 
 			dataCompleting.invokeCheckRules(this, connection, username);
 
-			if(getNativeSql() == null)
+			if (getNativeSql() == null)
 				dataCompleting.complete(this, connection, username);
 
 			Field[] fields = getClass().getDeclaredFields();
@@ -917,8 +926,8 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 						if (object instanceof List) {
 							List<EntityBase> list = ((List<EntityBase>) object);
 
-							if(!executeRecalc) {
+							if (!executeRecalc) {
-								//caricamento delle righe 
+								// caricamento delle righe
 								selectChildFromDb(list);
 							}
 
@@ -933,7 +942,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 				}
 			}
 
-			//chiamata alle regole di ricalcolo
+			// chiamata alle regole di ricalcolo
 			dataCompleting.completePostRules(this, connection, username);
 		}
 	}
@@ -943,21 +952,21 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 	public void dataCompleting(Connection connection) throws Exception {
 		if (UtilityString.isNullOrEmpty(getNativeSql()) && getOperation() != OperationType.DELETE) {
 
-			//controllo sui campi fired di testata
+			// controllo sui campi fired di testata
-			if(getOperation() == OperationType.INSERT || (entityHolder.getFieldToFireMap(getClass().getSimpleName()) != null && 
+			if (getOperation() == OperationType.INSERT
-					!entityHolder.getFieldToFireMap(getClass().getSimpleName()).isEmpty())) {
+					|| (entityHolder.getFieldToFireMap(getClass().getSimpleName()) != null
+							&& !entityHolder.getFieldToFireMap(getClass().getSimpleName()).isEmpty())) {
 				executeRecalc = true;
 			}
 
-			if (getOperation() == OperationType.UPDATE || 
+			if (getOperation() == OperationType.UPDATE || getOperation() == OperationType.SUBSTITUTE
-					getOperation() == OperationType.SUBSTITUTE || 
+					|| getOperation() == OperationType.INSERT_OR_UPDATE) {
-					getOperation() == OperationType.INSERT_OR_UPDATE) {
 				selectAndMergeEntity(connection, this);
 			}
 
 			dataCompleting.invokeCheckRules(this, connection, username);
 
-			if(getNativeSql() == null)
+			if (getNativeSql() == null)
 				dataCompleting.complete(this, connection, username);
 
 			Field[] fields = getClass().getDeclaredFields();
@@ -969,8 +978,8 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 						if (object instanceof List) {
 							List<EntityBase> list = ((List<EntityBase>) object);
 
-							if(!executeRecalc) {
+							if (!executeRecalc) {
-								//caricamento delle righe 
+								// caricamento delle righe
 								selectChildFromDb(list);
 							}
 
@@ -985,20 +994,20 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 				}
 			}
 
-			//chiamata alle regole di ricalcolo
+			// chiamata alle regole di ricalcolo
 			dataCompleting.completePostRules(this, connection, username);
 		}
 	}
 
 	private void selectChildFromDb(List<EntityBase> list) throws Exception {
-		//controllo sui campi fired di riga		
+		// controllo sui campi fired di riga
 		for (EntityBase child : list) {
-			if(entityHolder.getFieldToFireMap(child.getClass().getSimpleName()) != null && 
+			if (entityHolder.getFieldToFireMap(child.getClass().getSimpleName()) != null
-					!entityHolder.getFieldToFireMap(child.getClass().getSimpleName()).isEmpty()) {
+					&& !entityHolder.getFieldToFireMap(child.getClass().getSimpleName()).isEmpty()) {
-				if(child.getOperation() == OperationType.INSERT || child.getOperation() == OperationType.DELETE){
+				if (child.getOperation() == OperationType.INSERT || child.getOperation() == OperationType.DELETE) {
 					executeRecalc = true;
 					break;
-				} else if(child.getOperation() == OperationType.UPDATE) {
+				} else if (child.getOperation() == OperationType.UPDATE) {
 					Field[] fields = child.getClass().getDeclaredFields();
 					for (Field field : fields) {
 						if (field.getAnnotation(FireRecalc.class) != null) {
@@ -1019,11 +1028,10 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		child.setParentPKAndImportFromParent(this);
 		child.setCompletingManager(dataCompleting);
 
-		if(child.getOperation() != OperationType.DELETE) {			
+		if (child.getOperation() != OperationType.DELETE) {
-			if(child.getNativeSql() == null) {
+			if (child.getNativeSql() == null) {
-				if (child.getOperation() == OperationType.UPDATE || 
+				if (child.getOperation() == OperationType.UPDATE || child.getOperation() == OperationType.SUBSTITUTE
-						child.getOperation() == OperationType.SUBSTITUTE || 
+						|| child.getOperation() == OperationType.INSERT_OR_UPDATE) {
-						child.getOperation() == OperationType.INSERT_OR_UPDATE) {
 					selectAndMergeEntity(connection, child);
 				}
 				child.setApplicationName(applicationName);
@@ -1039,8 +1047,8 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 							if (object instanceof List) {
 								List<EntityBase> list = ((List<EntityBase>) object);
 
-								if(!executeRecalc) {
+								if (!executeRecalc) {
-									//caricamento delle righe 
+									// caricamento delle righe
 									selectChildFromDb(list);
 								}
 
@@ -1075,17 +1083,18 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 
 		Map<Integer, Object> mapLob = getFieldToQuery(fields, campi, valori);
 
-		if(!"".equals(otherSet)) {
+		if (!"".equals(otherSet)) {
 			String[] list = otherSet.split(",");
 			for (String setCond : list) {
 				String[] setter = setCond.split("=");
-				if(setter.length == 2) {
+				if (setter.length == 2) {
-					Field f = entityHolder.getFieldBySql(this.getClass().getSimpleName(), setter[0].toLowerCase().trim());
+					Field f = entityHolder.getFieldBySql(this.getClass().getSimpleName(),
-					if(f==null)
+							setter[0].toLowerCase().trim());
+					if (f == null)
 						throw new Exception("campo " + setter[0].trim() + " non presente nella entity");
 					f.setAccessible(true);
 					int idx = campi.indexOf(setter[0].toLowerCase().trim());
-					if(idx > -1) {
+					if (idx > -1) {
 						campi.remove(idx);
 						valori.remove(idx);
 					}
@@ -1104,9 +1113,8 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 			}
 		}
 
-		if (campi.size()!= 0) {		
+		if (campi.size() != 0) {
-			String sql = "INSERT INTO " + getTableName() + "("
+			String sql = "INSERT INTO " + getTableName() + "(" + StringUtils.join(campi, ",") + ") VALUES ("
-					+ StringUtils.join(campi, ",") + ") VALUES ("
 					+ StringUtils.join(valori, ",") + ")";
 			if (logger.isTraceEnabled()) {
 				logger.trace("QUERY: " + sql);
@@ -1117,21 +1125,21 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 			pstm.executeUpdate();
 			pstm.close();
 		} else {
-			throw new Exception("Nessun campo valorizzato per la entity " + getTableName() + " (Controllare metodi get/set della entity)");
+			throw new Exception("Nessun campo valorizzato per la entity " + getTableName()
+					+ " (Controllare metodi get/set della entity)");
 		}
 	}
 
-	private void setupBinaryParams(Map<Integer, Object> mapLob,
+	private void setupBinaryParams(Map<Integer, Object> mapLob, PreparedStatement pstm) throws SQLException {
-			PreparedStatement pstm) throws SQLException {
 		for (Entry<Integer, Object> entry : mapLob.entrySet()) {
 			Object val = mapLob.get(entry.getKey());
-			if(val instanceof Clob){
+			if (val instanceof Clob) {
-				if(EmsRestConstants.NULL.equals(((Clob)val).getSubString(1L, (int)((Clob)val).length())))
+				if (EmsRestConstants.NULL.equals(((Clob) val).getSubString(1L, (int) ((Clob) val).length())))
 					pstm.setNull(entry.getKey(), java.sql.Types.CLOB);
 				else
 					pstm.setClob(entry.getKey(), (Clob) val);
-			} else if(val instanceof Blob){
+			} else if (val instanceof Blob) {
-				if(EmsRestConstants.NULL.equals(new String(((Blob)val).getBytes(1L, (int)((Blob)val).length()))))
+				if (EmsRestConstants.NULL.equals(new String(((Blob) val).getBytes(1L, (int) ((Blob) val).length()))))
 					pstm.setNull(entry.getKey(), java.sql.Types.BLOB);
 				else
 					pstm.setBlob(entry.getKey(), (Blob) val);
@@ -1154,15 +1162,16 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 
 		Map<Integer, Object> mapLob = getFieldToUpdate(fields, campi, where);
 
-		if(!"".equals(otherSet)) {
+		if (!"".equals(otherSet)) {
 			List<String> pkSetList = new ArrayList<String>();
 
 			String[] list = otherSet.split(",");
 			for (String setCond : list) {
 				String[] setter = setCond.split("=");
-				if(setter.length == 2) {
+				if (setter.length == 2) {
-					Field f = entityHolder.getFieldBySql(this.getClass().getSimpleName(), setter[0].toLowerCase().trim());
+					Field f = entityHolder.getFieldBySql(this.getClass().getSimpleName(),
-					if(f==null)
+							setter[0].toLowerCase().trim());
+					if (f == null)
 						throw new Exception("campo " + setter[0].trim() + " non presente nella entity");
 					f.setAccessible(true);
 					if (f.getAnnotation(SqlField.class) != null) {
@@ -1180,7 +1189,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 			campi.addAll(pkSetList);
 		}
 
-		if(campi.size() > 0) {
+		if (campi.size() > 0) {
 			String sql = "UPDATE " + getTableName() + " SET " + StringUtils.join(campi, ",");
 
 			if (whereCond != null) {
@@ -1208,22 +1217,22 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 			Object obj = field.get(parent);
 			if (obj != null && field.getAnnotation(SqlField.class) != null) {
 
-				//COPY FIELD ANNOTATED WITH @PK
+				// COPY FIELD ANNOTATED WITH @PK
 				PK pk = field.getAnnotation(PK.class);
 				if (pk != null) {
 					String mName = "set" + field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
 					Method m = ReflectionUtils.findMethod(getClass(), mName, obj.getClass());
-					if(m != null)
+					if (m != null)
 						m.invoke(this, obj);
 				}
 
-				//COPY FIELD ANNOTATED WITH @ImportFromParent
+				// COPY FIELD ANNOTATED WITH @ImportFromParent
 				ImportFromParent cpFrmParent = field.getAnnotation(ImportFromParent.class);
 				if (cpFrmParent != null) {
 					String mName = "set" + field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
-					if(obj != null) {
+					if (obj != null) {
 						Method m = ReflectionUtils.findMethod(getClass(), mName, obj.getClass());
-						if(m != null)
+						if (m != null)
 							m.invoke(this, obj);
 					}
 				}
@@ -1235,23 +1244,23 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 	public void setImportFromParent(EntityBase parent) throws Exception {
 		Field[] fields = getClass().getDeclaredFields();
 		for (Field field : fields) {
-			//field.getAnnotation(SqlField.class) != null && 
+			// field.getAnnotation(SqlField.class) != null &&
 			if (field.getAnnotation(ImportFromParent.class) != null) {
 				ImportFromParent ifp = field.getAnnotation(ImportFromParent.class);
 				String fieldName;
-				if(!"".equals(ifp.value()))
+				if (!"".equals(ifp.value()))
 					fieldName = ifp.value();
 				else
 					fieldName = field.getName();
 				Field fieldParent = ReflectionUtils.findField(parent.getClass(), fieldName);
-				if(fieldParent != null) {
+				if (fieldParent != null) {
 					fieldParent.setAccessible(true);
 					Object obj = fieldParent.get(parent);
 
 					String mName = "set" + field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
-					if(obj != null){
+					if (obj != null) {
 						Method m = ReflectionUtils.findMethod(getClass(), mName, obj.getClass());
-						if(m != null)
+						if (m != null)
 							m.invoke(this, obj);
 					}
 				} else {
@@ -1276,19 +1285,19 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 			else
 				dato = "'" + UtilityString.escapeSpecialChar(obj) + "'";
 		} else if (obj instanceof Date) {
-			if(obj.equals(EmsRestConstants.DATE_NULL)) {
+			if (obj.equals(EmsRestConstants.DATE_NULL)) {
 				dato = "null";
 			} else {
 				dato = UtilityString.removeApiciStartEnd(obj);
-				dato = "'"+ new SimpleDateFormat(CommonConstants.DATETIME_FORMAT_YMD).format(obj)+ "'";
+				dato = "'" + new SimpleDateFormat(CommonConstants.DATETIME_FORMAT_YMD).format(obj) + "'";
 			}
 		} else if (obj instanceof Integer) {
-			if(obj.equals(EmsRestConstants.INTEGER_NULL)) {
+			if (obj.equals(EmsRestConstants.INTEGER_NULL)) {
 				dato = "null";
 			} else
 				dato = obj.toString();
 		} else if (obj instanceof BigDecimal) {
-			if(obj.equals(EmsRestConstants.BIGDECIMAL_NULL)) {
+			if (obj.equals(EmsRestConstants.BIGDECIMAL_NULL)) {
 				dato = "null";
 			} else
 				dato = obj.toString();
@@ -1328,7 +1337,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 	}
 
 	public void deleteAllEntities(Connection conn, String where) throws Exception {
-		if(this.getOperation() == null) {
+		if (this.getOperation() == null) {
 			this.setOperation(OperationType.DELETE);
 			this.setWhereCond(where);
 			this.connection = conn;
@@ -1336,23 +1345,18 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		this.manage();
 
 		/*
-		String sql = "DELETE " + getTableName();
+		 * String sql = "DELETE " + getTableName(); if (whereCond != null) { sql
-		if (whereCond != null) {
+		 * += " WHERE " + whereCond; } else { sql += " WHERE " +
-			sql += " WHERE " + whereCond;
+		 * StringUtils.join(where, " AND "); }
-		} else {
+		 * 
-			sql += " WHERE " + StringUtils.join(where, " AND ");
+		 * if (logger.isTraceEnabled()) { logger.trace("QUERY: " + sql); }
-		}
+		 * 
-
+		 * PreparedStatement pstm = conn.prepareStatement(sql);
-		if (logger.isTraceEnabled()) {
+		 * pstm.executeUpdate(); pstm.close();
-			logger.trace("QUERY: " + sql);
+		 */
-		}
-
-		PreparedStatement pstm = conn.prepareStatement(sql);
-		pstm.executeUpdate();
-		pstm.close(); */
 	}
 
-	public String getPkWhereCond() throws Exception{
+	public String getPkWhereCond() throws Exception {
 		Field[] fields = this.getClass().getDeclaredFields();
 		List<String> where = getPkWhereCond(fields, this);
 
@@ -1364,8 +1368,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 
 	}
 
-	private List<String> getPkWhereCond(Field[] fields, EntityBase parent)
+	private List<String> getPkWhereCond(Field[] fields, EntityBase parent) throws IllegalAccessException {
-			throws IllegalAccessException {
 		List<String> where = new ArrayList<String>();
 
 		for (Field field : fields) {
@@ -1411,8 +1414,8 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		pstm.close();
 	}
 
-	private Map<Integer, Object> getFieldToQuery(Field[] fields, List<String> campi,
+	private Map<Integer, Object> getFieldToQuery(Field[] fields, List<String> campi, List<String> valori)
-			List<String> valori) throws Exception {
+			throws Exception {
 
 		Map<Integer, Object> map = new HashMap<Integer, Object>();
 		Integer counter = 1;
@@ -1422,17 +1425,17 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 			SqlField sqlField;
 			if (obj != null && (sqlField = field.getAnnotation(SqlField.class)) != null) {
 
-				//esclusione colonne per sincronizzazione
+				// esclusione colonne per sincronizzazione
-				if(excludedColumns != null && 
+				if (excludedColumns != null
-						excludedColumns.contains(SqlFieldHolder.getSqlValue(sqlField.value(), field)))
+						&& excludedColumns.contains(SqlFieldHolder.getSqlValue(sqlField.value(), field)))
 					continue;
-				if(field.getAnnotation(it.integry.ems.annotation.Clob.class) != null){
+				if (field.getAnnotation(it.integry.ems.annotation.Clob.class) != null) {
 					setupClobData(counter, map, obj);
 					valori.add("?");
 					campi.add(SqlFieldHolder.getSqlValue(sqlField.value(), field));
 
 					counter++;
-				} else if(field.getAnnotation(it.integry.ems.annotation.Blob.class) != null) {
+				} else if (field.getAnnotation(it.integry.ems.annotation.Blob.class) != null) {
 					setupBlobData(counter, map, obj);
 					valori.add("?");
 					campi.add(SqlFieldHolder.getSqlValue(sqlField.value(), field));
@@ -1463,19 +1466,19 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 				if (pk != null) {
 					where.add(sqlVal + " = " + dato);
 				} else {
-					if(getOperation() != OperationType.INSERT) {
+					if (getOperation() != OperationType.INSERT) {
-						//esclusione colonne per sincronizzazione
+						// esclusione colonne per sincronizzazione
-						if(excludedColumns != null && (excludedColumns.contains(sqlField.value()) ||
+						if (excludedColumns != null && (excludedColumns.contains(sqlField.value())
-								excludedColumns.contains(field.getName())))
+								|| excludedColumns.contains(field.getName())))
 							continue;
 					}
 
-					if(field.getAnnotation(it.integry.ems.annotation.Clob.class) != null){
+					if (field.getAnnotation(it.integry.ems.annotation.Clob.class) != null) {
 						setupClobData(counter, mapLob, obj);
 						campi.add(sqlVal + " = ?");
 
 						counter++;
-					} else if(field.getAnnotation(it.integry.ems.annotation.Blob.class) != null) {
+					} else if (field.getAnnotation(it.integry.ems.annotation.Blob.class) != null) {
 						setupBlobData(counter, mapLob, obj);
 						campi.add(sqlVal + " = ?");
 
@@ -1493,10 +1496,10 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		Blob blobData = connection.createBlob();
 
 		byte[] blob;
-		if(EmsRestConstants.NULL.equals(obj.toString()))
+		if (EmsRestConstants.NULL.equals(obj.toString()))
 			blob = obj.toString().getBytes();
 		else
-			//base64 conversion
+			// base64 conversion
 			blob = Base64.decodeBase64(obj.toString());
 
 		blobData.setBytes(1, blob);
@@ -1507,10 +1510,10 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 		Clob clobData = connection.createClob();
 
 		String clob;
-		if(EmsRestConstants.NULL.equals(obj.toString()))
+		if (EmsRestConstants.NULL.equals(obj.toString()))
 			clob = obj.toString();
 		else
-			//base64 conversion
+			// base64 conversion
 			clob = new String(Base64.decodeBase64(obj.toString()));
 
 		clobData.setString(1, clob);

ems-model/src/main/java/it/integry/ems/config/EmsRestConstants.java

@@ -153,6 +153,7 @@ public class EmsRestConstants {
 	public static final String PATH_IMPORT_COLLI_SLIM2K = PATH + "importColliSlim2k";
 	public static final String PATH_IMPORT_COLLI_ACQ_SLIM2K = PATH + "importColliAcqSlim2k";
 	public static final String PATH_IMPORT_STOCKS_SLIM2K = PATH + "importStocksSlim2k";
+	public static final String PATH_IMPORT_INVENTARIO_SLIM2K = PATH + "importInventarioSlim2k";
 	
 	//ECEDI
 	public static final String PATH_IMPORT_ECEDI = PATH + "importEcedi";

ems-model/src/main/java/it/integry/ems/entity/MtbInvenr.java

@@ -3,6 +3,7 @@ package it.integry.ems.entity;
 import it.integry.common.var.CommonConstants;
 import it.integry.ems.annotation.ImportFromParent;
 import it.integry.ems.annotation.PK;
+import it.integry.ems.annotation.Priority;
 import it.integry.ems.annotation.SqlDetailId;
 import it.integry.ems.annotation.SqlField;
 import it.integry.ems.annotation.Table;
@@ -14,6 +15,7 @@ import java.util.Date;
 
 import org.kie.api.definition.type.PropertyReactive;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
 @PropertyReactive
@@ -90,6 +92,12 @@ public class MtbInvenr extends EntityBase {
 	@ImportFromParent
 	private String regolaCalcoloCosto;
 	
+	@JsonProperty
+	private Date dataScadPartitaMag;
+	
+	@Priority(1)
+	private MtbPartitaMag mtbPartitaMag;
+	
 	public String getRegolaCalcoloCosto() {
 		return regolaCalcoloCosto;
 	}
@@ -242,6 +250,22 @@ public class MtbInvenr extends EntityBase {
 		this.dataInventario = dataInventario;
 	}
 
+	public Date getDataScadPartitaMag() {
+		return dataScadPartitaMag;
+	}
+
+	public void setDataScadPartitaMag(Date dataScadPartitaMag) {
+		this.dataScadPartitaMag = dataScadPartitaMag;
+	}
+
+	public MtbPartitaMag getMtbPartitaMag() {
+		return mtbPartitaMag;
+	}
+
+	public void setMtbPartitaMag(MtbPartitaMag mtbPartitaMag) {
+		this.mtbPartitaMag = mtbPartitaMag;
+	}
+
 	@Override
 	public void checkPreSave() throws Exception {
 	}

ems-ordikids/.classpath

@@ -23,10 +23,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

ems-product/.classpath

@@ -23,10 +23,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

ems-system/.classpath

@@ -23,10 +23,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

ems-utility/.classpath

@@ -23,10 +23,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>