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

Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2025-04-29 13:18:03 +02:00
parent 2a088112ce 09c35872dd
commit ee9c0f95a2
4 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250429110700.java Normal file
View File

@@ -0,0 +1,20 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20250429110700 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
executeStatement("update stb_menu set descrizione = 'Allineamento Numero Documenti' where cod_opz = 'cg049'",
"update stb_menu_opz set descrizione = 'Allineamento Numero Documenti' where cod_opz = 'cg049'");
}
@Override
public void down() throws Exception {
}
}

2
ems-core/src/main/resources/menus/menu_config.json
View File

File diff suppressed because one or more lines are too long

8
ems-engine/src/main/java/it/integry/ems/production/controller/MesProductionControllerV2.java
View File

@@ -436,6 +436,14 @@ public class MesProductionControllerV2 {
return ServiceRestResponse.createPositiveResponse(mesProductionService.versaMaterialeSuOrdine(dto));
}
@PostMapping(value = "cambioLottoGiornalieroOrdiniLav")
public @ResponseBody
ServiceRestResponse cambioLottoGiornalieroOrdiniLav(@RequestParam(required = false) String codJfas) throws Exception {
mesProductionService.cambioLottoGiornalieroOrdiniLav(codJfas);
return ServiceRestResponse.createPositiveResponse();
}
@PostMapping(value = "duplicaOrdiniGiornoDopo")
public @ResponseBody
ServiceRestResponse duplicaOrdiniGiornoDopo(@RequestParam String codJfas) throws Exception {

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

@@ -2106,7 +2106,7 @@ public class MesProductionServiceV2 {
return UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, AttachmentDTO.class);
}
public void duplicaOrdiniGiornoDopo(String codJfas) throws Exception {
public void cambioLottoGiornalieroOrdiniLav(String codJfas) throws Exception {
try {
String sql = Query.format(
"WITH setup AS (SELECT *\n" +
@@ -2128,14 +2128,11 @@ public class MesProductionServiceV2 {
return;
}
List<MtbPartitaMag> listaPartite = new ArrayList<>();
for (OrdineLavorazioneDTO dto : ordini) {
Date dataOrd = UtilityDate.getTodayWithoutTime();
String partitaMag = listaPartite.stream().filter(x -> UtilityDate.isSameDay(x.getDataScad(), dto.getDataScad()) && x.getCodMart().equalsIgnoreCase(dto.getCodProd())).findFirst().orElse(new MtbPartitaMag()).getPartitaMag();
if (UtilityString.isNullOrEmpty(partitaMag)) {
partitaMag = PartitaMagRules.suggestCodePartitaMag(multiDBTransactionManager.getPrimaryConnection(),
String partitaMag = PartitaMagRules.suggestCodePartitaMag(multiDBTransactionManager.getPrimaryConnection(),
new DatiPartitaMagDTO()
.setCodMart(dto.getCodProd())
.setDataOrd(dataOrd)
@@ -2146,20 +2143,12 @@ public class MesProductionServiceV2 {
.setCodMart(dto.getCodProd())
.setPartitaMag(partitaMag)
.setDataScad(dto.getDataScad())
.setNote(dto.getNoteLav()), true);
MtbPartitaMag mtbPartitaMag = (MtbPartitaMag) listPartitaMag.stream().filter(x -> x.getTableName().equalsIgnoreCase(MtbPartitaMag.ENTITY)).findFirst().orElseThrow(Exception::new);
listaPartite.add(mtbPartitaMag);
}
DtbOrdt ordLav = new DtbOrdt()
.setGestione(dto.getGestione())
.setDataOrd(dto.getDataOrd())
.setNumOrd(dto.getNumOrd())
.setPartitaMag(partitaMag);
ordLav.setOperation(OperationType.UPDATE);
.setGestione(dto.getGestione())
.setCodJfas(dto.getCodJfas())
.setNote(dto.getNoteLav()), true);
entityProcessor.processEntity(ordLav, true, multiDBTransactionManager);
}
} catch (Exception e) {
multiDBTransactionManager.rollbackAll();
@@ -2168,7 +2157,7 @@ public class MesProductionServiceV2 {
}
public void duplicaOrdiniGiornoDopoOld(String codJfas) throws Exception {
public void duplicaOrdiniGiornoDopo(String codJfas) throws Exception {
String sql = Query.format(
"WITH setup AS (SELECT *\n" +
" FROM stb_gest_setup_det\n" +