Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish v1.41.11(459)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2024-12-05 17:25:47 +01:00
commit 777d6a3c5b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 458 def appVersionCode = 459
def appVersionName = '1.41.10' def appVersionName = '1.41.11'
signingConfigs { signingConfigs {
release { release {

2
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java
View File

@ -68,7 +68,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
" dtb_ord_steps.hr_num as hr, " + " dtb_ord_steps.hr_num as hr, " +
" mtb_colr.riga_ord, " + " mtb_colr.riga_ord, " +
" CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / " + " CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / " +
" SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " + " SUM(CASE WHEN dtb_ord_steps.hr_num > 0 then dtb_ord_steps.hr_num else 1 end) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
" 0)) as percentage_hr " + " 0)) as percentage_hr " +
" FROM mtb_colr " + " FROM mtb_colr " +
" INNER JOIN mtb_colt ON mtb_colr.num_collo = mtb_colt.num_collo " + " INNER JOIN mtb_colt ON mtb_colr.num_collo = mtb_colt.num_collo " +

2
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
View File

@ -942,7 +942,7 @@ public class SpedizioneViewModel {
if (availableBatchLots.stream().anyMatch(x -> x.getDataScad() == null)) { if (availableBatchLots.stream().anyMatch(x -> x.getDataScad() == null)) {
tmp.addAll(availableBatchLots.stream() tmp.addAll(availableBatchLots.stream()
.filter(x -> x.getDataScad() == null) .filter(x -> x.getDataScad() == null)
.sorted(Comparator.comparing(MtbPartitaMag::getPartitaMag)) .sorted(Comparator.comparing(x -> UtilityString.isNull(x.getPartitaMag(), "")))
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }