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

.gitattributes

@@ -18,6 +18,19 @@
 /Entity[!!-~]managment[!!-~]system.doc -text
 /Interfaccia[!!-~]ecommerce[!!-~]Integry.docx -text
 /Interfaccia[!!-~]ecommerce[!!-~]Integry.pdf -text
+docs/Applicativi[!!-~]web.pptx -text
+docs/Arch1.odp -text
+docs/Ems[!!-~]Architettura.pptx -text
+docs/Integry[!!-~]Managment[!!-~]System[!!-~]-[!!-~]Sviluppi[!!-~]2.pptx -text
+docs/Integry[!!-~]Managment[!!-~]System[!!-~]sviluppi.pptx -text
+docs/Integry[!!-~]Managment[!!-~]System.pptx -text
+docs/Java[!!-~]6-7.pptx -text
+docs/Presentazione[!!-~]standard1.odp -text
+docs/Procedure[!!-~]da[!!-~]sviluppare.docx -text
+docs/Rule[!!-~]test[!!-~]sum.pptx -text
+docs/Schema[!!-~]righe[!!-~]entity.pptx -text
+docs/Tutorial[!!-~]Drools[!!-~]Rules.pptx -text
+docs/Web[!!-~]e[!!-~]strumenti[!!-~]per[!!-~]la[!!-~]programmazione.pptx -text
 ems-common/.classpath -text
 ems-common/.project -text
 ems-common/.settings/org.eclipse.core.resources.prefs -text

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

@@ -227,7 +227,8 @@ public class SmartLogisticService {
 		String sqlColt = "select d.num_cons AS 'NUM_CONS', c.gestione  AS 'GESTIONE', c.num_collo  AS 'NUM_COLLO',"
 				+ " CONVERT(VARCHAR, c.data_collo, 103) + ' ' + CONVERT(VARCHAR, c.data_collo, 108) as 'DATA_COLLO',"
 				+ " c.cod_anag AS 'COD_ANAG', c.segno AS 'SEGNO', c.annotazioni AS 'ANNOTAZIONI', c.cod_mdep AS 'COD_MDEP',"
-				+ " CONVERT(VARCHAR, GETDATE(), 112) as 'DT_CREATE', (select isnull(r.cod_barre,t.cod_barre) as 'BARCODE',"
+				+ " CONVERT(VARCHAR, GETDATE(), 103) + ' ' + CONVERT(VARCHAR, GETDATE(), 108) as 'DT_CREATE', "
+				+ "(select isnull(r.cod_barre,t.cod_barre) as '@BARCODE', isnull(r.cod_barre,t.cod_barre) as 'BARCODE',"
 				+ " isnull(r.cod_barre,t.cod_barre) as 'DESC', r.cod_mart AS 'COD_MART', r.cod_tagl AS 'COD_TAGL',"
 				+ " r.cod_col AS 'COD_COL', r.qta_col as 'QTA_COLLI', r.qta_col as 'QTA'"
 				+ " from mtb_colr r, ttb_bar_code t where r.gestione=c.gestione and r.data_collo = c.data_collo and r.num_collo = c.num_collo"
@@ -578,12 +579,9 @@ public class SmartLogisticService {
 		if(!UtilityString.isNullOrEmpty(numCons)) {
 			if(FiltroPicking.isChiavePicking(numCons)) {
 				DatiFiltroDTO filtro = FiltroPicking.parseChiaveOrdine(numCons);
-				if(filtro == null){				
+				if(filtro == null) {
 					throw new Exception("Codice a barre non valido");				
 				}
-				
-				//String data = new SimpleDateFormat("dd/MM/yyyy").format(filtro.getDataOrd());
-				
 				Document docFilter = UtilityXML.createFilter("FILTER", "DTB_ORDT", "GESTIONE", colt.getGestione(), "V");
 				UtilityXML.addFilter(docFilter, "FILTER", "DTB_ORDT", "DATA_ORD", filtro.getDataOrd(), "D");
 				UtilityXML.addFilter(docFilter, "FILTER", "DTB_ORDT", "NUM_ORD", filtro.getNumOrd(), "N");			
@@ -608,7 +606,7 @@ public class SmartLogisticService {
 					ResultSet rs = ps.executeQuery();
 					if(rs.next()){
 						codAnag = rs.getString("cod_anag");
-						codVdes = rs.getString("cod_vdes");
+						codVdes = UtilityString.streNull(rs.getString("cod_vdes"));
 						codVage = rs.getString("cod_vage");
 						serie = rs.getString("serie");
 					}
@@ -621,7 +619,7 @@ public class SmartLogisticService {
 					UtilityXML.addFilter(docFilter, "FILTER", "DTB_ORDT", "COD_VAGE", codVage, "V");
 					UtilityXML.addFilter(docFilter, "FILTER", "DTB_ORDT", "COD_ANAG", codAnag, "V");
 					UtilityXML.addFilter(docFilter, "FILTER", "DTB_ORDT", "COD_VDES", codVdes, "V");
-					UtilityXML.addFilter(docFilter, "FILTER", "DTB_ORDT", "NUM_CONS", numCons, "N");			
+					UtilityXML.addFilter(docFilter, "FILTER", "DTB_ORDT", "NUM_CONS", numCons, "V");
 					
 					colt.setFiltroOrdini(UtilityXML.convertDocumentToString(docFilter));
 			}
@@ -643,7 +641,8 @@ public class SmartLogisticService {
 			String codCol = xPath.evaluate("COD_COL", n);
 			String codTagl = xPath.evaluate("COD_TAGL", n);
 			
-			dataFine = UtilityString.parseDate(xPath.evaluate("DT_INS", n));
+			if(!UtilityString.isNullOrEmpty(xPath.evaluate("DT_INS", n)))
+				dataFine = UtilityString.parseDate(xPath.evaluate("DT_INS", n));
 			
 			if(UtilityString.isNullOrEmpty(codMart) && !UtilityString.isNullOrEmpty(codBarre)){
 				String query; 

ems-model/src/main/java/it/integry/ems/utility/UtilityXML.java

@@ -178,7 +178,9 @@ public class UtilityXML {
 						if (columnNode != null) {
 							type = columnNode.getTextContent();
 							cond = SqlFieldHolder.getSqlCond(tableName, colName, condColumn, type);
-							whereCondTable = SqlFieldHolder.andCond(whereCondTable + sep + cond, sep);
+							if(cond == null)
+								cond = tableName+"."+colName +" IS NULL";
+							whereCondTable = SqlFieldHolder.andCond(whereCondTable + sep + cond, sep);							
 						} else {
 							throw new Exception("FORMATO FILE XML NON CORRETTO. NON E' STATA SPECIFICATA LA TIPOLOGIA.");
 						}