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

Finish Hotfix-56

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-04-03 10:51:37 +02:00
parent 761f0e6a46 44989dea5a
commit 09e77e0eff
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/runConfigurations/Tomcat.xml generated
View File

@@ -1,7 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
<option name="COMMON_VM_ARGUMENTS" value="-Xms512m -Xmx2048m" />
<option name="UPDATING_POLICY" value="restart-server" />
<deployment>
<artifact name="ems-engine:war exploded">
<settings>

2
ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdUntMisRules.java
View File

@@ -182,7 +182,7 @@ public class DocOrdUntMisRules extends QueryRules {
qtaCnf = qta.divide(numCnf, EmsRestConstants.cifreDecMax, RoundingMode.HALF_UP);
}
if (UtilityBigDecimal.isNullOrZero(qtaCnf) && gestione.equalsIgnoreCase("A") && !UtilityString.isNullOrEmpty(listino)) {
if (UtilityBigDecimal.isNullOrZero(qtaCnf) && UtilityString.equalsIgnoreCase(gestione, "A") && !UtilityString.isNullOrEmpty(listino)) {
sql =
Query.format("SELECT qta_cnf FROM mtb_lisa WHERE cod_alis = %s AND cod_mart = %s AND ( %s is null OR cod_art_for = %s) ORDER BY flag_attivo",
listino, codMart, codArtFor, codArtFor);

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

@@ -721,7 +721,7 @@ public class MesProductionServiceV2 {
pairList.add(new PairsDTO("num_collo", mtbColtToPrint.getNumCollo()));
pairList.add(new PairsDTO("ser_collo", mtbColtToPrint.getSerCollo()));
pairList.add(new PairsDTO("data_collo", new SimpleDateFormat(CommonConstants.DATE_FORMAT_YMD).format(mtbColtToPrint.getDataCollo())));
pairList.add(new PairsDTO("data_collo", CommonConstants.DATE_YMD_DASHED_FORMATTER.format(mtbColtToPrint.getDataCollo())));
pairList.add(new PairsDTO("gestione", mtbColtToPrint.getGestione()));
pairList.add(new PairsDTO("num_prog_collo", numProgCollo));