Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-09-23 19:02:44 +02:00
parent b8e03337ee bda9427eb8
commit d6125204dd
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
View File

@@ -21,6 +21,7 @@ import it.integry.ems.service.exception.EmptyReportException;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityEntity;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.db.ResultSetMapper;
import it.integry.ems_model.entity.*;
import it.integry.ems_model.exception.GestSetupNotFoundException;
@@ -309,7 +310,15 @@ public class MesProductionServiceV2 {
.setNumOrd(numOrd)
.setGestione(gestioneOrd);
// order.setDataInizProd(new Date());
order.setOperation(OperationType.NO_OP);
boolean fermaCreaDocsEnabled = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "CARICO_SCARICO_PF", "SETUP", "FERMA_CREA_DOCS");
if (fermaCreaDocsEnabled) {
order.setDataConsProdMax(EmsRestConstants.DATE_NULL);
order.setOperation(OperationType.UPDATE);
} else {
order.setOperation(OperationType.NO_OP);
}
order.setDtbOrdSteps(new ArrayList<>());
order.getDtbOrdSteps().add(lastStep);

8
ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java
View File

@@ -202,7 +202,13 @@ public class GiacenzaService {
" LEFT OUTER JOIN dtb_tipi ON ntb_doct.cod_dtip_val = dtb_tipi.cod_dtip\n" +
" WHERE ntb_doct.cod_mdep IN ([ELENCO_DEPOSITI])\n" +
" AND ntb_doct.causale = 'V'\n" +
" AND (ntb_doct.data_doc_val IS NULL OR dtb_tipi.segno_qta_scar = 0))\n" +
" AND (ntb_doct.data_doc_val IS NULL OR dtb_tipi.segno_qta_scar = 0) \n" +
" AND NOT EXISTS (SELECT * \n" +
" FROM dtb_doct\n" +
" INNER JOIN mtb_depo ON dtb_doct.cod_mdep = mtb_depo.cod_mdep AND \n" +
" dtb_doct.cod_dtip = mtb_depo.cod_dtip \n" +
" WHERE date_only_doc = dtb_doct.data_doc \n" +
" AND ntb_doct.cod_mdep = dtb_doct.cod_mdep)) " +
"\n" +
"SELECT movimenti.cod_mdep,\n" +
" art.cod_mart_mov as cod_mart,\n" +