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

Finish AggDataVersCreaRettifCollo
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Anthony Santoro
2025-04-28 11:37:08 +02:00
parent ad3276d67f 520b5b9722
commit 579fdfded0
5 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ems-engine/src/main/java/it/integry/ems/customizations/production/service/GrammProductionService.java
View File

@@ -143,7 +143,7 @@ public class GrammProductionService {
BigDecimal newQtaCol = mtbColrCarichiGiac.get(0).getQtaCol().add(qtaDaRettificare);
BigDecimal newNumCnf = UtilityBigDecimal.divide(newQtaCol, mtbColrCarichiGiac.get(0).getQtaCnf());
wmsGenericService.creaRettificaCollo(codMdep, mtbColrCarichiGiac.get(0), newNumCnf, newQtaCol, false, false, null);
wmsGenericService.creaRettificaCollo(codMdep, mtbColrCarichiGiac.get(0), newNumCnf, newQtaCol, false, false);
} else if (isNegativeUpdate) {
BigDecimal qtaDaRettificare = caricoTotale.subtract(chiusuraLavorazioneSemoleRequestDTO.getQtaPastaSeccaProdotta());
@@ -154,7 +154,7 @@ public class GrammProductionService {
BigDecimal newQtaCol = mtbColrCarichiGiac.get(i).getQtaCol().subtract(qtaToTake);
BigDecimal newNumCnf = UtilityBigDecimal.divide(newQtaCol, mtbColrCarichiGiac.get(i).getQtaCnf());
wmsGenericService.creaRettificaCollo(codMdep, mtbColrCarichiGiac.get(i), newNumCnf, newQtaCol, false, false, null);
wmsGenericService.creaRettificaCollo(codMdep, mtbColrCarichiGiac.get(i), newNumCnf, newQtaCol, false, false);
counterQta = counterQta.add(qtaToTake);
}
}
@@ -449,7 +449,7 @@ public class GrammProductionService {
BigDecimal newQtaCol = mtbColrCarichi.get(0).getQtaCol().add(qtaDaRettificare);
BigDecimal newNumCnf = UtilityBigDecimal.divide(newQtaCol, mtbColrCarichi.get(0).getQtaCnf());
wmsGenericService.creaRettificaCollo(codMdep, mtbColrCarichi.get(0).toMtbColr(), newNumCnf, newQtaCol, false, false, null);
wmsGenericService.creaRettificaCollo(codMdep, mtbColrCarichi.get(0).toMtbColr(), newNumCnf, newQtaCol, false, false);
} else {
BigDecimal qtaDaRettificare = residuoCalc.subtract(chiusuraLavorazioneFornoRequestDTO.getQtaResiduo());
@@ -462,7 +462,7 @@ public class GrammProductionService {
BigDecimal newQtaCol = mtbColrCarichiGiac.get(i).getQtaCol().subtract(qtaToTake);
BigDecimal newNumCnf = UtilityBigDecimal.divide(newQtaCol, mtbColrCarichiGiac.get(i).getQtaCnf());
wmsGenericService.creaRettificaCollo(codMdep, mtbColrCarichiGiac.get(i).toMtbColr(), newNumCnf, newQtaCol, false, false, null);
wmsGenericService.creaRettificaCollo(codMdep, mtbColrCarichiGiac.get(i).toMtbColr(), newNumCnf, newQtaCol, false, false);
counterQta = counterQta.add(qtaToTake);
}
}

3
ems-engine/src/main/java/it/integry/ems/production/service/ProductionWarehouseService.java
View File

@@ -57,8 +57,7 @@ public class ProductionWarehouseService {
rettificaDto.getNewNumCnf(),
rettificaDto.getNewQtaCol(),
true,
true,
null));
true));
MtbColt testata = new MtbColt();
testata.setNumCollo(rettifica.getNumCollo());
testata.setDataCollo(rettifica.getDataCollo());

5
ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSGenericController.java
View File

@@ -435,7 +435,6 @@ public class WMSGenericController {
@RequestParam String codMdep,
@RequestParam(required = false, defaultValue = "false") Boolean forceNewCollo,
@RequestParam(required = false, defaultValue = "false") Boolean returnRettifica,
@RequestParam(required = false) Boolean shouldCreateMovFiscale,
@RequestBody RettificaULDTO rettificaULDTO) throws Exception {
MtbColr mtbColr = wmsGenericService.creaRettificaCollo(
@@ -443,9 +442,9 @@ public class WMSGenericController {
rettificaULDTO.getSourceMtbColr(),
rettificaULDTO.getNewNumCnf(),
rettificaULDTO.getNewQtaCol(),
rettificaULDTO.getNewDataVers(),
forceNewCollo != null ? forceNewCollo : false,
returnRettifica != null ? returnRettifica : false,
shouldCreateMovFiscale);
returnRettifica != null ? returnRettifica : false);
return ServiceRestResponse.createEntityPositiveResponse(mtbColr);
}

11
ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/RettificaULDTO.java
View File

@@ -3,12 +3,14 @@ package it.integry.ems.retail.wms.generic.dto;
import it.integry.ems_model.entity.MtbColr;
import java.math.BigDecimal;
import java.time.LocalDateTime;
public class RettificaULDTO {
private MtbColr sourceMtbColr;
private BigDecimal newNumCnf;
private BigDecimal newQtaCol;
private LocalDateTime newDataVers;
public MtbColr getSourceMtbColr() {
return sourceMtbColr;
@@ -36,4 +38,13 @@ public class RettificaULDTO {
this.newQtaCol = newQtaCol;
return this;
}
public LocalDateTime getNewDataVers() {
return newDataVers;
}
public RettificaULDTO setNewDataVers(LocalDateTime newDataVers) {
this.newDataVers = newDataVers;
return this;
}
}

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

@@ -57,6 +57,7 @@ import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -1191,7 +1192,11 @@ public class WMSGenericService {
return shoudBeDeleted;
}
public MtbColr creaRettificaCollo(String codMdep, MtbColr sourceMtbColr, BigDecimal newNumCnf, BigDecimal newQtaCol, boolean createNewCollo, boolean returnRettifica, Boolean shouldCreateMovFiscale) throws Exception {
public MtbColr creaRettificaCollo(String codMdep, MtbColr sourceMtbColr, BigDecimal newNumCnf, BigDecimal newQtaCol, boolean createNewCollo, boolean returnRettifica) throws Exception {
return creaRettificaCollo(codMdep, sourceMtbColr, newNumCnf, newQtaCol, null, createNewCollo, returnRettifica);
}
public MtbColr creaRettificaCollo(String codMdep, MtbColr sourceMtbColr, BigDecimal newNumCnf, BigDecimal newQtaCol, LocalDateTime newDataVers, boolean createNewCollo, boolean returnRettifica) throws Exception {
/*
Warning: il campo sourceMtbColr potrebbe non essere una reale mtb_colr ma potrebbe essere la somma delle
qta delle mtb_colr con stesso cod_mart, partita_mag, cod_col, cod_tagl.
@@ -1224,6 +1229,16 @@ public class WMSGenericService {
BigDecimal qtaCnf = null;
if (UtilityBigDecimal.equalsTo(differenceQtaCol, BigDecimal.ZERO) && UtilityBigDecimal.equalsTo(differenceNumCnf, BigDecimal.ZERO)) {
if (newDataVers != null) {
MtbColt mtbColt = MtbColt.fromMtbColr(sourceMtbColr);
mtbColt
.setDataVers(newDataVers)
.setOperation(OperationType.UPDATE);
entityProcessor.processEntity(mtbColt, multiDBTransactionManager);
}
return null;
} else if (UtilityBigDecimal.equalsTo(differenceQtaCol, BigDecimal.ZERO) || UtilityBigDecimal.equalsTo(differenceNumCnf, BigDecimal.ZERO)) {
//qtaCnf = BigDecimal.ZERO;
@@ -1410,6 +1425,12 @@ public class WMSGenericService {
.setMtbColr(new ArrayList<>());
mtbColt.setOperation(OperationType.NO_OP);
if (newDataVers != null) {
mtbColt
.setDataVers(newDataVers)
.setOperation(OperationType.UPDATE);
}
mtbColrToSave = (MtbColr) sourceMtbColr.clone();
mtbColrToSave
.setRiga(null)