verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

version 25.12

This commit is contained in:
Sergio De la torre 2025-03-24 16:30:26 +01:00
parent b26cf1b76f
commit 091b597f34
4 changed files with 53 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/build.gradle.kts
View File

@ -16,8 +16,8 @@ android {
applicationId = "es.verdnatura" applicationId = "es.verdnatura"
minSdk = 26 minSdk = 26
targetSdk = 33 // se deja con target si no Play Protect la bloquea targetSdk = 33 // se deja con target si no Play Protect la bloquea
versionCode = 397 //JAF 393 en informatica versionCode = 405
versionName = "25.6" versionName = "25.12" // REvisor para reservas
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
@ -149,36 +149,30 @@ android {
//implementation(libs.koin.androidx.compose) //implementation(libs.koin.androidx.compose)
// Compose // Compose
dependencies {
val composeBom = platform("androidx.compose:compose-bom:2024.10.01") val composeBom = platform("androidx.compose:compose-bom:2024.10.01")
implementation(composeBom) implementation(composeBom)
androidTestImplementation(composeBom) androidTestImplementation(composeBom)
// Choose one of the following:
// Choose one of the following: // Material Design 3
// Material Design 3 implementation(libs.androidx.material3)
implementation(libs.androidx.material3) implementation(libs.androidx.ui)
implementation(libs.androidx.ui) // Android Studio Preview support
// Android Studio Preview support implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.ui.tooling.preview) debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.tooling) // UI Tests
// UI Tests androidTestImplementation(libs.androidx.ui.test.junit4)
androidTestImplementation(libs.androidx.ui.test.junit4) debugImplementation(libs.androidx.ui.test.manifest)
debugImplementation(libs.androidx.ui.test.manifest) // custom design system based on Foundation)
// custom design system based on Foundation) //implementation(libs.androidx.material.icons.core)
//implementation(libs.androidx.material.icons.core) // Optional - Add full set of material icons
// Optional - Add full set of material icons implementation(libs.androidx.material.icons.extended)
implementation(libs.androidx.material.icons.extended) // Optional - Add window size utils
// Optional - Add window size utils implementation(libs.androidx.adaptive)
implementation(libs.androidx.adaptive) implementation(libs.androidx.activity.compose)
implementation(libs.androidx.activity.compose) implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.androidx.lifecycle.viewmodel.compose) implementation(libs.lottie.compose)
implementation(libs.lottie.compose) testImplementation(libs.junit)
}
} }
} }
dependencies {
testImplementation(libs.junit)
}

39
app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
View File

@ -56,7 +56,7 @@ import es.verdnatura.presentation.view.feature.articulo.fragment.ItemProposalFra
import es.verdnatura.presentation.view.feature.boxPicking.BoxPickingFragment import es.verdnatura.presentation.view.feature.boxPicking.BoxPickingFragment
import es.verdnatura.presentation.view.feature.buffer.fragment.BufferFragment import es.verdnatura.presentation.view.feature.buffer.fragment.BufferFragment
import es.verdnatura.presentation.view.feature.buffer.fragment.BufferLoadFragment import es.verdnatura.presentation.view.feature.buffer.fragment.BufferLoadFragment
import es.verdnatura.presentation.view.feature.buscaritem.fragment.BuscarItemFragment import es.verdnatura.presentation.view.feature.buscaritem.fragment.BuscarItemFragmentCompose
import es.verdnatura.presentation.view.feature.category.ChangeCategoryFragment import es.verdnatura.presentation.view.feature.category.ChangeCategoryFragment
import es.verdnatura.presentation.view.feature.claim.fragment.reubication.fragment.ReubicationCollectionFragment import es.verdnatura.presentation.view.feature.claim.fragment.reubication.fragment.ReubicationCollectionFragment
import es.verdnatura.presentation.view.feature.claim.fragment.reubication.fragment.ReubicationFragment import es.verdnatura.presentation.view.feature.claim.fragment.reubication.fragment.ReubicationFragment
@ -79,7 +79,7 @@ import es.verdnatura.presentation.view.feature.delivery.fragments.SalaryCompleme
import es.verdnatura.presentation.view.feature.delivery.fragments.SummaryFragment import es.verdnatura.presentation.view.feature.delivery.fragments.SummaryFragment
import es.verdnatura.presentation.view.feature.delivery.fragments.TicketsFragment import es.verdnatura.presentation.view.feature.delivery.fragments.TicketsFragment
import es.verdnatura.presentation.view.feature.delivery.model.ClientTicketSalix import es.verdnatura.presentation.view.feature.delivery.model.ClientTicketSalix
import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleFragment import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleFragmentCompose
import es.verdnatura.presentation.view.feature.historicoarticulo.fragment.HistoricoArticuloFragment import es.verdnatura.presentation.view.feature.historicoarticulo.fragment.HistoricoArticuloFragment
import es.verdnatura.presentation.view.feature.historicoshelvinglog.fragment.ShelvingLogFragment import es.verdnatura.presentation.view.feature.historicoshelvinglog.fragment.ShelvingLogFragment
import es.verdnatura.presentation.view.feature.historicoshelvinglog.model.LogType import es.verdnatura.presentation.view.feature.historicoshelvinglog.model.LogType
@ -99,7 +99,7 @@ import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPa
import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletFragment
import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPreparedStateFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPreparedStateFragment
import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanFragment
import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanSorterFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanSorterFragmentCompose
import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionStateFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionStateFragment
import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionTruckListFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionTruckListFragment
import es.verdnatura.presentation.view.feature.paletizador.fragment.PalletScanFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.PalletScanFragment
@ -133,7 +133,7 @@ import es.verdnatura.presentation.view.feature.ticket.fragment.TicketAdvanceFrag
import es.verdnatura.presentation.view.feature.ubicador.fragment.AutomaticAddItemFragment import es.verdnatura.presentation.view.feature.ubicador.fragment.AutomaticAddItemFragment
import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorFragment import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorFragment
import es.verdnatura.presentation.view.feature.workermistake.fragment.PackingMistakeFragment import es.verdnatura.presentation.view.feature.workermistake.fragment.PackingMistakeFragment
import es.verdnatura.presentation.view.feature.workermistake.fragment.WorkermistakeFragment import es.verdnatura.presentation.view.feature.workermistake.fragment.WorkermistakeFragmentCompose
import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
@ -575,7 +575,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
getString(R.string.titleScanExpedition) -> { getString(R.string.titleScanExpedition) -> {
addFragmentOnTop(ExpeditionScanSorterFragment.newInstance(itemTitle)) //addFragmentOnTop(ExpeditionScanSorterFragment.newInstance(itemTitle))
addFragmentOnTop(ExpeditionScanSorterFragmentCompose.newInstance(itemTitle))
} }
getString(R.string.titleBufferManegement) -> { getString(R.string.titleBufferManegement) -> {
@ -605,7 +606,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
getString(R.string.titleDayOfSale) -> { getString(R.string.titleDayOfSale) -> {
addFragmentOnTop(DayOfSaleFragment(itemTitle)) //addFragmentOnTop(DayOfSaleFragment(itemTitle))
addFragmentOnTop(DayOfSaleFragmentCompose(itemTitle))
} }
getString(R.string.titleShowTicket) -> { getString(R.string.titleShowTicket) -> {
@ -627,18 +629,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.titleItemSearch) -> { getString(R.string.titleItemSearch) -> {
//JETPACKCOMPOSE //JETPACKCOMPOSE
/* addFragmentOnTop(
BuscarItemFragmentCompose.newInstance(
if (entryPoint == "") {
null
} else {
entryPoint.toInt()
}
)
)*/
addFragmentOnTop( addFragmentOnTop(
BuscarItemFragment.newInstance( BuscarItemFragmentCompose.newInstance(
if (entryPoint == "") { if (entryPoint == "") {
null null
} else { } else {
@ -646,6 +638,16 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
) )
) )
/* addFragmentOnTop(
BuscarItemFragment.newInstance(
if (entryPoint == "") {
null
} else {
entryPoint.toInt()
}
)
)*/
} }
getString(R.string.titleHistorical) -> { getString(R.string.titleHistorical) -> {
@ -757,7 +759,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
getString(R.string.titleWorkerMistake) -> { getString(R.string.titleWorkerMistake) -> {
addFragmentOnTop(WorkermistakeFragment.newInstance(itemTitle)) //addFragmentOnTop(WorkermistakeFragment.newInstance(itemTitle))
addFragmentOnTop(WorkermistakeFragmentCompose.newInstance(itemTitle))
} }
getString(R.string.deleteExpedition) -> { getString(R.string.deleteExpedition) -> {

12
app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
View File

@ -289,13 +289,13 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
) )
) )
//a quitar //solo para hacer pruebas en los dos sistemas
_pasillerositem.add( /* _pasillerositem.add(
PasillerosItemVO( PasillerosItemVO(
R.drawable.ic_picker_ui, R.string.titlePickers, R.string.titlePickersDescrip R.drawable.ic_picker_ui, R.string.titlePickers, R.string.titlePickersDescrip
) )
) )*/
} else { } else {
_pasillerositem.add( _pasillerositem.add(

3
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt
View File

@ -161,15 +161,14 @@ class AutomaticAddItemFragment(
customDialogList.setDescription( customDialogList.setDescription(
getString(R.string.scanShelvingsLocate) getString(R.string.scanShelvingsLocate)
).setOkButton(getString(R.string.locate)) { ).setOkButton(getString(R.string.locate)) {
listItems.clear()
listShelvings.forEach { listShelvings.forEach {
viewModel.itemShelvingMakeMulti( viewModel.itemShelvingMakeMulti(
it.code!!, it.code!!,
ArrayList(listItems), ArrayList(listItems),
mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK) mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK)
) )
} }
listItems.clear()
customDialogList.dismiss() customDialogList.dismiss()
}.setKoButton(getString(R.string.cancel)) { }.setKoButton(getString(R.string.cancel)) {