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

varios version despues Campaña

This commit is contained in:
Sergio De la torre 2023-05-02 16:17:49 +02:00
parent e000ca66bc
commit 078713348e
12 changed files with 3059 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
.idea/workspace.xml
View File

@ -83,10 +83,20 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs varios">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4979">
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/beta/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/beta/release/output-metadata.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packingHolland/fragment/PackingHollandFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packingHolland/fragment/PackingHollandFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -126,8 +136,8 @@
<option name="RECENT_TEMPLATES">
<list>
<option value="navigationResourceFile" />
<option value="resourceFile" />
<option value="layoutResourceFile" />
<option value="resourceFile" />
<option value="Class" />
<option value="Kotlin Class" />
</list>
@ -239,11 +249,12 @@
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
&quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
&quot;ScreenRecorder.SavePath&quot;: &quot;C:\\Users\\sergiodt\\device-2023-03-17-114045.mp4&quot;,
&quot;android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED&quot;: &quot;RecyclerView&quot;,
&quot;cidr.known.project.marker&quot;: &quot;true&quot;,
&quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/java/es/verdnatura/presentation/view/feature&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable&quot;,
&quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
&quot;project.structure.proportion&quot;: &quot;0.17&quot;,
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
@ -252,7 +263,7 @@
},
&quot;keyToStringList&quot;: {
&quot;ExportApk.BuildVariants&quot;: [
&quot;generalRelease&quot;
&quot;betaRelease&quot;
]
}
}</component>
@ -263,8 +274,8 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\java\es\verdnatura\presentation\view\feature" />
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\java\es\verdnatura\presentation\view\feature" />
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\layout" />
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable-v24" />
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\raw" />
@ -398,41 +409,6 @@
<option name="presentableId" value="Default" />
<updated>1618825571576</updated>
</task>
<task id="LOCAL-00078" summary="Version 9.1Beta-CMR quitado, rgb quitado">
<created>1663850881923</created>
<option name="number" value="00078" />
<option name="presentableId" value="LOCAL-00078" />
<option name="project" value="LOCAL" />
<updated>1663850881923</updated>
</task>
<task id="LOCAL-00079" summary="Version 9.1Beta-Compilada versión y formateado Ajustes">
<created>1663930085261</created>
<option name="number" value="00079" />
<option name="presentableId" value="LOCAL-00079" />
<option name="project" value="LOCAL" />
<updated>1663930085262</updated>
</task>
<task id="LOCAL-00080" summary="Version 9.1Beta-Quantity_y_originalQuantity_view_to_Integer.toString">
<created>1663943604196</created>
<option name="number" value="00080" />
<option name="presentableId" value="LOCAL-00080" />
<option name="project" value="LOCAL" />
<updated>1663943604196</updated>
</task>
<task id="LOCAL-00081" summary="Version 9.2Beta-Controlador sin animacion y vuelve al sitio">
<created>1664276655283</created>
<option name="number" value="00081" />
<option name="presentableId" value="LOCAL-00081" />
<option name="project" value="LOCAL" />
<updated>1664276655284</updated>
</task>
<task id="LOCAL-00082" summary="Version 9 Arreglado vuelta atrás controlador">
<created>1664430359823</created>
<option name="number" value="00082" />
<option name="presentableId" value="LOCAL-00082" />
<option name="project" value="LOCAL" />
<updated>1664430359824</updated>
</task>
<task id="LOCAL-00083" summary="Version 9.2.1 Refactor Inicio">
<created>1664790614473</created>
<option name="number" value="00083" />
@ -741,7 +717,42 @@
<option name="project" value="LOCAL" />
<updated>1681967763127</updated>
</task>
<option name="localTasksCounter" value="127" />
<task id="LOCAL-00127" summary="refs Precontrol activado">
<created>1681970676491</created>
<option name="number" value="00127" />
<option name="presentableId" value="LOCAL-00127" />
<option name="project" value="LOCAL" />
<updated>1681970676491</updated>
</task>
<task id="LOCAL-00128" summary="refs #5004">
<created>1682053807286</created>
<option name="number" value="00128" />
<option name="presentableId" value="LOCAL-00128" />
<option name="project" value="LOCAL" />
<updated>1682053807287</updated>
</task>
<task id="LOCAL-00129" summary="version 23.14.1">
<created>1682056950573</created>
<option name="number" value="00129" />
<option name="presentableId" value="LOCAL-00129" />
<option name="project" value="LOCAL" />
<updated>1682056950573</updated>
</task>
<task id="LOCAL-00130" summary="refs #5004">
<created>1682575636304</created>
<option name="number" value="00130" />
<option name="presentableId" value="LOCAL-00130" />
<option name="project" value="LOCAL" />
<updated>1682575636304</updated>
</task>
<task id="LOCAL-00131" summary="refs #4979">
<created>1682575765188</created>
<option name="number" value="00131" />
<option name="presentableId" value="LOCAL-00131" />
<option name="project" value="LOCAL" />
<updated>1682575765188</updated>
</task>
<option name="localTasksCounter" value="132" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@ -842,10 +853,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas con clase" />
<MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas a SilexCallback (AjustesFragment)" />
<MESSAGE value="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador." />
<MESSAGE value="Version 23.2 Cambiado collection_assign a String." />
<MESSAGE value="Version 23.2-Fallo item_card" />
<MESSAGE value="Version 23.2 Modificado orden ubicador y revisión anterior falta activar icono" />
<MESSAGE value="Version 23.2 Modificado actualizar pantalla al transferir en Ubicador. Subida version" />
@ -867,7 +874,11 @@
<MESSAGE value="refs #4765 Refactor" />
<MESSAGE value="refs #4830" />
<MESSAGE value="refs varios" />
<option name="LAST_COMMIT_MESSAGE" value="refs varios" />
<MESSAGE value="refs Precontrol activado" />
<MESSAGE value="version 23.14.1" />
<MESSAGE value="refs #5004" />
<MESSAGE value="refs #4979" />
<option name="LAST_COMMIT_MESSAGE" value="refs #4979" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -877,6 +888,16 @@
<line>313</line>
<option name="timeStamp" value="5" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt</url>
<line>353</line>
<option name="timeStamp" value="8" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt</url>
<line>125</line>
<option name="timeStamp" value="17" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<pin-to-top-manager>

4
app/beta/release/output-metadata.json
View File

@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 174,
"versionName": "23.10.2Beta",
"versionCode": 180,
"versionName": "23.14Beta",
"outputFile": "app-beta-release.apk"
}
],

4
app/build.gradle
View File

@ -13,8 +13,8 @@ android {
applicationId "es.verdnatura"
minSdkVersion 24 //21
targetSdkVersion 33
versionCode 178
versionName = "23.14.1"
versionCode 180
versionName = "23.14Beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

1
app/src/main/AndroidManifest.xml
View File

@ -8,6 +8,7 @@
<uses-permission android:name="android.permission.PREVENT_POWER_KEY" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.LAUNCH_APPS" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<!--
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"
tools:ignore="ProtectedPermissions" />

2
app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
View File

@ -551,7 +551,7 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
}
else -> {
""
prefs.getString(name, "").toString()
}
}

2940
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -24,8 +24,10 @@ import es.verdnatura.presentation.view.feature.articulo.fragment.ItemProposalFra
import es.verdnatura.presentation.view.feature.buffer.fragment.BufferFragment
import es.verdnatura.presentation.view.feature.buffer.fragment.BufferLoadFragment
import es.verdnatura.presentation.view.feature.buscaritem.fragment.BuscarItemFragment
import es.verdnatura.presentation.view.feature.category.ChangeCategoryFragment
import es.verdnatura.presentation.view.feature.claim.fragment.ClaimFragment
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragment
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPicker
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPreChecker
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionShowTicketFragment
import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorFragment
@ -40,11 +42,13 @@ import es.verdnatura.presentation.view.feature.historicoshelving.fragment.itemSh
import es.verdnatura.presentation.view.feature.historicoshelvinglog.fragment.shelvingLogFragment
import es.verdnatura.presentation.view.feature.historicovehiculo.fragment.HistoricoVehiculoFragment
import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryFragment
import es.verdnatura.presentation.view.feature.login.fragment.LoginViewModel
import es.verdnatura.presentation.view.feature.main.model.ItemMenuVO
import es.verdnatura.presentation.view.feature.packaging.fragment.ObservFragment
import es.verdnatura.presentation.view.feature.packaging.fragment.PackagingCountFragment
import es.verdnatura.presentation.view.feature.packaging.fragment.PackagingSummaryFragment
import es.verdnatura.presentation.view.feature.packaging.fragment.SupplierFragment
import es.verdnatura.presentation.view.feature.packingHolland.fragment.PackingHollandFragment
import es.verdnatura.presentation.view.feature.paletizador.fragment.*
import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckVO
import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletVO
@ -70,6 +74,7 @@ import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import org.koin.androidx.viewmodel.ext.android.viewModel
class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickListener,
@ -82,6 +87,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
var fm = supportFragmentManager
var mperror: MediaPlayer? = null
var mpok: MediaPlayer? = null
var miTime: Long = System.currentTimeMillis() / 1000 / 60 / 60
private var comeFromDelivery: Boolean? = null
override fun getLayoutId(): Int = R.layout.activity_main
override fun init() {
@ -90,7 +96,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
mpok = MediaPlayer.create((this), R.raw.ok)
customDialog = CustomDialogMainActivity(this)
setFragments()
setBottomMenuFragment()
}
@ -590,6 +595,13 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
addFragmentOnTop(UbicadorFragment.newInstance(entryPoint, true))
}
getString(R.string.titlePackingHolland) -> {
addFragmentOnTop(PackingHollandFragment.newInstance(item.title))
}
getString(R.string.titleChangeCategory) -> {
addFragmentOnTop(ChangeCategoryFragment.newInstance(item.title))
}
getString(R.string.titleDelivery) -> {
addFragmentOnTop(
PasilleroFragment.newInstance(
@ -735,9 +747,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
addFragmentOnTop(CollectionShowTicketFragment.newInstance(collection, type))
}
//Tarea 4711
"PRECHECKER"->{
"PRECHECKER" -> {
addFragmentOnTop(CollectionFragmentPreChecker.newInstance(collection, type))
}
"PREPARED" -> {
addFragmentOnTop(CollectionFragmentPicker.newInstance(collection, type))
}
else -> {
addFragmentOnTop(CollectionFragment.newInstance(collection, type))
@ -811,13 +826,13 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
if (!isError) {
if (isPlayed == true) (mpok?.start())
if (isToasted!!) message.toast(this, Toast.LENGTH_SHORT)
if (isToasted!!) message.toast(this, Toast.LENGTH_LONG)
} else {
if (isPlayed == true) (mperror?.start())
if (isToasted == true) {
message.toast(this, Toast.LENGTH_SHORT)
message.toast(this, Toast.LENGTH_LONG)
} else {
customDialog.setTitle(titleWithError).setDescription(message)
.setOkButton(getString(R.string.accept)) {

4
app/src/main/java/es/verdnatura/presentation/view/feature/packingHolland/fragment/PackingHollandFragment.kt
View File

@ -45,7 +45,7 @@ class PackingHollandFragment(var entrypoint: String) :
binding.scanInput.setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
if (!binding.scanInput.text.isNullOrEmpty()) {
binding.splashProgress.visibility = VISIBLE
try {
binding.scanInput.setText(
@ -56,7 +56,7 @@ class PackingHollandFragment(var entrypoint: String) :
).toString()
)
shelvingScaned = binding.scanInput.text.toString().toInt()
showQuantityPacking()
} catch (ex: Exception) {
ex.message!!.toast(requireActivity())
}

1
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt
View File

@ -4,6 +4,7 @@ import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO
class ItemExpeditionTruckVO(
var truckFk: Int,
//@SerializedName(value = "ETD", alternate = ["ETD", "eta"])
var ETD: String = "",
var Destino: String = "",
var description: String = "",

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

@ -3,7 +3,11 @@ package es.verdnatura.presentation.view.feature.pasillero.fragment
import android.content.Context
import android.graphics.Color
import android.os.Bundle
import android.util.Log.d
import android.view.LayoutInflater
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R
@ -30,6 +34,7 @@ class PasilleroFragment(
if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context
}
override fun getLayoutId(): Int = R.layout.fragment_pasillero
override fun init() {

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

@ -123,7 +123,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
/* _pasillerositem.add(
PasillerosItemVO(
1,
R.drawable.ic_dashboard_black_24dp,
R.drawable.ic_packaging,
contextApp.getString(R.string.titlePackingHolland),
R.string.titlePackingHolland,
contextApp.getString(
@ -145,6 +145,20 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
//Tarea 4979
/* _pasillerositem.add(
PasillerosItemVO(
1,
R.drawable.ic_category,
contextApp.getString(R.string.categoryChange),
R.string.titleChangeCategory,
contextApp.getString(
R.string.titleChangeCategory
)
)
)*/
_pasillerositem.add(
PasillerosItemVO(
1,

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

@ -5,6 +5,7 @@ import android.graphics.drawable.Drawable
import android.media.MediaPlayer
import android.os.Build
import android.os.Bundle
import android.util.Log.d
import android.view.KeyEvent
import android.view.View
import android.view.View.GONE
@ -601,6 +602,8 @@ class EndSacadorFragment(
// Log.d("VERDNATURA::","sales comercial"+s.salesPersonFk)
//sergio: para que no de error si no hay carros. Ya está asignado a 0 el pickingorder si no hay item en el carro
if (!s.carros.isNullOrEmpty()) {
s.carros = s.carros.sortedWith(compareBy{it.pickingOrder}).sortedWith(
compareByDescending{it.priority})
s.pickingOrder = s.carros.get(0).pickingOrder
}
}