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

Aggiunto flag per disattivare controllo deposito dei colli

Browse Source
This commit is contained in:
Anthony Santoro
2024-08-06 15:14:21 +02:00
parent 1fb9c25fae
commit 7b93c6e0a3
3 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ems-core/src/main/java/it/integry/ems/rules/businessLogic/LoadColliService.java
View File

@@ -381,25 +381,27 @@ public class LoadColliService {
// CONTROLLO DEPOSITO DEI COLLI // CONTROLLO DEPOSITO DEI COLLI
if (loadDatiFromDB) { if (loadColliDTO.isControllaDepoDeiColli()) {
query = if (loadDatiFromDB) {
"SELECT DISTINCT " + query =
"mtb_colt.cod_mdep " + "SELECT DISTINCT " +
"FROM mtb_colt " + "mtb_colt.cod_mdep " +
"WHERE mtb_colt.cod_mdep <> " + UtilityDB.valueToString(loadColliDTO.getCodMdep()); "FROM mtb_colt " +
"WHERE mtb_colt.cod_mdep <> " + UtilityDB.valueToString(loadColliDTO.getCodMdep());
query = UtilityDB.addwhereCond(query, whereCond, false); query = UtilityDB.addwhereCond(query, whereCond, false);
List<HashMap<String, Object>> results = UtilityDB.executeSimpleQuery(multiDBTransactionManager.getPrimaryConnection(), query); List<HashMap<String, Object>> results = UtilityDB.executeSimpleQuery(multiDBTransactionManager.getPrimaryConnection(), query);
if (results.size() > 0) { if (!results.isEmpty()) {
throw new Exception("Ci sono colli con Deposito diverso da quello del Documento"); throw new Exception("Ci sono colli con Deposito diverso da quello del Documento");
} }
} else { } else {
boolean any = Stream.of(loadColliDTO.getColli()) boolean any = Stream.of(loadColliDTO.getColli())
.anyMatch(mtbColt -> !mtbColt.getCodMdep().equalsIgnoreCase(loadColliDTO.getCodMdep())); .anyMatch(mtbColt -> !mtbColt.getCodMdep().equalsIgnoreCase(loadColliDTO.getCodMdep()));
if (any) { if (any) {
throw new Exception("Ci sono colli con Deposito diverso da quello del Documento"); throw new Exception("Ci sono colli con Deposito diverso da quello del Documento");
}
} }
} }

21
ems-core/src/main/java/it/integry/ems/rules/businessLogic/dto/LoadColliDTO.java
View File

@@ -32,9 +32,10 @@ public class LoadColliDTO {
/** /**
* Se settato a false vengono serializzati anche i dettagli della entity dtb_docr * Se settato a false vengono serializzati anche i dettagli della entity dtb_docr
*/ */
private boolean saveDoc = true; private boolean saveDoc = true;
private boolean controllaDepoDeiColli = true;
private List<MtbColt> colli = new ArrayList<>(); private List<MtbColt> colli = new ArrayList<>();
public String getGestione() { public String getGestione() {
@@ -199,16 +200,14 @@ public class LoadColliDTO {
return this; return this;
} }
// public LoadColliDTO setColliMtbColt(List<MtbColt> colli) { public boolean isControllaDepoDeiColli() {
// List<DatiCollo> datiColloList = new ArrayList<>(); return controllaDepoDeiColli;
// }
// for(MtbColt mtbColt : colli) {
// datiColloList.add(new DatiCollo(mtbColt)); public LoadColliDTO setControllaDepoDeiColli(boolean controllaDepoDeiColli) {
// } this.controllaDepoDeiColli = controllaDepoDeiColli;
// return this;
// this.colli = datiColloList; }
// return this;
// }
public boolean isSaveDoc() { public boolean isSaveDoc() {
return saveDoc; return saveDoc;

3
ems-engine/src/main/java/it/integry/ems/document/service/DocumentProdService.java
View File

@@ -1071,7 +1071,8 @@ public class DocumentProdService {
.setDataDoc(results.get(j).getDataDocFromCollo()) .setDataDoc(results.get(j).getDataDocFromCollo())
.setCodMdep(carico.getCodMdep()) .setCodMdep(carico.getCodMdep())
.setDataOrd(dataOrd) .setDataOrd(dataOrd)
.setNumOrd(numOrd); .setNumOrd(numOrd)
.setControllaDepoDeiColli(false);
String condDataCollo = ""; String condDataCollo = "";
if (carico.getDataDoc() == null) { if (carico.getDataDoc() == null) {