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

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

Browse Source
This commit is contained in:
Valerio Castellana
2025-10-31 12:26:37 +01:00
parent db83ba4a3c 04eb85b190
commit ff81f2129b
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
View File

@@ -115,7 +115,7 @@ public class WMSLavorazioneService {
.setCodMdep(createUDSRequestDTO.getCodMdep())
.setSegno(createUDSRequestDTO.getSegno())
.setAnnotazioni(createUDSRequestDTO.getAnnotazioni())
.setOraInizPrep(UtilityDate.isNull(UtilityLocalDate.localDateTimeToDate(createUDSRequestDTO.getOraInizPrep()),new Date()))
.setOraInizPrep(UtilityDate.isNull(UtilityLocalDate.localDateTimeToDate(createUDSRequestDTO.getOraInizPrep()), new Date()))
.setPreparatoDa(userSession.getUsername())
.setPosizione(createUDSRequestDTO.getPosizione())
.setCodJfas(createUDSRequestDTO.getCodJfas())
@@ -366,7 +366,7 @@ public class WMSLavorazioneService {
.setCodMdepOut(sourceMtbColr.getCodMdepIn())
.setBarcodeUlOut(sourceMtbColr.getBarcodeUlIn());
//Non valorizzo i campi IN perchè si è ritenuto errato negli L-
//Non valorizzo i campi IN perchè si è ritenuto errato negli L-
// .setBarcodeUlIn(targetMtbColt.getBarcodeUl())
// .setPosizioneIn(targetMtbColt.getPosizione())
// .setCodMdepIn(targetMtbColt.getCodMdep());
@@ -801,7 +801,7 @@ public class WMSLavorazioneService {
mtbColtToClose.setOraFinePrep(new Date())
.setOperation(OperationType.UPDATE);
entityProcessor.processEntity(mtbColtToClose,true, multiDBTransactionManager);
entityProcessor.processEntity(mtbColtToClose, true, multiDBTransactionManager);
return new CloseUDCResponseDTO()
.setSaved(true);
@@ -935,7 +935,7 @@ public class WMSLavorazioneService {
return;
}
if(udsMateriaPrimaRows.stream().anyMatch(x -> UtilityString.isNullOrEmpty(x.getBarcodeUlOut()))) {
if (udsMateriaPrimaRows.stream().anyMatch(x -> UtilityString.isNullOrEmpty(x.getBarcodeUlOut()))) {
throw new Exception("Non è possibile riproporzionare gli scarichi UDS se non sono stati dichiarati i barcode UL di uscita!");
}
@@ -1024,7 +1024,7 @@ public class WMSLavorazioneService {
MtbColr oldScaricoClone = (MtbColr) oldScarico.clone();
oldScaricoClone
.setQtaCol(qtaDaScaricare)
.setNumCnf(UtilityBigDecimal.multiply(qtaDaScaricare, oldScaricoClone.getQtaCnf()));
.setNumCnf(UtilityBigDecimal.divide(qtaDaScaricare, oldScaricoClone.getQtaCnf()));
//Movements here
MtbColt udsMtbColtClone = (MtbColt) udsMateriaPrima.stream()
@@ -1040,8 +1040,11 @@ public class WMSLavorazioneService {
List<MtbColr> generatedMovementsInNewUds = generatedMovements.getSecond();
generatedMovementsInNewUds.forEach(x -> x.setOperation(OperationType.INSERT));
oldScarico.setQtaCol(oldScarico.getQtaCol().subtract(qtaDaScaricare));
oldScarico.setNumCnf(UtilityBigDecimal.multiply(oldScarico.getQtaCol(), oldScarico.getQtaCnf()));
oldScarico.setQtaCol(oldScarico.getQtaCol().subtract(qtaDaScaricare))
.setNumCnf(UtilityBigDecimal.divide(oldScarico.getQtaCol(), oldScarico.getQtaCnf()))
.setPesoLordoKg(null)
.setPesoNettoKg(null);
oldScarico.setOperation(OperationType.UPDATE);
udsMateriaPrima.stream()
@@ -1087,7 +1090,9 @@ public class WMSLavorazioneService {
false, requestDataDTO, false);
notProcessedRow.setQtaCol(notProcessedRow.getQtaCol().subtract(notProcessedRow.getQtaCol()));
notProcessedRow.setNumCnf(UtilityBigDecimal.multiply(notProcessedRow.getQtaCol(), notProcessedRow.getQtaCnf()));
notProcessedRow.setNumCnf(UtilityBigDecimal.divide(notProcessedRow.getQtaCol(), notProcessedRow.getQtaCnf()));
notProcessedRow.setPesoLordoKg(null)
.setPesoNettoKg(null);
notProcessedRow.setOperation(OperationType.UPDATE);
boolean notProcessedRowPresentInSourceMtbColtToUpdate = originalUdsMateriaPrima.getMtbColr()
@@ -1149,13 +1154,12 @@ public class WMSLavorazioneService {
}
public CreateUDSResponseDTO createUDSWithRows(CreateUDSWithRowsRequestDTO data) throws Exception {
userSession.checkUser();
MtbColt uds = this.createUDSMovement(data);
for (InsertUDSRowRequestDTO row : data.getUdsRows()){
for (InsertUDSRowRequestDTO row : data.getUdsRows()) {
row.setTargetMtbColt(uds);
insertUDSRowMovement(row);
}