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

varie modifiche su documenti di vendita

Browse Source
This commit is contained in:
Mina Ruggiero
2025-01-03 17:19:14 +01:00
parent c4f40f4d0c
commit 05013cd177
8 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdCalTotaliRules.java
View File

@@ -462,7 +462,7 @@ public class DocOrdCalTotaliRules extends QueryRules {
String gestione = testata.getGestione();
String codDivi = testata.getCodDivi();
boolean flagPrezziScontati = testata.getFlagPrzScontati().equalsIgnoreCase("S");
boolean flagPrezziScontati = UtilityString.isNull(testata.getFlagPrzScontati(), "N").equalsIgnoreCase("S");
BigDecimal sconto1 = testata.getSconto1();
BigDecimal sconto2 = testata.getSconto2();
BigDecimal sconto3 = testata.getSconto3();
@@ -612,7 +612,7 @@ public class DocOrdCalTotaliRules extends QueryRules {
if (qta.compareTo(BigDecimal.ZERO) != 0) {
boolean ventilazione = false;
if ( row instanceof DtbDocr) ventilazione = ((DtbDocr) row).getVentilazione();
addCastellettoIva("S".equals(flagIvaInclusa)?impRigaIva:importoRiga, codAliq, ventilazione, castelletto);
addCastellettoIva(flagIvaInclusa?impRigaIva:importoRiga, codAliq, ventilazione, castelletto);
}
/**************************
@@ -891,7 +891,7 @@ public class DocOrdCalTotaliRules extends QueryRules {
}
private static void addCastellettoIva(BigDecimal importoRiga, String codAliq, Boolean ventilazione, List<CtbMovi> castelletto) {
java.util.Optional<CtbMovi> first = castelletto.stream().filter(x -> x.getCodAliq().equalsIgnoreCase(codAliq) && x.getVentilazione() == ventilazione).findFirst();
java.util.Optional<CtbMovi> first = castelletto.stream().filter(x -> UtilityString.equalsIgnoreCase(x.getCodAliq(), codAliq) && x.getVentilazione() == ventilazione).findFirst();
CtbMovi ctbMovi;
if (first.isPresent()) {
ctbMovi = first.get();

5
ems-core/src/main/java/it/integry/ems/rules/completing/DocumentCheckRules.java
View File

@@ -340,7 +340,10 @@ public class DocumentCheckRules {
} else if ("serDoc".equals(fieldName)) {
serDocOld = (String) fieldValue;
} else if ("numDoc".equals(fieldName)) {
numDocOld = (Integer) fieldValue;
if ( fieldValue instanceof String ) {
numDocOld = Integer.valueOf((String) fieldValue);
} else
numDocOld = (Integer) fieldValue;
}
}
}

5
ems-core/src/main/java/it/integry/ems/rules/completing/DocumentRules.java
View File

@@ -41,9 +41,8 @@ public class DocumentRules extends QueryRules {
public static Integer completeNumDoc(Connection conn, DtbDoct entity) throws SQLException {
Integer numDocOld = entity.getNumDoc();
Integer numDocNew = 0;
numDocOld = entity.getNumDoc() == null ? 0 : entity.getNumDoc();
Integer numDocNew;
Integer numDocOld = entity.getNumDoc() == null ? 0 : entity.getNumDoc();
String tipoNumeraz = entity.getDtbTipi().getTipoNumeraz();
if (!tipoNumeraz.equalsIgnoreCase("MANUALE")) {
Date dataDoc = entity.getDataDoc();

2
ems-core/src/main/java/it/integry/ems_model/base/EntityBase.java
View File

@@ -1927,7 +1927,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
}
@JsonIgnore
private String getWhereCondOldPk() throws IllegalAccessException, IOException, FieldMissingException {
public String getWhereCondOldPk() throws IllegalAccessException, IOException, FieldMissingException {
Field[] fields = this.getClass().getDeclaredFields();
List<String> where = getPkWhereCond(fields, this);
return getWhereCondOldPk(where);

9
ems-core/src/main/java/it/integry/ems_model/entity/DtbDoct.java
View File

@@ -1674,13 +1674,13 @@ public class DtbDoct extends DtbBaseDocT implements EquatableEntityInterface<Dtb
JrlSchmacDoc jrlSchmacDoc = new JrlSchmacDoc();
jrlSchmacDoc.deleteAllEntities(connection, this);
String sql = "UPDATE mtb_invent SET cod_anag = null, cod_dtip = null, data_doc = null, ser_doc = null, num_doc = null, flag_stato = 1 ";
sql = UtilityDB.addwhereCond(sql, this.getPkWhereCond(), false);
sql = UtilityDB.addwhereCond(sql, this.getWhereCondOldPk(), false);
connection.createStatement().executeUpdate(sql);
/*for (MtbColt mtbColt : getMtbColt()) {
mtbColt.manageWithParentConnection(connection, mtbColt.getOperation(), dataCompleting, entityHolder);
} */
sql = "UPDATE mtb_colt SET cod_anag = null, cod_dtip = null, data_doc = null, ser_doc = null, num_doc = null ";
sql = UtilityDB.addwhereCond(sql, this.getPkWhereCond(), false);
sql = UtilityDB.addwhereCond(sql, this.getWhereCondOldPk(), false);
connection.createStatement().executeUpdate(sql);
if ("S".equals(getGeneraMovCont())) {
if (getWhereCond() == null) {
@@ -1746,7 +1746,10 @@ public class DtbDoct extends DtbBaseDocT implements EquatableEntityInterface<Dtb
else if (oldPk.containsKey("serDoc"))
serDocOld = (String) oldPk.get("serDoc");
else if (oldPk.containsKey("numDoc"))
numDocOld = (Integer) oldPk.get("numDoc");
if ( oldPk.get("numDoc") instanceof String ) {
numDocOld = Integer.valueOf((String) oldPk.get("numDoc"));
} else
numDocOld = (Integer) oldPk.get("numDoc");
}
if ("DIRETTA".equals(tipoEmissione)) {
// HashMap<String, Object> datiDoc = new HashMap<>();

8
ems-core/src/main/java/it/integry/ems_model/entity/WdtbDoct.java
View File

@@ -641,13 +641,12 @@ public class WdtbDoct extends DtbBaseDocT {
@Override
public String getFlagPrzScontati() {
return "N";
return flagPrzScontati;
}
@Override
public WdtbDoct setFlagPrzScontati(String flagPrzScontati) {
/*In documenti web è sempre N*/
this.setFlagPrzScontati("N");
this.flagPrzScontati = flagPrzScontati;
return this;
}
@@ -957,7 +956,6 @@ public class WdtbDoct extends DtbBaseDocT {
@Override
public DtbDocOrdT setExplodeKit(String explodeKit) {
/*In ordini e documenti web i kit non vengono esplosi*/
this.setExplodeKit("N");
return this;
}
@@ -968,8 +966,6 @@ public class WdtbDoct extends DtbBaseDocT {
@Override
public DtbDocOrdT setFlagPrzIva(String flagPrzIva) {
/*In ordini e documenti web i kit non vengono esplosi*/
this.setFlagPrzIva("N");
return this;
}

1
ems-core/src/main/java/it/integry/ems_model/entity/WdtbOrdt.java
View File

@@ -826,7 +826,6 @@ public class WdtbOrdt extends DtbDocOrdT {
@Override
public DtbDocOrdT setExplodeKit(String explodeKit) {
/*In ordini e documenti web i kit non vengono esplosi*/
this.setExplodeKit("N");
return this;
}

19
ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java
View File

@@ -5,6 +5,7 @@ import it.integry.ems.javabeans.RequestDataDTO;
import it.integry.ems.menu.dto.StbMenuDTO;
import it.integry.ems.rules.businessLogic.enums.TipoEmissione;
import it.integry.ems.rules.completing.ConfigActivityRules;
import it.integry.ems.rules.completing.DocumentRules;
import it.integry.ems.service.EntityProcessor;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityEntity;
@@ -80,7 +81,13 @@ public class DocumentiDirettiService {
if (oldPk.containsKey("codDtip")) codDtip = (String) oldPk.get("codDtip");
if (oldPk.containsKey("dataDoc")) dataDoc = UtilityString.parseDate((String) oldPk.get("dataDoc"));
if (oldPk.containsKey("serDoc")) serDoc = (String) oldPk.get("serDoc");
if (oldPk.containsKey("numDoc")) numDoc = (Integer) oldPk.get("numDoc");
if (oldPk.containsKey("numDoc")) {
Object field = oldPk.get("numDoc");
if (field instanceof String)
numDoc = Integer.valueOf((String) field);
else
numDoc = (Integer) field;
}
}
String idAttivita = null;
@@ -161,8 +168,6 @@ public class DocumentiDirettiService {
String serDocPed = null;
if (dtbDoctPedOld != null){
dataDocPed = dtbDoctPedOld.getDataDoc();
numDocPed = dtbDoctPedOld.getNumDoc();
oldPkDoc = new HashMap<>();
oldPkDoc.put("codDtip", dtbDoctPedOld.getCodDtip());
oldPkDoc.put("codAnag", dtbDoctPedOld.getCodAnag());
@@ -177,10 +182,10 @@ public class DocumentiDirettiService {
if (item.getKey())
codDtipPed = dtbDoct.getCodDtip();
if (dtbDoctPedOld !=null && codDtipPed.equalsIgnoreCase(dtbDoctPedOld.getCodDtip()))
serDocPed = dtbDoctPedOld.getSerDoc();
else
serDocPed = null;
if (dtbDoctPedOld !=null && !codDtipPed.equalsIgnoreCase(dtbDoctPedOld.getCodDtip())) {
serDocPed = DocumentRules.getSerDoc(multiDBTransactionManager.getPrimaryConnection(), codDtipPed, dtbDoct.getCodMdep(), dataDocPed);
numDocPed = 0;
}
DtbDoct dtbDoctPed =
new DtbDoct()