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

Merge branch 'develop' into feature/JDK11
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
jenkins
2025-06-16 18:39:19 +02:00
parent 81299028d7 a1ad6fc86c
commit 9af6321320
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java
View File

@@ -208,7 +208,7 @@ public class PvmAccettazioneService {
.setCodDtipProvv(codDtip) .setCodDtipProvv(codDtip)
.setDataDocProvv(dataDoc) .setDataDocProvv(dataDoc)
.setSerDocProvv(serDoc) .setSerDocProvv(serDoc)
.setNumDoc(numDoc); .setNumDocProvv(numDoc);
Optional<MtbColr> firstOrd = Stream.of(collo.getValue()) Optional<MtbColr> firstOrd = Stream.of(collo.getValue())
.filter(x -> x.getDataOrd() != null && x.getNumOrd() != null) .filter(x -> x.getDataOrd() != null && x.getNumOrd() != null)
@@ -258,7 +258,7 @@ public class PvmAccettazioneService {
String serCollo = collo.getSerCollo(); String serCollo = collo.getSerCollo();
Integer numCollo = collo.getNumCollo(); Integer numCollo = collo.getNumCollo();
String cond = " mtb_colr.data_collo = " + UtilityDB.valueDateToString(dataCollo, CommonConstants.DATE_FORMAT_YMD) String cond = " mtb_colr.gestione = 'A' AND mtb_colr.data_collo = " + UtilityDB.valueDateToString(dataCollo, CommonConstants.DATE_FORMAT_YMD)
+ " AND " + " mtb_colr.ser_collo = " + UtilityDB.valueToString(serCollo) + " AND " + " AND " + " mtb_colr.ser_collo = " + UtilityDB.valueToString(serCollo) + " AND "
+ " mtb_colr.num_collo = " + numCollo; + " mtb_colr.num_collo = " + numCollo;
if (!UtilityString.isNullOrEmpty(whereCondColli)) { if (!UtilityString.isNullOrEmpty(whereCondColli)) {