CRM fix commessa in fase di creazione

ems-engine/src/main/java/it/integry/ems/order/crm/service/CrmService.java

@@ -16,6 +16,7 @@ import it.integry.ems.service.EntityProcessor;
 import it.integry.ems.sync.MultiDBTransaction.Connection;
 import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
 import it.integry.ems.user.service.UserService;
+import it.integry.ems.utility.UtilityDebug;
 import it.integry.ems.utility.UtilityEntity;
 import it.integry.ems.utility.UtilityFile;
 import it.integry.ems_model.base.EntityBase;
@@ -164,7 +165,9 @@ public class CrmService {
             if (createContact.getActivityRequest() != null) {
                 response.setStbActivity(
                         createNewActivity(
-                                createContact.getActivityRequest(),
+                                createContact
+                                        .getActivityRequest()
+                                        .setCodJcom(codJcom),
                                 new CRMCreateNewCommessaRequestDTO()
                                         .setCommessa(createContact.getCommessa()),
                                 createContact.getCliente()
@@ -568,6 +571,7 @@ public class CrmService {
             ptbPrevt.setOperation(OperationType.INSERT);
             entityProcessor.processEntity(ptbPrevt, true, multiDBTransactionManager);
 
+            if (!UtilityDebug.isDebugExecution()){
                 if (!pathFolderPrevt.isEmpty() && !nameFileCheckList.isEmpty()) {
                     ls_nextNumFile = PreventRules.getNextNumFile(conn);
 
@@ -606,6 +610,7 @@ public class CrmService {
                     ptbPrevtFile.setOperation(OperationType.INSERT);
                     entityProcessor.processEntity(ptbPrevtFile, true, multiDBTransactionManager);
                 }
+            }
         } else {
             throw new Exception("Dati per preventivo inesistenti");
         }
@@ -644,6 +649,7 @@ public class CrmService {
                     .setUserName(userName)
                     .setActivityDescription(activityDescription)
                     .setUserCreator(requestDataDTO.getUsername())
+                    .setCodJcom(activityRequest.getCodJcom())
                     .setEstimatedTime(new Date());
 
             parentActivity.setOperation(OperationType.INSERT);