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

Rimosso auto completamento del codice commessa sui colli quando non è un A+ o L+

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-12-04 12:54:18 +01:00
parent 6cc7e4ac3a
commit 9fc2db9a8a
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ems-core/src/main/java/it/integry/ems/rules/completing/PackagesRules.java
View File

@@ -3,6 +3,7 @@ package it.integry.ems.rules.completing;
import com.annimon.stream.Stream;
import it.integry.common.var.CommonConstants;
import it.integry.ems.rules.completing.dto.DatiPartitaMagDTO;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.entity.MtbColr;
import it.integry.ems_model.entity.MtbCols;
@@ -14,9 +15,6 @@ import it.integry.ems_model.utility.*;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.CallableStatement;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.SQLException;
import java.sql.Types;
import java.time.LocalDate;
@@ -236,19 +234,18 @@ public class PackagesRules extends QueryRules {
return flagInsPartitaMag;
}
public static String completeCodJcom(Connection conn, MtbColr entity) throws SQLException {
public static String completeCodJcom(Connection conn, MtbColr mtbColr) throws SQLException {
String sql =
"SELECT cod_jcom " +
" FROM dtb_ordr " +
" WHERE gestione = " + UtilityDB.valueToString(entity.getGestione()) + " AND " +
"data_ord = " + UtilityDB.valueDateToString(entity.getDataOrd(), CommonConstants.DATE_FORMAT_YMD) + " AND " +
"num_ord = " + UtilityDB.valueToString(entity.getNumOrd()) + " AND " +
"riga_ord = " + UtilityDB.valueToString(entity.getRigaOrd());
" WHERE gestione = " + UtilityDB.valueToString(mtbColr.getGestione()) + " AND " +
"data_ord = " + UtilityDB.valueDateToString(mtbColr.getDataOrd(), CommonConstants.DATE_FORMAT_YMD) + " AND " +
"num_ord = " + UtilityDB.valueToString(mtbColr.getNumOrd()) + " AND " +
"riga_ord = " + UtilityDB.valueToString(mtbColr.getRigaOrd());
String codJcom = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
return codJcom;
}
public static BigDecimal completeNumCnf(Connection connection, MtbColr mtbColr) throws Exception {

12
ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java
View File

@@ -157,6 +157,9 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
@EntityChild
MtbColrInfoProd mtbColrInfoProd;
@ImportFromParent
private Integer segno;
@ImportFromParent
private String insPartitaMag;
@@ -578,6 +581,15 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
return this;
}
public Integer getSegno() {
return segno;
}
public MtbColr setSegno(Integer segno) {
this.segno = segno;
return this;
}
public boolean hasDocument() {
MtbColt parent = (MtbColt) getParent();
return !(UtilityString.isNullOrEmpty(parent.getCodDtip()) && UtilityString.isNullOrEmpty(parent.getSerDoc()) && parent.getNumDoc() == null && parent.getDataDoc() == null);

2
ems-core/src/main/resources/rules/logistic.drl
View File

@@ -325,7 +325,7 @@ rule "completeCodJcomColli"
no-loop
when
eval(completeRulesEnabled)
$entity: MtbColr(codJcom == null && gestione != null && dataOrd != null && numOrd != null && rigaOrd != null)
$entity: MtbColr(codJcom == null && (gestione.equalsIgnoreCase("A") || gestione.equalsIgnoreCase("L")) && segno == 1 && dataOrd != null && numOrd != null && rigaOrd != null)
then
String codJcom = PackagesRules.completeCodJcom(conn, $entity);
modify ( $entity ) { setCodJcom(codJcom) }