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

Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-02-27 14:04:35 +01:00
parent 7d2266f87b 6791104d1e
commit aad4b9f7cf
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomer.java
View File

@@ -68,7 +68,8 @@ public enum IntegryCustomer {
IntegryCustomerDB.Gramm_PrimeOlive,
IntegryCustomerDB.Gramm_ProveStage),
Idrotecnica(IntegryCustomerDB.Idrotecnica_Idrotecnica),
Igood(IntegryCustomerDB.Igood_Igood,
Igood(IntegryCustomerDB.Igood_Aida,
IntegryCustomerDB.Igood_Igood,
IntegryCustomerDB.Igood_ShopService),
Ime(IntegryCustomerDB.Ime_ImeTe),
Integry(IntegryCustomerDB.Integry_Studioml),

1
ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomerDB.java
View File

@@ -91,6 +91,7 @@ public enum IntegryCustomerDB {
Idrotecnica_Idrotecnica("idrotecnica"),
Igood_Aida("aida"),
Igood_Igood("igood"),
Igood_ShopService("shop_service"),

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

@@ -1240,12 +1240,13 @@ public class CommonRules extends QueryRules {
}
public static int retrieveNextProgressivoUl(Connection conn, String gestione, LocalDate dataOrd, int numOrd) throws SQLException {
public static int retrieveNextProgressivoUl(Connection conn, String gestione, LocalDate dataOrd, int numOrd, int segno) throws SQLException {
String sql = Query.format("SELECT ISNULL(MAX(progressivo_ul), 0) AS progressivo_ul" +
" FROM " + MtbColt.ENTITY +
" WHERE data_ord = {} AND " +
" num_ord = {} AND " +
" gestione = {}", dataOrd, numOrd, gestione);
" gestione = {} AND "+
" segno = {}", dataOrd, numOrd, gestione, segno);
int maxProgressivoUl = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
return maxProgressivoUl + 1;

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

@@ -395,7 +395,7 @@ when
eval(postRulesEnabled)
$mtbColt: MtbColt(operation != OperationType.DELETE && progressivoUl == null && gestione != null && dataOrd != null && numOrd != null)
then
int progressivoToSave = CommonRules.retrieveNextProgressivoUl(conn, $mtbColt.getGestione(), $mtbColt.getDataOrd(), $mtbColt.getNumOrd());
int progressivoToSave = CommonRules.retrieveNextProgressivoUl(conn, $mtbColt.getGestione(), $mtbColt.getDataOrd(), $mtbColt.getNumOrd(), $mtbColt.getSegno());
modify($mtbColt){
setProgressivoUl(progressivoToSave);