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

version 23.10.1 Modificar controlador orden

This commit is contained in:
Sergio De la torre 2023-03-28 16:08:45 +02:00
parent 2cfc560649
commit 2efa03454b
3 changed files with 83 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
.idea/workspace.xml
View File

@ -83,18 +83,10 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4731 print">
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packingHolland/fragment/PackingHollandFragment.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packingHolland/fragment/PackingHollandViewModel.kt" afterDir="false" />
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="version 23.10.1 Modificar controlador orden">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/di/viewModelModule.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.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/InitPreSacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -105,7 +97,7 @@
<component name="CodeInsightWorkspaceSettings">
<option name="optimizeImportsOnTheFly" value="true" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_2_API_24.avd]" />
<component name="ExportToHTMLSettings">
<option name="OPEN_IN_BROWSER" value="true" />
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@ -259,7 +251,7 @@
},
&quot;keyToStringList&quot;: {
&quot;ExportApk.BuildVariants&quot;: [
&quot;betaRelease&quot;
&quot;generalRelease&quot;
]
}
}</component>
@ -405,20 +397,6 @@
<option name="presentableId" value="Default" />
<updated>1618825571576</updated>
</task>
<task id="LOCAL-00073" summary="Version 9Beta-Borrados comentarios">
<created>1663050116723</created>
<option name="number" value="00073" />
<option name="presentableId" value="LOCAL-00073" />
<option name="project" value="LOCAL" />
<updated>1663050116723</updated>
</task>
<task id="LOCAL-00074" summary="Version 9.1Beta- Rgb,trasaccion marcar lineas, new collection,shelvingLog, y ajustes">
<created>1663770280710</created>
<option name="number" value="00074" />
<option name="presentableId" value="LOCAL-00074" />
<option name="project" value="LOCAL" />
<updated>1663770280712</updated>
</task>
<task id="LOCAL-00075" summary="Version 9.1Beta- Rgb,trasaccion marcar lineas, new collection,shelvingLog, y ajustes">
<created>1663770314650</created>
<option name="number" value="00075" />
@ -748,7 +726,21 @@
<option name="project" value="LOCAL" />
<updated>1679917077712</updated>
</task>
<option name="localTasksCounter" value="122" />
<task id="LOCAL-00122" summary="refs #4940 packingHolland">
<created>1679984799909</created>
<option name="number" value="00122" />
<option name="presentableId" value="LOCAL-00122" />
<option name="project" value="LOCAL" />
<updated>1679984799909</updated>
</task>
<task id="LOCAL-00123" summary="version 23.10 General">
<created>1679984837368</created>
<option name="number" value="00123" />
<option name="presentableId" value="LOCAL-00123" />
<option name="project" value="LOCAL" />
<updated>1679984837368</updated>
</task>
<option name="localTasksCounter" value="124" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@ -849,9 +841,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="Version 9.6Beta Añadido a BaseFragment(context). Quitado código repetido de las llamadas" />
<MESSAGE value="Version 9.6Beta Borrado referencias a api Nodejs y código relacionado" />
<MESSAGE value="Version 9.6Beta Cambiadas llamadas y campos( collectionFk). Borrado Presacador" />
<MESSAGE value="Version 9.6Beta en test" />
<MESSAGE value="Version 9.6Beta en test : ubicador, quality, posicion, buscar item, reclamaciones..." />
<MESSAGE value="Version 9.6Beta en test: paletizadores" />
@ -874,7 +863,10 @@
<MESSAGE value="refs #4923 previas" />
<MESSAGE value="EntrySalix" />
<MESSAGE value="refs #4731 print" />
<option name="LAST_COMMIT_MESSAGE" value="refs #4731 print" />
<MESSAGE value="refs #4940 packingHolland" />
<MESSAGE value="version 23.10 General" />
<MESSAGE value="version 23.10.1 Modificar controlador orden" />
<option name="LAST_COMMIT_MESSAGE" value="version 23.10.1 Modificar controlador orden" />
</component>
<component name="XDebuggerManager">
<pin-to-top-manager>

5
app/build.gradle
View File

@ -13,8 +13,9 @@ android {
applicationId "es.verdnatura"
minSdkVersion 24 //21
targetSdkVersion 33
versionCode 174
versionName = "23.10"
versionCode 175
versionName = "23.10.1"
//versionName = "23.10" versionCode 174
//versionName = "23.10.2Beta" versionCode 174
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

94
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
View File

@ -131,10 +131,10 @@ class CollectionFragment(
if (type.equals(CONTROLADOR)) {
//sergio: comprueba si viene de la pantalla de controlador
//Tarea #4280
viewModel.ticket_isOutClosureZone(
collection.collectionFk
viewModel.ticket_isOutClosureZone(
collection.collectionFk
)
)
workerFkFromTicket = collection.tickets.get(0).sales.get(0).workerFk
}
@ -268,7 +268,7 @@ class CollectionFragment(
}
private fun markPrevia(saleGroupScanned: String):Boolean {
private fun markPrevia(saleGroupScanned: String): Boolean {
for (indice in sales.indices) {
if (!sales[indice].saleGroupFk.isNullOrEmpty() && sales[indice].saleGroupFk == saleGroupScanned) {
@ -380,20 +380,20 @@ class CollectionFragment(
if (itemScanIsQr(binding.scanInput.text.toString())) {
var myQr = itemScanned(JSONObject(binding.scanInput.text.toString()))
var myQr = itemScanned(JSONObject(binding.scanInput.text.toString()))
when (myQr.table) {
"saleGroup" -> {
if (type == CONTROLADOR) {
markPrevia(myQr.id.toString())
} else {
binding.scanInput.setText(myQr.id.toString())
findSale(binding.scanInput.text.toString())
}
when (myQr.table) {
"saleGroup" -> {
if (type == CONTROLADOR) {
markPrevia(myQr.id.toString())
} else {
binding.scanInput.setText(myQr.id.toString())
findSale(binding.scanInput.text.toString())
}
"buy" -> binding.scanInput.setText(myQr.more)
}
"buy" -> binding.scanInput.setText(myQr.more)
}
} else {
findSale(binding.scanInput.text.toString())
@ -1203,7 +1203,7 @@ class CollectionFragment(
)
}
}
},type = type
}, type = type
)
@ -1270,7 +1270,7 @@ class CollectionFragment(
goBack2 = false
if (type == SACADOR) {
isOk=markPrevia(txtscan)
isOk = markPrevia(txtscan)
for (saleVO in sales) {
if (isOk) break
@ -1398,10 +1398,10 @@ class CollectionFragment(
if (type.equals(CONTROLADOR)) {
//Tarea #4280 cambiar a ticket_isOutClosureZone
viewModel.ticket_isOutClosureZone(
txtscan.toInt()
viewModel.ticket_isOutClosureZone(
txtscan.toInt()
)
)
}
}
@ -1547,15 +1547,34 @@ class CollectionFragment(
//tarea #4628, se asigna storedBackPosition
storedBackPosition = position
if (type == SACADOR || (type == CONTROLADOR && (getData(SECTORDESCRIP).uppercase() == getString(
R.string.sectorALGEMESI
) || getData(SECTORDESCRIP).uppercase() == getString(
if (type == SACADOR || getData(SECTORDESCRIP).uppercase() == getString(
R.string.sectorALGEMESINEW
)))
)
) {
var myPosition = position
if (type == CONTROLADOR && getData(SECTORDESCRIP).uppercase() == getString(
R.string.sectorALGEMESI
)
) {
if (position > 0) {
var totalPrevias = 0
for (s in myGroupList) {
if (s.isParent) {
totalPrevias += s.sonSales.size
myPosition = position - totalPrevias + 1
}
}
} else {
myPosition = position
}
}
if (binding.fragmentSacadorCollections != null) {
binding.fragmentSacadorCollections.addViewObserver {
lm!!.scrollToPositionWithOffset(position, 0)
lm!!.scrollToPositionWithOffset(myPosition, 0)
}
}
@ -1918,18 +1937,18 @@ class CollectionFragment(
}
private fun setStoredPosition(isFromBack: Boolean) {
/* if (type == SACADOR) {
/* if (type == SACADOR) {
for (indice in myGroupList.indices) {
if (myGroupList[indice].isPrepared == "0") {
storedPosition = if (indice != 0) {
indice - 1
} else {
indice
}
break
}
}*/
for (indice in myGroupList.indices) {
if (myGroupList[indice].isPrepared == "0") {
storedPosition = if (indice != 0) {
indice - 1
} else {
indice
}
break
}
}*/
setListPosition(storedPosition, isFromBack)
}
@ -2843,7 +2862,8 @@ class CollectionFragment(
mySale.totalSales = value.size //total líneas
mySale.isParent = true
value as MutableList<SaleVO>
mySale.sonSales = value.sortedWith(compareBy { it.picked }) as MutableList<SaleVO>
mySale.sonSales =
value.sortedWith(compareBy { it.picked }) as MutableList<SaleVO>
mySale.line1 = "Previa :${mySale.saleGroupFk}"
mySale.line2 = "Líneas: ${value.size}"