Merge branch 'master' into feature/RefactoringGestioneColli

# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java

ems-core/src/main/java/it/integry/ems_model/entity/DtbDocr.java

@@ -266,7 +266,7 @@ public class DtbDocr extends DtbBaseDocR implements EquatableEntityInterface<Dtb
 
     /*Flag_sezione vale 1 per le righe dei riepilogo INTRa, mentre per tutte le altre righe vale null */
     @SqlField(value = "flag_sezione")
-    private FlagSezione flagSezione;
+    private FlagSezione flagSezione = FlagSezione.RIGHE_DOC;
 
     @JsonProperty(value = "pesoNetto")
     private BigDecimal pesoNetto;

ems-engine/src/main/java/it/integry/ems/retail/export/service/ScontriniZucchettiExportServices.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -66,7 +67,7 @@ public class ScontriniZucchettiExportServices {
         List<HashMap<String, Object>> setupReparti = UtilityDB.executeSimpleQuery(multiDBTransactionManager.getPrimaryConnection(), sql);
 
         if (UtilityString.isNullOrEmpty(whereCond)) {
-            whereCond = "ntb_doct.date_only_doc = " + UtilityDB.valueDateToString(new Date(), CommonConstants.DATE_FORMAT_YMD);
+            whereCond = "ntb_doct.date_only_doc = " + UtilityDB.valueToString(LocalDate.now().minusDays(1));
         }
 
         sql =

ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java

@@ -30,6 +30,7 @@ import it.integry.ems.retail.wms.generic.dto.picking_list.SitArtOrdAccettazioneD
 import it.integry.ems.retail.wms.generic.dto.picking_list.SitArtOrdDTO;
 import it.integry.ems.retail.wms.lavorazione.service.WMSLavorazioneService;
 import it.integry.ems.rules.businessLogic.LoadColliService;
+import it.integry.ems.rules.businessLogic.enums.FlagSezione;
 import it.integry.ems.rules.completing.PackagesRules;
 import it.integry.ems.service.AziendaService;
 import it.integry.ems.service.EntityProcessor;
@@ -1314,6 +1315,7 @@ public class WMSGenericService {
                         .setPartitaMag(sourceMtbColr.getPartitaMag())
                         .setQta(differenceQtaCol)
                         .setNumCnf(differenceNumCnf)
+                        .setFlagSezione(FlagSezione.RIGHE_COLLO)
                         .setQtaCnf(qtaCnf);
                 dtbDocr.setOperation(OperationType.INSERT);