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

[ROSSOGARGANO - MES]
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source 
- aggiunto criterio di calcolo progressivo pedane in base alla linea
This commit is contained in:
Valerio Castellana
2025-07-03 13:13:17 +02:00
parent ef9bbe6198
commit cbfa2482da
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ems-core/src/main/java/it/integry/ems/rules/completing/CommonRules.java
View File

@@ -1264,7 +1264,12 @@ public class CommonRules extends QueryRules {
return maxProgressivoUl + 1;
}
public static int retrieveNextProgressivoUlRG(Connection conn, String gestione, LocalDate dataOrd, int numOrd, int segno) throws SQLException {
public static int retrieveNextProgressivoUlRG(Connection conn, String gestione, LocalDate dataOrd, int numOrd, int segno, String codJfas) throws Exception {
boolean isScadenzaMultipla = setupGest.getSetupDetBoolean(conn, "MES", "SETUP", "CONTROLLO_SCADENZA_MULTIPLA", codJfas);
if (!isScadenzaMultipla) {
return retrieveNextProgressivoUl(conn, gestione, dataOrd, numOrd, segno);
}
String sql = Query.format(
"WITH partite AS (SELECT dot.cod_prod AS cod_mart, mpm.partita_mag_prod, dot.cod_jfas\n" +
" FROM dtb_ordt dot\n" +
@@ -1331,12 +1336,12 @@ public class CommonRules extends QueryRules {
public static boolean getChkCompatibilitaCarat(Connection connection, String codMart, String carat) throws SQLException {
String sql =
Query.format("SELECT chk_compatibilita\n" +
"FROM mtb_aart\n" +
" INNER JOIN mtb_tipi_carat ON mtb_aart.cod_mtip = mtb_tipi_carat.cod_mtip AND\n" +
" mtb_aart.cod_mstp = mtb_tipi_carat.cod_mstp\n" +
"WHERE mtb_aart.cod_mart = %s\n" +
" AND mtb_tipi_carat.carat = %s\n" ,
codMart, carat);
"FROM mtb_aart\n" +
" INNER JOIN mtb_tipi_carat ON mtb_aart.cod_mtip = mtb_tipi_carat.cod_mtip AND\n" +
" mtb_aart.cod_mstp = mtb_tipi_carat.cod_mstp\n" +
"WHERE mtb_aart.cod_mart = %s\n" +
" AND mtb_tipi_carat.carat = %s\n",
codMart, carat);
Boolean chkCompatibilita = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
if (chkCompatibilita == null) chkCompatibilita = false;

4
ems-core/src/main/java/it/integry/ems_model/service/SetupGest.java
View File

@@ -405,4 +405,8 @@ public class SetupGest {
public boolean getSetupDetBoolean(String gestName, String section, String keySection, String colRif) throws Exception {
return "S".equalsIgnoreCase(getSetupDet(gestName, section, keySection, colRif));
}
public boolean getSetupDetBoolean(Connection conn, String gestName, String section, String keySection, String colRif) throws Exception {
return "S".equalsIgnoreCase(getSetupDet(conn, gestName, section, keySection, colRif));
}
}

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

@@ -28,7 +28,7 @@ when
eval(postRulesEnabled && customer == IntegryCustomer.RossoGargano)
$mtbColt: MtbColt(operation != OperationType.DELETE && progressivoUl == null && gestione != null && gestione == 'L' && dataOrd != null && numOrd != null)
then
int progressivoToSave = CommonRules.retrieveNextProgressivoUlRG(conn, $mtbColt.getGestione(), $mtbColt.getDataOrd(), $mtbColt.getNumOrd(), $mtbColt.getSegno());
int progressivoToSave = CommonRules.retrieveNextProgressivoUlRG(conn, $mtbColt.getGestione(), $mtbColt.getDataOrd(), $mtbColt.getNumOrd(), $mtbColt.getSegno(), $mtbColt.getCodJfas());
modify($mtbColt){
setProgressivoUl(progressivoToSave);

1
ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
View File

@@ -1093,6 +1093,7 @@ public class MesProductionServiceV2 {
.setCodAnag(ordineLav.getCodAnag())
.setPosizione(dto.getCodJfas())
.setBarcodeUl(dto.getBarcodeUl())
.setCodTcol(ordineLav.getCodTcolUl())
.setOrders(Collections.singletonList(new CreateUDCRequestOrderDTO()
.setGestione(dto.getGestione())
.setNumOrd(dto.getNumOrd())