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

Version 9.6Beta. TEST5: imprimir ok, ubicador ok, no se cierra app sacador

This commit is contained in:
Sergio De la torre 2022-12-02 10:56:49 +01:00
parent 8ae723ea62
commit 70ba354321
38 changed files with 462 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
.idea/workspace.xml
View File

@ -44,9 +44,8 @@
</shared> </shared>
</component> </component>
<component name="AndroidLogFilters"> <component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="error" /> <option name="TOOL_WINDOW_LOG_LEVEL" value="error" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="verdnatura" /> <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
<option name="TOOL_WINDOW_REGEXP_FILTER" value="false" /> <option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
</component> </component>
<component name="AutoImportSettings"> <component name="AutoImportSettings">
@ -83,9 +82,46 @@
</select> </select>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.6Beta en test: paletizadores"> <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.6Beta. TEST5: imprimir ok, ubicador ok, no se cierra app sacador">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/release/vn-picking.apk" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/app/release/vn-picking.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.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/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/common/ResponseItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemCardVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemCardVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt" 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" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.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/precontrol/PreControladorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.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" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/mapper/SaleMapper.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/mapper/SaleMapper.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/model/PreSacadorItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/model/PreSacadorItemVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/adapter/ReposicionAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/adapter/ReposicionAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_fragment.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_presacador.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_presacador.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_escaner_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_escaner_row.xml" 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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -182,7 +218,7 @@
</option> </option>
<option name="RECENT_BRANCH_BY_REPOSITORY"> <option name="RECENT_BRANCH_BY_REPOSITORY">
<map> <map>
<entry key="$PROJECT_DIR$" value="Tarea3420-quantity_y_originalQuantity" /> <entry key="$PROJECT_DIR$" value="test" />
</map> </map>
</option> </option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@ -404,13 +440,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1618825571576</updated> <updated>1618825571576</updated>
</task> </task>
<task id="LOCAL-00052" summary="Version 8.2 Subida de ficheros que no estaban versionados">
<created>1651647188750</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1651647188751</updated>
</task>
<task id="LOCAL-00053" summary="Version 8.2 Subida de ficheros que no estaban versionados"> <task id="LOCAL-00053" summary="Version 8.2 Subida de ficheros que no estaban versionados">
<created>1651647225421</created> <created>1651647225421</created>
<option name="number" value="00053" /> <option name="number" value="00053" />
@ -747,7 +776,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1669715487612</updated> <updated>1669715487612</updated>
</task> </task>
<option name="localTasksCounter" value="101" /> <task id="LOCAL-00101" summary="Version 9.6Beta en test: paletizadores">
<created>1669720979790</created>
<option name="number" value="00101" />
<option name="presentableId" value="LOCAL-00101" />
<option name="project" value="LOCAL" />
<updated>1669720979790</updated>
</task>
<option name="localTasksCounter" value="102" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.History.Properties"> <component name="Vcs.Log.History.Properties">
@ -849,7 +885,6 @@
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="Version 9.1Beta- Modificar original y originalQuantity" />
<MESSAGE value="Version 9.1Beta-CMR quitado, rgb quitado" /> <MESSAGE value="Version 9.1Beta-CMR quitado, rgb quitado" />
<MESSAGE value="Version 9.1Beta-Compilada versión y formateado Ajustes" /> <MESSAGE value="Version 9.1Beta-Compilada versión y formateado Ajustes" />
<MESSAGE value="Version 9.1Beta-Quantity_y_originalQuantity_view_to_Integer.toString" /> <MESSAGE value="Version 9.1Beta-Quantity_y_originalQuantity_view_to_Integer.toString" />
@ -874,19 +909,20 @@
<MESSAGE value="Version 9.6Beta en test" /> <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 : ubicador, quality, posicion, buscar item, reclamaciones..." />
<MESSAGE value="Version 9.6Beta en test: paletizadores" /> <MESSAGE value="Version 9.6Beta en test: paletizadores" />
<option name="LAST_COMMIT_MESSAGE" value="Version 9.6Beta en test: paletizadores" /> <MESSAGE value="Version 9.6Beta. TEST5: imprimir ok, ubicador ok, no se cierra app sacador" />
<option name="LAST_COMMIT_MESSAGE" value="Version 9.6Beta. TEST5: imprimir ok, ubicador ok, no se cierra app sacador" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
<breakpoints> <breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line"> <line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt</url> <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt</url>
<line>63</line> <line>62</line>
<option name="timeStamp" value="3" /> <option name="timeStamp" value="3" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line"> <line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt</url> <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt</url>
<line>399</line> <line>347</line>
<option name="timeStamp" value="10" /> <option name="timeStamp" value="10" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>

13
app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
View File

@ -198,26 +198,19 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
params.add(itemFk) params.add(itemFk)
params.add(delete) params.add(delete)
return restClient!!.barcodes_edit( return restClient!!.barcodes_edit(
"json", params
"1",
usuario,
password,
"application/json",
params = params
) )
} }
fun barcodes_editSalix( fun barcodes_editSalix(
token: String, itemFk: Int,
itemFk: String,
value: String, value: String,
): Call<Any> { ): Call<Any> {
return salixClient!!.barcodes_edit( return salixClient!!.barcodes_edit(
content_type = "application/json",
authorization = token,
itemBarCodeSalix(itemFk, value) itemBarCodeSalix(itemFk, value)
) )
} }

22
app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt
View File

@ -118,8 +118,6 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
} }
fun saleTrackingReplace( fun saleTrackingReplace(
usuario: String,
password: String,
saleFk: String, saleFk: String,
vOriginalQuantity: String, vOriginalQuantity: String,
vStateFk: String, vStateFk: String,
@ -133,11 +131,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
params.add(vIsChecked) params.add(vIsChecked)
params.add(vBuyFk) params.add(vBuyFk)
return restClient!!.saleTrackingReplace( return restClient!!.saleTrackingReplace(
"json",
"1",
usuario,
password,
"application/json",
params params
) )
} }
@ -145,7 +139,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
fun saleTracking_mark( fun saleTracking_mark(
usuario: String, usuario: String,
password: String, password: String,
saleFk: String, saleFk: Int,
vOriginalQuantity: String, vOriginalQuantity: String,
vStateFk: String, vStateFk: String,
vIsChecked: String, vIsChecked: String,
@ -154,7 +148,6 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
vQuantity: String vQuantity: String
): Call<Any> { ): Call<Any> {
val params: ArrayList<String> = ArrayList() val params: ArrayList<String> = ArrayList()
params.add(saleFk)
params.add(vOriginalQuantity) params.add(vOriginalQuantity)
params.add(vStateFk) params.add(vStateFk)
params.add(vIsChecked) params.add(vIsChecked)
@ -356,14 +349,14 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
quantity: String, quantity: String,
type: String, type: String,
warehouseFk: String, warehouseFk: String,
originalQuantity: String originalQuantity: Int
): Call<Any> { ): Call<Any> {
val params: ArrayList<String> = ArrayList() val params: ArrayList<String> = ArrayList()
params.add(saleFk) params.add(saleFk)
params.add(quantity) params.add(quantity)
params.add(type) params.add(type)
params.add(warehouseFk) params.add(warehouseFk)
params.add(originalQuantity) params.add(originalQuantity.toString())
return restClient!!.collectionMissingTrash( return restClient!!.collectionMissingTrash(
"json", "json",
"1", "1",
@ -493,18 +486,13 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
fun collectionIncreaseQuantitySalix( fun collectionIncreaseQuantitySalix(
token: String,
saleFk: String, saleFk: String,
quantity: String quantity: String
): Call<Any> { ): Call<Any> {
return salixClient!!.collectionIncreaseQuantitySalix( return salixClient!!.collectionIncreaseQuantitySalix(
"json",
"1",
token,
"application/json",
SalixSaleQuantity(saleId = saleFk.toInt(), quantity = quantity.toInt()) SalixSaleQuantity(saleId = saleFk.toInt(), quantity = quantity.toInt())
) )

6
app/src/main/java/es/verdnatura/domain/SalixService.kt
View File

@ -66,10 +66,6 @@ interface SalixService {
@POST("collections/setSaleQuantity") @POST("collections/setSaleQuantity")
fun collectionIncreaseQuantitySalix( fun collectionIncreaseQuantitySalix(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("Authorization") authorization: String,
@Header("Content-Type") content_type: String,
@Body params: SalixSaleQuantity @Body params: SalixSaleQuantity
): ):
Call<Any> Call<Any>
@ -122,8 +118,6 @@ interface SalixService {
@PUT("ItemBarCodes")//REVISADA @PUT("ItemBarCodes")//REVISADA
fun barcodes_edit( fun barcodes_edit(
@Header("Content-Type") content_type: String,
@Header("Authorization") authorization: String,
@Body params: itemBarCodeSalix @Body params: itemBarCodeSalix
): ):
Call<Any> Call<Any>

65
app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
View File

@ -280,12 +280,7 @@ interface VerdnaturaService {
@POST("almacennew/collection_getUncheckedTicket")//NO SALIX @POST("almacennew/collection_getUncheckedTicket")//NO SALIX
fun collection_getUncheckedTicket( fun collection_getUncheckedTicket(
@Header("aplicacion") aplicacion: String, @Body vararg params: Any
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
): ):
Call<String> Call<String>
@ -326,24 +321,14 @@ interface VerdnaturaService {
@POST("almacennew/saleTrackingReplace")//REVISADA @POST("almacennew/saleTrackingReplace")//REVISADA
fun saleTrackingReplace( fun saleTrackingReplace(
@Header("aplicacion") aplicacion: String, @Body vararg params: Any
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
): ):
Call<Any> Call<Any>
@POST("almacennew/itemPlacementSupplyAiming")//REVISADA @POST("almacennew/itemPlacementSupplyAiming")//REVISADA
fun itemPlacementSupplyAiming( fun itemPlacementSupplyAiming(
@Header("aplicacion") aplicacion: String, @Body vararg params: Any
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
): ):
Call<List<PlacementSupplyVO>> Call<List<PlacementSupplyVO>>
@ -355,12 +340,7 @@ interface VerdnaturaService {
@POST("almacennew/saleTracking_mark")//REVISADA @POST("almacennew/saleTracking_mark")//REVISADA
fun saleTracking_mark( fun saleTracking_mark(
@Header("aplicacion") aplicacion: String, @Body vararg params: Any
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
): ):
Call<Any> Call<Any>
@ -377,7 +357,7 @@ interface VerdnaturaService {
@POST("almacennew/collectionStickerPrint")//REVISADA @POST("almacennew/collectionStickerPrint")//REVISADA
fun collectionStickerPrint( fun collectionStickerPrint(
@Body vararg params: Any @Body vararg params: Any?
): ):
Call<Any> Call<Any>
@ -402,12 +382,7 @@ interface VerdnaturaService {
@POST("almacennew/collectionAddItem")//REVISADA @POST("almacennew/collectionAddItem")//REVISADA
fun collectionAddItem( fun collectionAddItem(
@Header("aplicacion") aplicacion: String, @Body vararg params: Any
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
): ):
Call<Any> Call<Any>
@ -424,12 +399,7 @@ interface VerdnaturaService {
@POST("almacennew/collectionMissingTrash")//REVISADA @POST("almacennew/collectionMissingTrash")//REVISADA
fun collectionMissingTrash( fun collectionMissingTrash(
@Header("aplicacion") aplicacion: String, @Body vararg params: Any
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
): ):
Call<Any> Call<Any>
@ -497,12 +467,7 @@ interface VerdnaturaService {
@POST("almacennew/saleMistakeAdd")//REVISADA @POST("almacennew/saleMistakeAdd")//REVISADA
fun saleMistakeAdd( fun saleMistakeAdd(
@Header("aplicacion") aplicacion: String, @Body vararg params: Any
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
): ):
Call<Any> Call<Any>
@ -637,12 +602,7 @@ interface VerdnaturaService {
@POST("almacennew/barcodes_edit")//REVISADA @POST("almacennew/barcodes_edit")//REVISADA
fun barcodes_edit( fun barcodes_edit(
@Header("aplicacion") aplicacion: String, @Body vararg params: Any
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
): ):
Call<Any> Call<Any>
@ -754,12 +714,7 @@ interface VerdnaturaService {
@POST("almacennew/itemShelvingMake")//REVISADA @POST("almacennew/itemShelvingMake")//REVISADA
fun itemShelvingMake( fun itemShelvingMake(
@Header("aplicacion") aplicacion: String, @Body vararg params: Any
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
): ):
Call<Any> Call<Any>

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

@ -493,6 +493,17 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
return preferences.getString(key, null) return preferences.getString(key, null)
} }
fun getDataInt(name: String): Int {
val prefs: SharedPreferences = requireActivity().getSharedPreferences(PREFS_USER, 0)
return when (name) {
SECTORFK -> prefs.getInt(name, SECTORFKDEFAULT)
WAREHOUSEFK -> prefs.getInt(name, WAREHOUSEFKDEFAULT)
else -> {
0
}
}
}
fun getData(name: String): String { fun getData(name: String): String {
val prefs: SharedPreferences = requireActivity().getSharedPreferences(PREFS_USER, 0) val prefs: SharedPreferences = requireActivity().getSharedPreferences(PREFS_USER, 0)
return when (name) { return when (name) {
@ -507,6 +518,7 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
WAGON -> prefs.getInt(name, 2).toString() WAGON -> prefs.getInt(name, 2).toString()
TAGSTYPE -> prefs.getString(name, getString(R.string.stickers)).toString() TAGSTYPE -> prefs.getString(name, getString(R.string.stickers)).toString()
SECTORDESCRIP -> prefs.getString(name, getString(R.string.Sinsector)).toString() SECTORDESCRIP -> prefs.getString(name, getString(R.string.Sinsector)).toString()
SECTORFK -> prefs.getInt(name, SECTORFKDEFAULT).toString()
BUYER -> prefs.getString(name, "").toString() BUYER -> prefs.getString(name, "").toString()
BUYERID -> prefs.getString(name, "").toString() BUYERID -> prefs.getString(name, "").toString()
DATENOVEHICLE -> prefs.getString(name, "0").toString() DATENOVEHICLE -> prefs.getString(name, "0").toString()
@ -535,6 +547,7 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
val preferences = PreferenceManager.getDefaultSharedPreferences(context) val preferences = PreferenceManager.getDefaultSharedPreferences(context)
preferences.getString(getString(R.string.base_urlSalix), "").toString() preferences.getString(getString(R.string.base_urlSalix), "").toString()
} }
else -> { else -> {
"" ""
} }
@ -649,6 +662,13 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
urlSalix = "https://test-salix.verdnatura.es/api/" urlSalix = "https://test-salix.verdnatura.es/api/"
) )
) )
saveWorkForm(
WorkForms(
"TestLOCAL",
"http://192.168.1.132:9000",
urlSalix = "http://localhost:3000/api/"
)
)
saveWorkForm( saveWorkForm(
WorkForms( WorkForms(

2
app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt
View File

@ -23,7 +23,7 @@ class ResponseItemMachineControl(
) )
class DataMessageSalix( class DataMessageSalix(
var ticket: String = "", var ticket: Int,
var item: String = "", var item: String = "",
var quantity: String = "", var quantity: String = "",
var personSale: String = "" var personSale: String = ""

4
app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt
View File

@ -5,6 +5,6 @@ class itemPackingTypeSalix(
) )
class itemBarCodeSalix( class itemBarCodeSalix(
var itemFk: String = "", var itemFk: Int ,
var code:String="" var code:String
) )

21
app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
View File

@ -120,7 +120,7 @@ class ItemCardFragment(
} else { } else {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleHistorical)), PasillerosItemVO(title = getString(R.string.titleHistorical)),
itemInfoG!!.id itemInfoG!!.id.toString()
) )
} }
@ -213,7 +213,7 @@ class ItemCardFragment(
ma.messageWithSound(it.errorMessage, true, false) ma.messageWithSound(it.errorMessage, true, false)
} else { } else {
if (!it.id.isNullOrEmpty()) { if (it.id!=0) {
binding.itemcardLayout.visibility = View.VISIBLE binding.itemcardLayout.visibility = View.VISIBLE
setItemCard(it) setItemCard(it)
binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
@ -267,8 +267,8 @@ class ItemCardFragment(
private fun setItemCard(itemInfo: ItemCardVO) { private fun setItemCard(itemInfo: ItemCardVO) {
itemInfoG = itemInfo itemInfoG = itemInfo
binding.mainToolbar.toolbarTitle.text = itemInfo.id + "-" + itemInfo.longName binding.mainToolbar.toolbarTitle.text = itemInfo.id.toString() + "-" + itemInfo.longName
titleImage = itemInfo.id + "-" + itemInfo.longName titleImage = itemInfo.id.toString() + "-" + itemInfo.longName
binding.itemcardImage.loadUrl(itemInfo.urlImage200) binding.itemcardImage.loadUrl(itemInfo.urlImage200)
urlLarge = itemInfo.urlImage urlLarge = itemInfo.urlImage
binding.itemcardTag1.text = itemInfo.size binding.itemcardTag1.text = itemInfo.size
@ -666,7 +666,7 @@ class ItemCardFragment(
customDialogList.setTitle(getString(R.string.barcodes)).setOkButton(getString(R.string.save)) { customDialogList.setTitle(getString(R.string.barcodes)).setOkButton(getString(R.string.save)) {
ma.hideKeyboard(customDialogList.getEditText()) ma.hideKeyboard(customDialogList.getEditText())
if (!customDialogList.getValue().isEmpty()) if (!customDialogList.getValue().isEmpty())
updateBarcode(customDialogList.getValue(), "0", itemB) updateBarcode(customDialogList.getValue(), false)
customDialogList.dismiss() customDialogList.dismiss()
}.setKoButton(getString(R.string.close)) { }.setKoButton(getString(R.string.close)) {
@ -679,7 +679,7 @@ class ItemCardFragment(
customDialogList.getEditText().setOnEditorActionListener { _, actionId, _ -> customDialogList.getEditText().setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
if (!customDialogList.getValue().isNullOrEmpty()) if (!customDialogList.getValue().isNullOrEmpty())
updateBarcode(customDialogList.getValue(), "0", itemB) updateBarcode(customDialogList.getValue(), false)
customDialogList.setValue("") customDialogList.setValue("")
customDialogList.dismiss() customDialogList.dismiss()
ma.hideKeyboard(customDialogList.getEditText()) ma.hideKeyboard(customDialogList.getEditText())
@ -690,7 +690,7 @@ class ItemCardFragment(
barcodeAdapter = BarcodeAdapter(listBarcodes, object : OnBarcodeRowClickListener { barcodeAdapter = BarcodeAdapter(listBarcodes, object : OnBarcodeRowClickListener {
override fun onBarcodeRowClickListener(item: BarcodeVO) { override fun onBarcodeRowClickListener(item: BarcodeVO) {
updateBarcode(item.code!!, "1", itemB) updateBarcode(item.code!!, true)
customDialogList.setValue("") customDialogList.setValue("")
customDialogList.dismiss() customDialogList.dismiss()
} }
@ -701,8 +701,8 @@ class ItemCardFragment(
LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
} }
private fun updateBarcode(code: String, delete: String, item: ItemCardRowVO) { private fun updateBarcode(code: String, delete: Boolean) {
if (delete == "1") { if (delete) {
var i = 0 var i = 0
var posDelete = 0 var posDelete = 0
listBarcodes.forEach { listBarcodes.forEach {
@ -713,15 +713,12 @@ class ItemCardFragment(
listBarcodes.removeAt(posDelete) listBarcodes.removeAt(posDelete)
viewModel.barcodesEdit( viewModel.barcodesEdit(
itemFk = itemInfoG!!.id, itemFk = itemInfoG!!.id,
user = user,
password = password,
value = code, value = code,
delete = delete, delete = delete,
) )
} else { } else {
listBarcodes.add(BarcodeVO(code)) listBarcodes.add(BarcodeVO(code))
viewModel.barcodesEditSalix( viewModel.barcodesEditSalix(
token = getData(TOKEN),
itemFk = itemInfoG!!.id, itemFk = itemInfoG!!.id,
barCodeValue = code) barCodeValue = code)

30
app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt
View File

@ -9,13 +9,12 @@ import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.getMessageFromAllResponse
import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.base.nameofFunction
import es.verdnatura.presentation.common.ResponseItemVO import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.common.itemBarCodeSalix
import es.verdnatura.presentation.common.itemPackingTypeSalix import es.verdnatura.presentation.common.itemPackingTypeSalix
import es.verdnatura.presentation.view.feature.articulo.model.* import es.verdnatura.presentation.view.feature.articulo.model.*
import retrofit2.Call import retrofit2.Call
import retrofit2.Callback import retrofit2.Callback
import retrofit2.Response import retrofit2.Response
import java.util.*
import kotlin.collections.ArrayList
class ItemCardViewModel(context: Context) : BaseViewModel(context) { class ItemCardViewModel(context: Context) : BaseViewModel(context) {
private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context) private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context)
@ -48,22 +47,22 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
getItemCardUserCase.getItemCard(user, password, itemFk, warehouseFk) getItemCardUserCase.getItemCard(user, password, itemFk, warehouseFk)
.enqueue(object : Callback<ItemCardVO> { .enqueue(object : Callback<ItemCardVO> {
override fun onFailure(call: Call<ItemCardVO>, t: Throwable) { override fun onFailure(call: Call<ItemCardVO>, t: Throwable) {
_itemcard.value = ItemCardVO( _itemcard.value = ItemCardVO(0,
isError = true, isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!), errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!),
stems = "" stems = "", itemCost = ""
, itemCost = "") )
} }
override fun onResponse(call: Call<ItemCardVO>, response: Response<ItemCardVO>) { override fun onResponse(call: Call<ItemCardVO>, response: Response<ItemCardVO>) {
if (response.body() != null ) { if (response.body() != null) {
_itemcard.value = response.body()!! _itemcard.value = response.body()!!
} else { } else {
_itemcard.value = ItemCardVO( _itemcard.value = ItemCardVO(0,
isError = true, isError = true,
errorMessage = getMessageFromAllResponse( errorMessage = getMessageFromAllResponse(
nameofFunction(this), nameofFunction(this),
@ -216,7 +215,7 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
newValue: Int, newValue: Int,
isTrash: Boolean isTrash: Boolean
) { ) {
silex.itemTrash( itemFk, warehouseFk, newValue, isTrash) silex.itemTrash(itemFk, warehouseFk, newValue, isTrash)
.enqueue(object : Callback<Any> { .enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) { override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO( _response.value = ResponseItemVO(
@ -318,7 +317,7 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
} }
fun updatePackingTypeSalix(itemFk: String, itemPackingType: itemPackingTypeSalix) { fun updatePackingTypeSalix(itemFk: String, itemPackingType: itemPackingTypeSalix) {
salix.update_ItemPackingType( itemFk,itemPackingType ) salix.update_ItemPackingType(itemFk, itemPackingType)
.enqueue(object : Callback<Any> { .enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) { override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO( _response.value = ResponseItemVO(
@ -417,13 +416,11 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
} }
fun barcodesEdit( fun barcodesEdit(
itemFk: String, itemFk: Int,
user: String,
password: String,
value: String, value: String,
delete: String delete: Boolean
) { ) {
getItemCardUserCase.barcodes_edit(user, password, itemFk, value, delete) silex.barcodes_edit( value,itemFk, delete)
.enqueue(object : Callback<Any> { .enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) { override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO( _response.value = ResponseItemVO(
@ -452,8 +449,9 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
} }
fun barcodesEditSalix(token: String, itemFk: String, barCodeValue: String) { fun barcodesEditSalix(itemFk: Int, barCodeValue: String) {
getItemCardUserCase.barcodes_editSalix(token, itemFk, barCodeValue) salix.barcodes_edit(
itemBarCodeSalix(itemFk, barCodeValue))
.enqueue(object : Callback<Any> { .enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) { override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO( _response.value = ResponseItemVO(

4
app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemCardVO.kt
View File

@ -1,7 +1,7 @@
package es.verdnatura.presentation.view.feature.articulo.model package es.verdnatura.presentation.view.feature.articulo.model
class ItemCardVO ( class ItemCardVO (
var id:String = "", var id:Int = 0,
var longName:String = "0", var longName:String = "0",
var value5:String = "", var value5:String = "",
var value6:String = "0", var value6:String = "0",
@ -53,7 +53,7 @@ class ItemCardRowVO (
) )
class BarcodeVO( class BarcodeVO(
var code:String? = "" var code:String?
) )

122
app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt
View File

@ -3,6 +3,7 @@ package es.verdnatura.presentation.view.feature.collection.adapter
import android.content.Context import android.content.Context
import android.graphics.Color import android.graphics.Color
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.util.Log.d
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -25,7 +26,7 @@ class SaleAdapter(
private val onMistakeClickListener: OnMistakeClickListener, private val onMistakeClickListener: OnMistakeClickListener,
private val onPackingClick: onPackingClickListener, private val onPackingClick: onPackingClickListener,
) : RecyclerView.Adapter<SaleAdapter.AjustesItemHolder>() { ) : RecyclerView.Adapter<SaleAdapter.AjustesItemHolder>() {
var context: Context? = null var context: Context? = null
var position: Int = 0 var position: Int = 0
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AjustesItemHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AjustesItemHolder {
@ -52,8 +53,8 @@ class SaleAdapter(
) : RecyclerView.ViewHolder(binding.root) { ) : RecyclerView.ViewHolder(binding.root) {
fun bind(sale: SaleVO) { fun bind(sale: SaleVO) {
binding.apply { binding.apply {
if (sale.pickedQuantity.isNullOrEmpty()) if (sale.pickedQuantity == null)
sale.pickedQuantity = "0" sale.pickedQuantity = 0
val childLayoutManager = val childLayoutManager =
LinearLayoutManager(context!!, RecyclerView.HORIZONTAL, false) LinearLayoutManager(context!!, RecyclerView.HORIZONTAL, false)
@ -113,16 +114,21 @@ class SaleAdapter(
layoutError.visibility = View.VISIBLE layoutError.visibility = View.VISIBLE
txtError.text = txtError.text =
binding.root.context.getString(R.string.originalQuantity) + sale.originalQuantity binding.root.context.getString(R.string.originalQuantity) + sale.originalQuantity
if (sale.isPrepared == "1" || sale.isControlled == "1")
sale.pickedQuantity = sale.quantity.toString()
if (sale.isPrepared == "1" || sale.isControlled == "1") {
sale.pickedQuantity = sale.quantity
}
} }
d("VERDNATURA::","La quantity de ${sale.saleFk} es ${sale.pickedQuantity} y está ${sale.isPrepared}")
if (sale.isNew) { if (sale.isNew) {
layoutError.visibility = View.VISIBLE layoutError.visibility = View.VISIBLE
txtError.text = binding.root.context.getString(R.string.newItem) txtError.text = binding.root.context.getString(R.string.newItem)
} }
//3969 Refactor collectionColors //3969 Refactor collectionColors
paintTicketcolor(sale.rgb, itemTicketColor) paintTicketcolor(sale.rgb, itemTicketColor)
//paintTicketcolorOld(sale.level, itemTicketColor) //paintTicketcolorOld(sale.level, itemTicketColor)
@ -137,7 +143,10 @@ class SaleAdapter(
//SEMAFORO //SEMAFORO
if (sale.isPreviousPrepared == "1") { if (sale.isPreviousPrepared == "1") {
DrawableCompat.setTint(backgroundDrawablePre, getColor(context!!,R.color.verdnatura_dark_sky_blue)) DrawableCompat.setTint(
backgroundDrawablePre,
getColor(context!!, R.color.verdnatura_dark_sky_blue)
)
/*itemArticleRowSemaforoPre.setBackgroundColor( /*itemArticleRowSemaforoPre.setBackgroundColor(
getColor( getColor(
context!!, context!!,
@ -145,38 +154,50 @@ class SaleAdapter(
) )
)*/ )*/
} else { } else {
DrawableCompat.setTint(backgroundDrawablePre, getColor(context!!,R.color.verdnatura_warm_grey)) DrawableCompat.setTint(
/* itemArticleRowSemaforoPre.setBackgroundColor( backgroundDrawablePre,
getColor( getColor(context!!, R.color.verdnatura_warm_grey)
context!!, )
R.color.verdnatura_warm_grey /* itemArticleRowSemaforoPre.setBackgroundColor(
) getColor(
)*/ context!!,
R.color.verdnatura_warm_grey
)
)*/
} }
if (sale.isPrepared == "1") { if (sale.isPrepared == "1") {
DrawableCompat.setTint(backgroundDrawableSac, getColor(context!!,R.color.verdnatura_pumpkin_orange)) DrawableCompat.setTint(
/* itemArticleRowSemaforoSac.setBackgroundColor( backgroundDrawableSac,
getColor( getColor(context!!, R.color.verdnatura_pumpkin_orange)
context!!, )
R.color.verdnatura_pumpkin_orange /* itemArticleRowSemaforoSac.setBackgroundColor(
) getColor(
)*/ context!!,
R.color.verdnatura_pumpkin_orange
)
)*/
} else { } else {
DrawableCompat.setTint(backgroundDrawableSac, getColor(context!!,R.color.verdnatura_warm_grey)) DrawableCompat.setTint(
/* itemArticleRowSemaforoSac.setBackgroundColor( backgroundDrawableSac,
getColor( getColor(context!!, R.color.verdnatura_warm_grey)
context!!, )
R.color.verdnatura_warm_grey /* itemArticleRowSemaforoSac.setBackgroundColor(
) getColor(
)*/ context!!,
R.color.verdnatura_warm_grey
)
)*/
} }
if (sale.isControlled == "1") { if (sale.isControlled == "1") {
DrawableCompat.setTint(backgroundDrawableCon, getColor(context!!,R.color.verdnatura_dark_mint)) DrawableCompat.setTint(
backgroundDrawableCon,
getColor(context!!, R.color.verdnatura_dark_mint)
)
/*itemArticleRowSemaforoCon.setBackgroundColor( /*itemArticleRowSemaforoCon.setBackgroundColor(
getColor( getColor(
context!!, context!!,
@ -184,7 +205,10 @@ class SaleAdapter(
) )
)*/ )*/
} else { } else {
DrawableCompat.setTint(backgroundDrawableCon, getColor(context!!,R.color.verdnatura_warm_grey)) DrawableCompat.setTint(
backgroundDrawableCon,
getColor(context!!, R.color.verdnatura_warm_grey)
)
/*itemArticleRowSemaforoCon.setBackgroundColor( /*itemArticleRowSemaforoCon.setBackgroundColor(
getColor( getColor(
context!!, context!!,
@ -223,13 +247,16 @@ class SaleAdapter(
R.color.verdnatura_dark_mint_light_precontrolled R.color.verdnatura_dark_mint_light_precontrolled
) )
) )
DrawableCompat.setTint(backgroundDrawableCon, getColor(context!!,R.color.verdnatura_dark_mint_light_precontrolled)) DrawableCompat.setTint(
/* itemArticleRowSemaforoCon.setBackgroundColor( backgroundDrawableCon,
getColor( getColor(context!!, R.color.verdnatura_dark_mint_light_precontrolled)
context!!, )
R.color.verdnatura_dark_mint_light_precontrolled /* itemArticleRowSemaforoCon.setBackgroundColor(
) getColor(
)*/ context!!,
R.color.verdnatura_dark_mint_light_precontrolled
)
)*/
} else if (sale.isPreviousPrepared == "1") { } else if (sale.isPreviousPrepared == "1") {
contentLayout.setBackgroundColor( contentLayout.setBackgroundColor(
getColor( getColor(
@ -244,13 +271,16 @@ class SaleAdapter(
//sergio: para de momento que pinten las lineas sin actualizar ni nada //sergio: para de momento que pinten las lineas sin actualizar ni nada
if (sale.isControlled == "2") { if (sale.isControlled == "2") {
DrawableCompat.setTint(backgroundDrawableCon, getColor(context!!,R.color.verdnatura_white)) DrawableCompat.setTint(
/* itemArticleRowSemaforoCon.setBackgroundColor( backgroundDrawableCon,
getColor( getColor(context!!, R.color.verdnatura_white)
context!!, )
R.color.verdnatura_white /* itemArticleRowSemaforoCon.setBackgroundColor(
) getColor(
)*/ context!!,
R.color.verdnatura_white
)
)*/
contentLayout.setBackgroundColor( contentLayout.setBackgroundColor(
getColor( getColor(
context!!, context!!,
@ -260,7 +290,6 @@ class SaleAdapter(
} }
//ASIGNAMOS VALOR A LA VSITA //ASIGNAMOS VALOR A LA VSITA
this.sale = sale this.sale = sale
@ -321,6 +350,7 @@ class SaleAdapter(
} }
} }
private fun paintTicketcolorOld(color: String, itemView: View) { private fun paintTicketcolorOld(color: String, itemView: View) {

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

@ -9,6 +9,7 @@ import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Parcelable import android.os.Parcelable
import android.text.InputType
import android.util.Log.d import android.util.Log.d
import android.view.View import android.view.View
import android.view.View.GONE import android.view.View.GONE
@ -60,7 +61,7 @@ class CollectionFragment(
private var storedShelvingPosition: Int = 0 private var storedShelvingPosition: Int = 0
private lateinit var customDialogInput: CustomDialogInput private lateinit var customDialogInput: CustomDialogInput
private lateinit var customDialogThreeButtons: CustomDialogThreeButtons private lateinit var customDialogThreeButtons: CustomDialogThreeButtons
private var ticketSelected: String = "" private var ticketSelected: Int = 0
private lateinit var customDialog: CustomDialog private lateinit var customDialog: CustomDialog
private var goBack: Boolean = false private var goBack: Boolean = false
private var goBack2: Boolean = false private var goBack2: Boolean = false
@ -111,6 +112,7 @@ class CollectionFragment(
override fun getLayoutId(): Int = R.layout.fragment_collection override fun getLayoutId(): Int = R.layout.fragment_collection
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
mperror = MediaPlayer.create((activity as MainActivity), R.raw.error) mperror = MediaPlayer.create((activity as MainActivity), R.raw.error)
mpok = MediaPlayer.create((activity as MainActivity), R.raw.ok) mpok = MediaPlayer.create((activity as MainActivity), R.raw.ok)
if (type.equals(CONTROLADOR)) { if (type.equals(CONTROLADOR)) {
@ -128,7 +130,8 @@ class CollectionFragment(
if (collection.tickets.isEmpty()) { if (collection.tickets.isEmpty()) {
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print ="0",
type type
) )
} }
@ -247,7 +250,8 @@ class CollectionFragment(
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
} }
@ -293,14 +297,16 @@ class CollectionFragment(
if (!buttonPushedGetCollection) { if (!buttonPushedGetCollection) {
viewModel.collection_get( viewModel.collection_get(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getData(SECTORFK).toInt(),
print="0",
type type
) )
buttonPushedGetCollection = true buttonPushedGetCollection = true
} else { } else {
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
lastScanned.toInt(), lastScanned,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
@ -360,7 +366,8 @@ class CollectionFragment(
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
buttonPushedGetCollection = false buttonPushedGetCollection = false
@ -486,7 +493,8 @@ class CollectionFragment(
if (!it.isError) { if (!it.isError) {
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
} }
@ -503,7 +511,8 @@ class CollectionFragment(
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
} }
@ -545,7 +554,8 @@ class CollectionFragment(
) )
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
@ -724,7 +734,8 @@ class CollectionFragment(
binding.splashProgress.visibility = View.VISIBLE binding.splashProgress.visibility = View.VISIBLE
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
it.response.toInt(), it.response.toInt(),
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
customDialog.dismiss() customDialog.dismiss()
@ -754,7 +765,8 @@ class CollectionFragment(
binding.splashProgress.visibility = View.VISIBLE binding.splashProgress.visibility = View.VISIBLE
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
it.response.toInt(), it.response.toInt(),
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
customDialog.dismiss() customDialog.dismiss()
@ -783,7 +795,8 @@ class CollectionFragment(
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
@ -827,7 +840,8 @@ class CollectionFragment(
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
} }
@ -852,7 +866,8 @@ class CollectionFragment(
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
} }
@ -867,7 +882,7 @@ class CollectionFragment(
setListPosition(storedPosition, false) setListPosition(storedPosition, false)
ReviewQuantityForRefreshingAndSorting( ReviewQuantityForRefreshingAndSorting(
sales[storedPosition].quantity!!.toInt(), sales[storedPosition].quantity!!.toInt(),
sales[storedPosition].pickedQuantity.toInt() sales[storedPosition].pickedQuantity!!.toInt()
) )
goBack = false goBack = false
} }
@ -944,7 +959,7 @@ class CollectionFragment(
} }
private fun getSalePerson(ticketFk: String): String { private fun getSalePerson(ticketFk: Int): String {
var salePerson = "" var salePerson = ""
for (it in sales) { for (it in sales) {
if (it.ticketFk.equals(ticketFk)) { if (it.ticketFk.equals(ticketFk)) {
@ -957,7 +972,7 @@ class CollectionFragment(
private fun sendSalixMessage( private fun sendSalixMessage(
item: String, item: String,
ticketFk: String, ticketFk: Int,
quantity: String, quantity: String,
salePerson: String salePerson: String
) { ) {
@ -984,6 +999,7 @@ class CollectionFragment(
tickets = ArrayList() tickets = ArrayList()
var observations = "" var observations = ""
collection.tickets.forEach { ticket -> collection.tickets.forEach { ticket ->
// if (!ticket.sales.isNullOrEmpty()){
ticket.sales.forEach { saleVO -> ticket.sales.forEach { saleVO ->
if (type == SACADOR && saleVO.quantity != 0) { if (type == SACADOR && saleVO.quantity != 0) {
salesList.add(saleVO) salesList.add(saleVO)
@ -1003,13 +1019,13 @@ class CollectionFragment(
} }
observations = observations + " " + ticket.observations observations = observations + " " + ticket.observations
} }//}
sales = salesList.sortedWith(compareBy({ it.saleOrder })) sales = salesList.sortedWith(compareBy({ it.saleOrder }))
/* for (s in sales) { /* for (s in sales) {
// d("VERDNATURA::", "El id es " + s.saleFk + " tiene saleOrder" + s.saleOrder) d("VERDNATURA::", "El id es " + s.saleFk + " tiene saleOrder" + s.saleOrder)
}*/ }*/
if (type == CONTROLADOR) { if (type == CONTROLADOR) {
sales = salesList.sortedWith(compareBy({ it.picked })) sales = salesList.sortedWith(compareBy({ it.picked }))
@ -1211,7 +1227,7 @@ class CollectionFragment(
if (saleVO.isControlled == "0") { if (saleVO.isControlled == "0") {
//1- Por itemFk //1- Por itemFk
if (txtscan.toInt() == saleVO.itemFk) { if (txtscan == saleVO.itemFk.toString()) {
if (mpok != null) mpok!!.start() if (mpok != null) mpok!!.start()
isOk = true isOk = true
markLine(index, type) markLine(index, type)
@ -1242,9 +1258,7 @@ class CollectionFragment(
ticketScanTxt = txtscan ticketScanTxt = txtscan
//#tarea4107 //#tarea4107
viewModel.collection_getUncheckedTicket( viewModel.collection_getUncheckedTicket(
getData(USER), collectionFk = tickets[0].toInt()
getData(PASSWORD),
collectionFk = tickets[0]
) )
} }
@ -1257,7 +1271,8 @@ class CollectionFragment(
isMarking = false isMarking = false
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
txtscan.toInt(), txtscan.toInt(),
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
@ -1340,7 +1355,7 @@ class CollectionFragment(
if (type == SACADOR) { if (type == SACADOR) {
sales[position].isPrepared = if (sales[position].isPrepared == "1") "0" else "1" sales[position].isPrepared = if (sales[position].isPrepared == "1") "0" else "1"
if (sales[position].isPrepared == "1") { if (sales[position].isPrepared == "1") {
sales[position].pickedQuantity = sales[position].quantity.toString() sales[position].pickedQuantity = sales[position].quantity!!
} }
} else if (type == CONTROLADOR) } else if (type == CONTROLADOR)
@ -1400,11 +1415,9 @@ class CollectionFragment(
//Tarea #4371 se quita para ver si funciona correctamente //Tarea #4371 se quita para ver si funciona correctamente
//binding.splashProgress.visibility=VISIBLE //binding.splashProgress.visibility=VISIBLE
viewModel.saleTrackingReplace( viewModel.saleTrackingReplace(
getData(USER),
getData(PASSWORD),
saleFk = sales[position].saleFk, saleFk = sales[position].saleFk,
vIsChecked = if (type == SACADOR) sales[position].isPrepared else if (type == CONTROLADOR) sales[position].isControlled else if (type == "PRECHECKER") sales[position].isPreControlled else "1", vIsChecked = if (type == SACADOR) sales[position].isPrepared else if (type == CONTROLADOR) sales[position].isControlled else if (type == "PRECHECKER") sales[position].isPreControlled else "1",
vOriginalQuantity = sales[position].pickedQuantity, vOriginalQuantity = sales[position].pickedQuantity!!,
vStateFk = if (type == CONTROLADOR) "CHECKED" else if (type == "PRECHECKER") "PREVIOUS_CONTROL" else type,//type.toString(), vStateFk = if (type == CONTROLADOR) "CHECKED" else if (type == "PRECHECKER") "PREVIOUS_CONTROL" else type,//type.toString(),
vBuyFk = originalItemScan vBuyFk = originalItemScan
@ -1419,11 +1432,9 @@ class CollectionFragment(
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
viewModel.saleTracking_mark( viewModel.saleTracking_mark(
getData(USER),
getData(PASSWORD),
saleFk = sales[position].saleFk, saleFk = sales[position].saleFk,
vIsChecked = if (type == SACADOR) sales[position].isPrepared else if (type == CONTROLADOR) sales[position].isControlled else if (type == "PRECHECKER") sales[position].isPreControlled else "1", vIsChecked = if (type == SACADOR) sales[position].isPrepared else if (type == CONTROLADOR) sales[position].isControlled else if (type == "PRECHECKER") sales[position].isPreControlled else "1",
vOriginalQuantity = sales[position].pickedQuantity, vOriginalQuantity = sales[position].pickedQuantity!!,
vStateFk = if (type == CONTROLADOR) "CHECKED" else if (type == "PRECHECKER") "PREVIOUS_CONTROL" else type,//type.toString(), vStateFk = if (type == CONTROLADOR) "CHECKED" else if (type == "PRECHECKER") "PREVIOUS_CONTROL" else type,//type.toString(),
vBuyFk = originalItemScan, vBuyFk = originalItemScan,
vItemShelvingFk = itemShelvingTracking_mark, vItemShelvingFk = itemShelvingTracking_mark,
@ -1441,7 +1452,7 @@ class CollectionFragment(
.setDescription(getString(R.string.goUnmark) + sales[position].itemFk + getString(R.string.sure)) .setDescription(getString(R.string.goUnmark) + sales[position].itemFk + getString(R.string.sure))
.setOkButton(getString(R.string.unmark)) { .setOkButton(getString(R.string.unmark)) {
sales[position].isPrepared = "0" sales[position].isPrepared = "0"
sales[position].pickedQuantity = "0" sales[position].pickedQuantity = 0
saleAdapter!!.notifyDataSetChanged() saleAdapter!!.notifyDataSetChanged()
setListPosition(position, false) setListPosition(position, false)
if (type != PRECHECKER) { if (type != PRECHECKER) {
@ -1449,8 +1460,6 @@ class CollectionFragment(
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
viewModel.itemShelving_updateFromSale( viewModel.itemShelving_updateFromSale(
getData(USER),
getData(PASSWORD),
sales[position].saleFk sales[position].saleFk
) )
positionUnmarked = position positionUnmarked = position
@ -1480,17 +1489,15 @@ class CollectionFragment(
storedShelvingPosition = shelvingPosition storedShelvingPosition = shelvingPosition
storedPosition = position storedPosition = position
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
var quantityGet = "0" var quantityGet = 0
try { try {
quantityGet = quantityGet =
(sales[position].quantity!!.toInt() - sales[position].pickedQuantity.toInt()).toString() (sales[position].quantity!! - sales[position].pickedQuantity!!.toInt())
} catch (e: Exception) { } catch (e: Exception) {
} }
//Log.i("VERDNATURA:","Aparece para enviar") //Log.i("VERDNATURA:","Aparece para enviar")
viewModel.itemPlacementSupplyAiming( viewModel.itemPlacementSupplyAiming(
getData(USER), itemFk = sales[position].itemFk,
getData(PASSWORD),
itemFk = sales[position].itemFk.toString(),
quantity = quantityGet, quantity = quantityGet,
shelvingFk = sales[position].placements[shelvingPosition].shelving shelvingFk = sales[position].placements[shelvingPosition].shelving
@ -1702,7 +1709,8 @@ class CollectionFragment(
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
@ -1729,7 +1737,7 @@ class CollectionFragment(
} }
//Tarea #4371 //Tarea #4371
private fun onQuantityOfShelvingSelected(itemShelvingFk: String, quantity: String = "0") { private fun onQuantityOfShelvingSelected(itemShelvingFk: String, quantity: Int = 0) {
//1 - MODIFICAR CANTIDAD DEL CARRO //1 - MODIFICAR CANTIDAD DEL CARRO
try { try {
val shelvingVisible = val shelvingVisible =
@ -1738,7 +1746,7 @@ class CollectionFragment(
sales[storedPosition].placements[storedShelvingPosition].visible.indexOf(")") sales[storedPosition].placements[storedShelvingPosition].visible.indexOf(")")
) )
if (quantity == "0") { if (quantity == 0) {
sales[storedPosition].placements[storedShelvingPosition].visible = sales[storedPosition].placements[storedShelvingPosition].visible =
"(" + (shelvingVisible.toInt() - customDialogList.getValue() "(" + (shelvingVisible.toInt() - customDialogList.getValue()
.toInt()).toString() + ")" .toInt()).toString() + ")"
@ -1762,14 +1770,14 @@ class CollectionFragment(
//2- MODIFICAR EL PICKED DEL SALE //2- MODIFICAR EL PICKED DEL SALE
try { try {
if (quantity == "0") { if (quantity == 0) {
sales[storedPosition].pickedQuantity = sales[storedPosition].pickedQuantity =
(sales[storedPosition].pickedQuantity.toInt() + customDialogList.getValue() (sales[storedPosition].pickedQuantity!! + customDialogList.getValue()
.toInt()).toString() .toInt())
} else { } else {
sales[storedPosition].pickedQuantity = sales[storedPosition].pickedQuantity =
(sales[storedPosition].pickedQuantity.toInt() + quantity (sales[storedPosition].pickedQuantity!! + quantity
.toInt()).toString() .toInt())
} }
} catch (e: Exception) { } catch (e: Exception) {
} }
@ -1779,7 +1787,7 @@ class CollectionFragment(
//Tarea #4371 //Tarea #4371
itemShelvingTracking_mark = itemShelvingFk itemShelvingTracking_mark = itemShelvingFk
if (sales[storedPosition].pickedQuantity != sales[storedPosition].quantity.toString()) { if (sales[storedPosition].pickedQuantity != sales[storedPosition].quantity) {
sales[storedPosition].isPrepared = "1" sales[storedPosition].isPrepared = "1"
markLine(storedPosition, OK) markLine(storedPosition, OK)
} else { } else {
@ -1815,12 +1823,13 @@ class CollectionFragment(
listPlacementSupply.add(BarcodeVO(code = it.ticketFk)) listPlacementSupply.add(BarcodeVO(code = it.ticketFk))
} }
if (listPlacementSupply.size == 1) { if (listPlacementSupply.size == 1) {
ticketSelected = listPlacementSupply[0].code!! ticketSelected = listPlacementSupply[0].code!!.toInt()
} }
customDialogList.getEditTextTwo().inputType = InputType.TYPE_CLASS_NUMBER
customDialogList.getEditText().inputType = InputType.TYPE_CLASS_NUMBER
customDialogList.setTitle(getString(R.string.Agregarartículoparaticket) + " " + ticketSelected) customDialogList.setTitle(getString(R.string.Agregarartículoparaticket) + " " + ticketSelected)
.setOkButton(getString(R.string.Agregar)) { .setOkButton(getString(R.string.Agregar)) {
if (ticketSelected.isNullOrEmpty()) { if (ticketSelected == 0) {
getString(R.string.Seleccionaunticketdelaista).toast(requireContext()) getString(R.string.Seleccionaunticketdelaista).toast(requireContext())
} else if (customDialogList.getValue() } else if (customDialogList.getValue()
.isNullOrEmpty() || customDialogList.getValueTwo().isNullOrEmpty() .isNullOrEmpty() || customDialogList.getValueTwo().isNullOrEmpty()
@ -1840,11 +1849,9 @@ class CollectionFragment(
) )
viewModel.collectionAddItem( viewModel.collectionAddItem(
getData(USER), itemFk = customDialogList.getValue().toInt(),
getData(PASSWORD),
itemFk = customDialogList.getValue(),
ticketFk = ticketSelected, ticketFk = ticketSelected,
quantityFk = customDialogList.getValueTwo(), quantityFk = customDialogList.getValueTwo().toInt(),
warehouseFk = getData(WAREHOUSEFK) warehouseFk = getData(WAREHOUSEFK)
) )
@ -1876,7 +1883,7 @@ class CollectionFragment(
customDialogList.getEditTextTwo().setOnEditorActionListener { v, actionId, event -> customDialogList.getEditTextTwo().setOnEditorActionListener { v, actionId, event ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
if (!customDialogList.getValueTwo().isNullOrEmpty()) { if (!customDialogList.getValueTwo().isNullOrEmpty()) {
if (ticketSelected.isNullOrEmpty()) { if (ticketSelected == 0) {
getString(R.string.Seleccionaunticketdelaista).toast(requireContext()) getString(R.string.Seleccionaunticketdelaista).toast(requireContext())
} else if (customDialogList.getValue() } else if (customDialogList.getValue()
.isNullOrEmpty() || customDialogList.getValueTwo().isNullOrEmpty() .isNullOrEmpty() || customDialogList.getValueTwo().isNullOrEmpty()
@ -1894,11 +1901,9 @@ class CollectionFragment(
) )
viewModel.collectionAddItem( viewModel.collectionAddItem(
getData(USER), itemFk = customDialogList.getValue().toInt(),
getData(PASSWORD),
itemFk = customDialogList.getValue(),
ticketFk = ticketSelected, ticketFk = ticketSelected,
quantityFk = customDialogList.getValueTwo(), quantityFk = customDialogList.getValueTwo().toInt(),
warehouseFk = getData(WAREHOUSEFK) warehouseFk = getData(WAREHOUSEFK)
) )
scanRequest() scanRequest()
@ -1917,7 +1922,7 @@ class CollectionFragment(
BarcodeAdapter(listPlacementSupply, object : OnBarcodeRowClickListener { BarcodeAdapter(listPlacementSupply, object : OnBarcodeRowClickListener {
override fun onBarcodeRowClickListener(item: BarcodeVO) { override fun onBarcodeRowClickListener(item: BarcodeVO) {
customDialogInput.setTitle(getString(R.string.ArtículoparaTicket) + " " + item.code!!) customDialogInput.setTitle(getString(R.string.ArtículoparaTicket) + " " + item.code!!)
ticketSelected = item.code!! ticketSelected = item.code!!.toInt()
customDialogList.setTitle(getString(R.string.Agregarartículoparaticket) + " " + ticketSelected) customDialogList.setTitle(getString(R.string.Agregarartículoparaticket) + " " + ticketSelected)
} }
}, showDelete = false) }, showDelete = false)
@ -2290,13 +2295,11 @@ class CollectionFragment(
} }
viewModel.collectionMissingTrash( viewModel.collectionMissingTrash(
getData(USER),
getData(PASSWORD),
saleFk = sales[position].saleFk, saleFk = sales[position].saleFk,
quantity = totalQuantity.toString(), quantity = totalQuantity.toString(),
warehouseFk = getData(WAREHOUSEFK), warehouseFk = getData(WAREHOUSEFK),
type = typeCollectionTrashMissingReject, type = typeCollectionTrashMissingReject,
originalQuantity = quantity.toString() originalQuantity = quantity
) )
} }
@ -2349,7 +2352,8 @@ class CollectionFragment(
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
@ -2396,7 +2400,6 @@ class CollectionFragment(
quantityIncrease = quantity quantityIncrease = quantity
viewModel.collectionIncreaseQuantitySalix( viewModel.collectionIncreaseQuantitySalix(
getData(TOKEN),
saleFk = sales[position].saleFk, saleFk = sales[position].saleFk,
quantity = quantity.toString() quantity = quantity.toString()
) )
@ -2532,8 +2535,6 @@ class CollectionFragment(
list.forEach { list.forEach {
if (it.description == item.code) { if (it.description == item.code) {
viewModel.saleMistakeAdd( viewModel.saleMistakeAdd(
usuario = getData(USER),
password = getData(PASSWORD),
vSaleFk = mistakeSale?.saleFk!!, vSaleFk = mistakeSale?.saleFk!!,
vUserFk = mistakeSale?.workerFk!!, vUserFk = mistakeSale?.workerFk!!,
vTypeFk = it.id vTypeFk = it.id

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

@ -10,11 +10,8 @@ import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.getMessageFromAllResponse
import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.base.nameofFunction
import es.verdnatura.presentation.common.ResponseItemVO import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.view.feature.collection.ItemVO import es.verdnatura.presentation.view.feature.collection.*
import es.verdnatura.presentation.view.feature.collection.SalesModifiedList
import es.verdnatura.presentation.view.feature.collection.listSaleSalix
import es.verdnatura.presentation.view.feature.collection.mapper.map import es.verdnatura.presentation.view.feature.collection.mapper.map
import es.verdnatura.presentation.view.feature.collection.saleSalix
import es.verdnatura.presentation.view.feature.sacador.model.* import es.verdnatura.presentation.view.feature.sacador.model.*
import retrofit2.Call import retrofit2.Call
import retrofit2.Callback import retrofit2.Callback
@ -149,13 +146,14 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
fun collectionTicketGet( fun collectionTicketGet(
collectionFk: Int, collectionFk: Int,
sectorFk: String, sectorFk: Int,
print:String,
type: String type: String
) { ) {
silex.collection_getTickets( silex.collection_getTickets(
collectionFk, collectionFk,
sectorFk, sectorFk,
"0", print,
type type
).enqueue(object : ).enqueue(object :
Callback<CollectionVO> { Callback<CollectionVO> {
@ -187,13 +185,14 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
fun collection_get( fun collection_get(
collectionFk: Int, collectionFk: Int,
sectorFk: String, sectorFk: Int,
print:String,
type: String type: String
) { ) {
getSacadorControladorUserCase.collection_get( silex.collection_get(
collectionFk, collectionFk,
sectorFk, sectorFk,
"0", print,
type type
).enqueue(object : ).enqueue(object :
Callback<CollectionVO> { Callback<CollectionVO> {
@ -224,17 +223,13 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
} }
fun saleTrackingReplace( fun saleTrackingReplace(
usuario: String, saleFk: Int,
password: String, vOriginalQuantity: Int,
saleFk: String,
vOriginalQuantity: String,
vStateFk: String, vStateFk: String,
vIsChecked: String, vIsChecked: String,
vBuyFk: String vBuyFk: String
) { ) {
getSacadorControladorUserCase.saleTrackingReplace( silex.saleTrackingReplace(
usuario,
password,
saleFk, saleFk,
vOriginalQuantity, vOriginalQuantity,
vStateFk, vStateFk,
@ -265,19 +260,15 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
} }
fun saleTracking_mark( fun saleTracking_mark(
usuario: String, saleFk: Int,
password: String, vOriginalQuantity: Int,
saleFk: String,
vOriginalQuantity: String,
vStateFk: String, vStateFk: String,
vIsChecked: String, vIsChecked: String,
vBuyFk: String, vBuyFk: String,
vItemShelvingFk: String, vItemShelvingFk: String,
vQuantity: String vQuantity: String
) { ) {
getSacadorControladorUserCase.saleTracking_mark( silex.saleTracking_mark(
usuario,
password,
saleFk, saleFk,
vOriginalQuantity, vOriginalQuantity,
vStateFk, vStateFk,
@ -312,15 +303,11 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
fun itemPlacementSupplyAiming( fun itemPlacementSupplyAiming(
usuario: String,
password: String,
shelvingFk: String, shelvingFk: String,
quantity: String, quantity: Int,
itemFk: String itemFk: Int
) { ) {
getSacadorControladorUserCase.itemPlacementSupplyAiming( silex.itemPlacementSupplyAiming(
usuario,
password,
shelvingFk, shelvingFk,
quantity, quantity,
itemFk itemFk
@ -403,7 +390,7 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
collectionFk: Int, collectionFk: Int,
labelCount: Int? labelCount: Int?
) { ) {
getSacadorControladorUserCase.collectionStickerPrint( silex.collectionStickerPrint(
collectionFk, collectionFk,
labelCount labelCount
).enqueue(object : Callback<Any> { ).enqueue(object : Callback<Any> {
@ -525,16 +512,12 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
} }
fun collectionAddItem( fun collectionAddItem(
usuario: String, itemFk: Int,
password: String, quantityFk: Int,
itemFk: String, ticketFk: Int,
quantityFk: String,
ticketFk: String,
warehouseFk: String warehouseFk: String
) { ) {
getSacadorControladorUserCase.collectionAddItem( silex.collectionAddItem(
usuario,
password,
itemFk, itemFk,
quantityFk, quantityFk,
ticketFk, ticketFk,
@ -609,11 +592,11 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
fun transferSalesSalix( fun transferSalesSalix(
ticketFk: String, ticketFk: String,
saleFk: String, saleFk: Int,
quantity: String, quantity: String,
) { ) {
var saleTransfer = listSaleSalix(arrayListOf(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt()))) var saleTransfer = listSaleSalix(arrayListOf(saleSalix(id = saleFk, quantity = quantity.toInt())))
salix.transferSalesSalix( salix.transferSalesSalix(
ticketFk,saleTransfer ticketFk,saleTransfer
@ -645,17 +628,13 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
} }
fun collectionMissingTrash( fun collectionMissingTrash(
usuario: String, saleFk: Int,
password: String,
saleFk: String,
quantity: String, quantity: String,
type: String, type: String,
warehouseFk: String, warehouseFk: String,
originalQuantity: String originalQuantity: Int
) { ) {
getSacadorControladorUserCase.collectionMissingTrash( silex.collectionMissingTrash(
usuario,
password,
saleFk, saleFk,
quantity, quantity,
type, type,
@ -715,13 +694,9 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
} }
fun itemShelving_updateFromSale( fun itemShelving_updateFromSale(
usuario: String, itemShelvingFk: Int
password: String,
itemShelvingFk: String
) { ) {
getSacadorControladorUserCase.itemShelving_updateFromSale( silex.itemShelving_updateFromSale(
usuario,
password,
itemShelvingFk itemShelvingFk
) )
@ -946,14 +921,11 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
fun collectionIncreaseQuantitySalix( fun collectionIncreaseQuantitySalix(
token: String, saleFk: Int,
saleFk: String,
quantity: String quantity: String
) { ) {
getSacadorControladorUserCase.collectionIncreaseQuantitySalix( salix.collectionIncreaseQuantitySalix(
token, SalixSaleQuantity(saleId = saleFk, quantity = quantity.toInt())
saleFk,
quantity
).enqueue(object : Callback<Any> { ).enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) { override fun onFailure(call: Call<Any>, t: Throwable) {
_responseIncQuantity.value = ResponseItemVO( _responseIncQuantity.value = ResponseItemVO(
@ -1019,13 +991,11 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
} }
fun saleMistakeAdd( fun saleMistakeAdd(
usuario: String, vSaleFk: Int,
password: String,
vSaleFk: String,
vUserFk: String, vUserFk: String,
vTypeFk: String vTypeFk: String
) { ) {
getSacadorControladorUserCase.saleMistakeAdd(usuario, password, vSaleFk, vUserFk, vTypeFk) silex.saleMistakeAdd(vSaleFk, vUserFk, vTypeFk)
.enqueue(object : .enqueue(object :
Callback<Any> { Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) { override fun onFailure(call: Call<Any>, t: Throwable) {
@ -1249,13 +1219,9 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
} }
fun collection_getUncheckedTicket( fun collection_getUncheckedTicket(
usuario: String, collectionFk: Int
password: String,
collectionFk: String
) { ) {
getSacadorControladorUserCase.collection_getUncheckedTicket( silex.collection_getUncheckedTicket(
usuario,
password,
collectionFk collectionFk
).enqueue(object : ).enqueue(object :
Callback<String> { Callback<String> {

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

@ -58,7 +58,8 @@ class CollectionShowTicketFragment(
if (collection.tickets.isEmpty()) { if (collection.tickets.isEmpty()) {
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
} }
@ -117,14 +118,16 @@ class CollectionShowTicketFragment(
if (!buttonPushedGetCollection) { if (!buttonPushedGetCollection) {
viewModel.collection_get( viewModel.collection_get(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getData(SECTORFK).toInt(),
print = "0",
type type
) )
buttonPushedGetCollection = true buttonPushedGetCollection = true
} else { } else {
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
lastScanned.toInt(), lastScanned,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
@ -170,7 +173,7 @@ class CollectionShowTicketFragment(
if (ma.havePrinter() && ma.haveSector()) { if (ma.havePrinter() && ma.haveSector()) {
viewModel.collectionStickerPrint( viewModel.collectionStickerPrint(
collectionFk = collection.collectionFk, collectionFk = collection.collectionFk,
labelCount = getData(SECTORFK).toInt() labelCount = getDataInt(SECTORFK)
) )
@ -193,7 +196,8 @@ class CollectionShowTicketFragment(
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
binding.scanInput.text.toString().toInt(), binding.scanInput.text.toString().toInt(),
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
@ -216,7 +220,8 @@ class CollectionShowTicketFragment(
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
collection.collectionFk, collection.collectionFk,
getData(SECTORFK), getDataInt(SECTORFK),
print="0",
type type
) )
binding.collectionSwipe.isRefreshing = false binding.collectionSwipe.isRefreshing = false

5
app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt
View File

@ -12,6 +12,7 @@ fun CollectionVO.map(context: Context): CollectionVO {
this.tickets.forEach { ticket -> this.tickets.forEach { ticket ->
// if (ticket.sales.size>0){
ticket.sales.forEach { ticket.sales.forEach {
it.ticketFk = ticket.ticketFk it.ticketFk = ticket.ticketFk
it.level = ticket.level it.level = ticket.level
@ -43,7 +44,7 @@ fun CollectionVO.map(context: Context): CollectionVO {
it.pickedQuantity = it.pickedQuantity =
if (it.isPrepared == "1" || it.isPreviousPrepared == "1" || it.isControlled == "1") it.quantity.toString() else it.pickedQuantity if (it.isPrepared == "1" || it.isPreviousPrepared == "1" || it.isControlled == "1") it.quantity else it.pickedQuantity
if (!it.placements.isNullOrEmpty()) { if (!it.placements.isNullOrEmpty()) {
it.placements.forEachIndexed { index, placement -> it.placements.forEachIndexed { index, placement ->
if (index == 0) { if (index == 0) {
@ -65,7 +66,7 @@ fun CollectionVO.map(context: Context): CollectionVO {
} }
} }//}
} catch (e: Exception) { } catch (e: Exception) {
this.isError = true this.isError = true
if (this.tickets.isNullOrEmpty()) { if (this.tickets.isNullOrEmpty()) {

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

@ -65,8 +65,9 @@ class ControladorFragment :
binding.scanInput.setText(textScanned_filterDouble(binding.scanInput.text!!.toString())) binding.scanInput.setText(textScanned_filterDouble(binding.scanInput.text!!.toString()))
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
sectorFk = getData(SECTORFK), sectorFk = getDataInt(SECTORFK),
collectionFk = binding.scanInput.text.toString().toInt(), collectionFk = binding.scanInput.text.toString().toInt(),
print = "0",
type = ConstAndValues.CONTROLADOR type = ConstAndValues.CONTROLADOR
) )

39
app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt
View File

@ -16,9 +16,10 @@ import retrofit2.Response
class ControladorViewModel(context: Context) : BaseViewModel(context) { class ControladorViewModel(context: Context) : BaseViewModel(context) {
private val contextApp=context private val contextApp = context
private val _collectionTicketList by lazy { MutableLiveData<CollectionVO>() } private val _collectionTicketList by lazy { MutableLiveData<CollectionVO>() }
private val getSacadorControladorUserCase: GetSacadorControladorUserCase = GetSacadorControladorUserCase(context) private val getSacadorControladorUserCase: GetSacadorControladorUserCase =
GetSacadorControladorUserCase(context)
private val _response by lazy { MutableLiveData<ResponseItemVO>() } private val _response by lazy { MutableLiveData<ResponseItemVO>() }
val response: LiveData<ResponseItemVO> val response: LiveData<ResponseItemVO>
@ -28,28 +29,40 @@ class ControladorViewModel(context: Context) : BaseViewModel(context) {
get() = _collectionTicketList get() = _collectionTicketList
fun collectionTicketGet(collectionFk:Int,sectorFk:String,type:String){ fun collectionTicketGet(collectionFk: Int, sectorFk: Int, print: String, type: String) {
getSacadorControladorUserCase.collectionTicketGet(collectionFk,sectorFk,"0",type).enqueue(object : silex.collection_getTickets(collectionFk, sectorFk, print, type).enqueue(object :
Callback<CollectionVO> { Callback<CollectionVO> {
override fun onFailure(call: Call<CollectionVO>, t: Throwable) { override fun onFailure(call: Call<CollectionVO>, t: Throwable) {
_collectionTicketList.value = CollectionVO(0,isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)) _collectionTicketList.value = CollectionVO(
0,
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
)
} }
override fun onResponse( override fun onResponse(
call: Call<CollectionVO>, call: Call<CollectionVO>,
response: Response<CollectionVO> response: Response<CollectionVO>
) { ) {
if (response.body() != null){ if (response.body() != null) {
_collectionTicketList.value = response.body()?.let { it.map(contextApp) _collectionTicketList.value = response.body()?.let {
it.map(contextApp)
} }
/* response.body()?.let { /* response.body()?.let {
Log.d("VERDNTURA::","el itempacking es "+it.tickets.get(0).itemPackingTypeFk) Log.d("VERDNTURA::","el itempacking es "+it.tickets.get(0).itemPackingTypeFk)
}.also { }*/ }.also { }*/
} else {
}else{ _collectionTicketList.value = CollectionVO(
_collectionTicketList.value = CollectionVO(0,isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())) 0,
isError = true,
errorMessage = getMessageFromAllResponse(
nameofFunction(this),
response.message()
)
)
} }
} }
}) })

64
app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
View File

@ -65,63 +65,12 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
saveRemember(false) saveRemember(false)
} }
// binding.edittextServer.setText(getData(getString(R.string.baseurl)))
binding.edittextServer.setText(getData(WORKFORMSELECTED)) binding.edittextServer.setText(getData(WORKFORMSELECTED))
/* binding.edittextServer.setOnKeyListener { _, keyCode, event -> if (binding.edittextServer.text.toString() == "TestLOCAL") {
if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP) { binding.edittextUsername.setText("developer")
binding.edittextPassword.setText("nightmare")
saveData( }
"base_url",
binding.edittextServer.text.toString()
)
val working_in_test = false
if (working_in_test) {
saveData(
"base_urlSalix",
"http://localhost:3000/api/"
)
} else {
if (binding.edittextServer.text!!.contains("test-app.verdnatura.es")) {
saveData(
"base_urlSalix",
"https://test-salix.verdnatura.es/api/"
// "https://test-salix.verdnatura.es/" //localhost desde emulador 10.0.2.2:3000
// "http://localhost:3000/api/"
//"http://10.0.2.2:3000/api/" //-> desde emulador 10.0.2.2:3000
)
} else {
saveData(
"base_urlSalix",
"https://salix.verdnatura.es/api/"
/*working_in_test*/
// "http://localhost:3000/api/"
//"http://10.0.2.2:3000/api/" //-> desde emulador 10.0.2.2:3000
)
}
}
"${getString(R.string.serverSalix)}${getData("base_urlSalix")})".toast(
requireContext()
)
this.hideKeyboard()
CoroutineScope(Dispatchers.IO).launch {
delay(2000)
withContext(Dispatchers.Main) {
exitProcess(0)
}
}
}
false
}*/
// se crean/listan las opciones de formas de trabajo // se crean/listan las opciones de formas de trabajo
listForms = getWorkForm().sortedBy { it.created } listForms = getWorkForm().sortedBy { it.created }
@ -146,13 +95,10 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
showNewForm() showNewForm()
} }
else -> { else -> {
binding.edittextServer.setText(item.name) binding.edittextServer.setText(item.name)
saveData("base_url", item.urlSilex) saveData("base_url", item.urlSilex)
saveData("base_urlSalix", item.urlSalix) saveData("base_urlSalix", item.urlSalix)
saveData(WORKFORMSELECTED, item.name) saveData(WORKFORMSELECTED, item.name)
customDialogList.dismiss() customDialogList.dismiss()
requireActivity().recreate() requireActivity().recreate()
} }
@ -253,10 +199,12 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
} }
private fun checkUser() { private fun checkUser() {
val prefs: SharedPreferences = requireActivity().getSharedPreferences(PREFS_USER, 0) val prefs: SharedPreferences = requireActivity().getSharedPreferences(PREFS_USER, 0)
if (prefs.getBoolean(REMEMBER, false)) { if (prefs.getBoolean(REMEMBER, false)) {
binding.edittextUsername.setText(prefs.getString(USER, "")) binding.edittextUsername.setText(prefs.getString(USER, ""))
binding.edittextPassword.setText(prefs.getString(PASSWORD, "")) binding.edittextPassword.setText(prefs.getString(PASSWORD, ""))
if (binding.edittextPassword.text.toString().isNotEmpty()) { if (binding.edittextPassword.text.toString().isNotEmpty()) {
binding.switchRemember.isChecked = true binding.switchRemember.isChecked = true
} }

3
app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt
View File

@ -66,8 +66,9 @@ class PreControladorFragment :
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
sectorFk = getData(SECTORFK), sectorFk = getDataInt(SECTORFK),
collectionFk = binding.scanInput.text.toString().toInt(), collectionFk = binding.scanInput.text.toString().toInt(),
print="0",
type = type type = type
) )

6
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt
View File

@ -51,8 +51,8 @@ class PreSacadorAdapter (
val sale : SaleVO = preSale.toSale() val sale : SaleVO = preSale.toSale()
if (sale.pickedQuantity.isNullOrEmpty()) if (sale.pickedQuantity==null)
sale.pickedQuantity = "0" sale.pickedQuantity = 0
val childLayoutManager = LinearLayoutManager(context!!, RecyclerView.HORIZONTAL, false) val childLayoutManager = LinearLayoutManager(context!!, RecyclerView.HORIZONTAL, false)
@ -78,7 +78,7 @@ class PreSacadorAdapter (
onQuantityClick.onQuantityClick(sale) onQuantityClick.onQuantityClick(sale)
} }
if (sale.quantity == sale.pickedQuantity.toInt()){ if (sale.quantity == sale.pickedQuantity!!){
sale.isPreviousPrepared = "1" sale.isPreviousPrepared = "1"
}else{ }else{
sale.isPreviousPrepared = "0" sale.isPreviousPrepared = "0"

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

@ -49,7 +49,7 @@ class EndSacadorFragment(
private lateinit var customDialog: CustomDialog private lateinit var customDialog: CustomDialog
private lateinit var customDialogList: CustomDialogList private lateinit var customDialogList: CustomDialogList
private var saleAdapter: PreSacadorAdapter? = null private var saleAdapter: PreSacadorAdapter? = null
private var ticket: Int =0 private var ticket: Int = 0
private var lm: LinearLayoutManager? = null private var lm: LinearLayoutManager? = null
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
private var storedPosition: Int = 0 private var storedPosition: Int = 0
@ -73,10 +73,10 @@ class EndSacadorFragment(
private var typeCollectionMissing = "" private var typeCollectionMissing = ""
private var positionCollectionMissing = 0 private var positionCollectionMissing = 0
private var quantityCollectionMissing = "" private var quantityCollectionMissing = 0
private var positionIncreaseQuantity = 0 private var positionIncreaseQuantity = 0
private var quantityIncrease = "" private var quantityIncrease= 0
private var quantityCollectionSplit = "" private var quantityCollectionSplit = 0
private var positionCollectionSplit = 0 private var positionCollectionSplit = 0
// private val listIcons:ArrayList<ImageView> = ArrayList() // private val listIcons:ArrayList<ImageView> = ArrayList()
@ -433,7 +433,7 @@ class EndSacadorFragment(
} }
//sales[position].startQuantity = quantity //sales[position].startQuantity = quantity
if (quantityCollectionSplit == "0") if (quantityCollectionSplit == 0)
markLine(positionCollectionSplit) markLine(positionCollectionSplit)
saleAdapter!!.notifyDataSetChanged() saleAdapter!!.notifyDataSetChanged()
@ -500,7 +500,7 @@ class EndSacadorFragment(
sales[positionCollectionMissing].saldo = 0 sales[positionCollectionMissing].saldo = 0
} }
if (quantityCollectionMissing == "0") if (quantityCollectionMissing == 0)
markLine(positionCollectionMissing) markLine(positionCollectionMissing)
@ -574,7 +574,7 @@ class EndSacadorFragment(
//Log.i(TAG, "Escaneamos ticket en previa" + ticketFk) //Log.i(TAG, "Escaneamos ticket en previa" + ticketFk)
ticket = ticketFk ticket = ticketFk
if (ticketFk!=0) if (ticketFk != 0)
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
viewModel.sectorCollectionSaleGroup_add( viewModel.sectorCollectionSaleGroup_add(
ticketFk, ticketFk,
@ -594,7 +594,7 @@ class EndSacadorFragment(
) )
} else { } else {
if (ticket==0) { if (ticket == 0) {
binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString() binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString()
} }
sales = ArrayList() sales = ArrayList()
@ -679,7 +679,7 @@ class EndSacadorFragment(
if (it.saldo == it.picked) if (it.saldo == it.picked)
totalMark += 1 totalMark += 1
} }
if (ticket==0) { if (ticket == 0) {
binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString() binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString()
} }
@ -851,15 +851,13 @@ class EndSacadorFragment(
storedShelvingPosition = shelvingPosition storedShelvingPosition = shelvingPosition
storedPosition = position storedPosition = position
binding.splashProgress.visibility = View.VISIBLE binding.splashProgress.visibility = View.VISIBLE
var quantityGet = "0" var quantityGet = 0
try { try {
quantityGet = (sales[position].saldo - sales[position].picked).toString() quantityGet = (sales[position].saldo - sales[position].picked)
} catch (e: Exception) { } catch (e: Exception) {
} }
viewModel.itemPlacementSupplyAiming( viewModel.itemPlacementSupplyAiming(
usuario = getData(USER), itemFk = sales[position].itemFk,
password = getData(PASSWORD),
itemFk = sales[position].itemFk.toString(),
quantity = quantityGet, quantity = quantityGet,
shelvingFk = sales[position].carros[shelvingPosition].shelving shelvingFk = sales[position].carros[shelvingPosition].shelving
) )
@ -1161,54 +1159,57 @@ class EndSacadorFragment(
private fun showQuantityDialog(position: Int) { private fun showQuantityDialog(position: Int) {
customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad)).setValue("") try {
.setOkButton(getString(R.string.titleFaults)) { customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad))
checkAndCall( .setValue("")
position, .setOkButton(getString(R.string.titleFaults)) {
customDialogThreeButtons.getValue(), checkAndCall(
getString(R.string.titleFaults) position,
) customDialogThreeButtons.getValue().toInt(),
getString(R.string.titleFaults)
)
}.setOkButtonTwo(getString(R.string.BasuraRechazar)) { }.setOkButtonTwo(getString(R.string.BasuraRechazar)) {
checkAndCall( checkAndCall(
position, position,
customDialogThreeButtons.getValue(), customDialogThreeButtons.getValue().toInt(),
getString(R.string.BasuraRechazar) getString(R.string.BasuraRechazar)
) )
}.setOkButtonThree(getString(R.string.Reject)) { }.setOkButtonThree(getString(R.string.Reject)) {
checkAndCall( checkAndCall(
position, position,
customDialogThreeButtons.getValue(), customDialogThreeButtons.getValue().toInt(),
getString(R.string.Reject) getString(R.string.Reject)
) )
}.setOkButtonFour(getString(R.string.Split)) { }.setOkButtonFour(getString(R.string.Split)) {
checkAndCall( checkAndCall(
position, position,
customDialogThreeButtons.getValue(), customDialogThreeButtons.getValue().toInt(),
getString(R.string.Split) getString(R.string.Split)
) )
}.setOkButtonAdd(getString(R.string.Agregar)) { }.setOkButtonAdd(getString(R.string.Agregar)) {
checkAndCall( checkAndCall(
position, position,
customDialogThreeButtons.getValue(), customDialogThreeButtons.getValue().toInt(),
getString(R.string.Agregar) getString(R.string.Agregar)
) )
}.setKoButton(getString(R.string.cancel)) { }.setKoButton(getString(R.string.cancel)) {
scanRequest() scanRequest()
customDialogThreeButtons.dismiss() customDialogThreeButtons.dismiss()
}.show() }.show()
}catch (ex:Exception){
getString(R.string.errorQuantity).toast(context)
}
} }
private fun checkAndCall(position: Int, value: String, action: String) { private fun checkAndCall(position: Int, value: Int, action: String) {
if (value.trim().isNullOrEmpty()) {
getString(R.string.Indicanuevacantidad).toast(requireContext())
} else {
when (action) { when (action) {
getString(R.string.Agregar) -> increaseQuantity(position, value) getString(R.string.Agregar) -> increaseQuantity(position, value)
@ -1218,15 +1219,13 @@ class EndSacadorFragment(
getString(R.string.Split) -> split(position, value) getString(R.string.Split) -> split(position, value)
} }
scanRequest() scanRequest()
customDialogThreeButtons.dismiss() customDialogThreeButtons.dismiss()
}
} }
private fun TrashMissingReject( private fun TrashMissingReject(
position: Int, position: Int,
quantity: String, quantity: Int,
typeCollectionTrashMissingReject: String typeCollectionTrashMissingReject: String
) { ) {
typeCollectionMissing = typeCollectionTrashMissingReject typeCollectionMissing = typeCollectionTrashMissingReject
@ -1240,9 +1239,7 @@ class EndSacadorFragment(
} }
viewModel.collectionMissingTrash( viewModel.collectionMissingTrash(
usuario = getData(USER), saleFk = sales[position].idMovimiento,
password = getData(PASSWORD),
saleFk = sales[position].idMovimiento.toString(),
quantity = totalQuantity.toString(), quantity = totalQuantity.toString(),
warehouseFk = getData(WAREHOUSEFK), warehouseFk = getData(WAREHOUSEFK),
type = "FALSE", type = "FALSE",
@ -1251,7 +1248,7 @@ class EndSacadorFragment(
} }
private fun split(position: Int, quantity: String) { private fun split(position: Int, quantity: Int) {
positionCollectionSplit = position positionCollectionSplit = position
quantityCollectionSplit = quantity quantityCollectionSplit = quantity
@ -1274,13 +1271,12 @@ class EndSacadorFragment(
} }
private fun increaseQuantity(position: Int, quantity: String) { private fun increaseQuantity(position: Int, quantity: Int) {
positionIncreaseQuantity = position positionIncreaseQuantity = position
quantityIncrease = quantity quantityIncrease = quantity
viewModel.collectionIncreaseQuantity( viewModel.collectionIncreaseQuantity(
token = getData(TOKEN), saleFk = sales[position].idMovimiento,
saleFk = sales[position].idMovimiento.toString(),
quantity = quantity quantity = quantity
) )

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

@ -13,6 +13,7 @@ import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.getMessageFromAllResponse
import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.base.nameofFunction
import es.verdnatura.presentation.common.ResponseItemVO import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity
import es.verdnatura.presentation.view.feature.collection.listSaleSalix import es.verdnatura.presentation.view.feature.collection.listSaleSalix
import es.verdnatura.presentation.view.feature.collection.saleSalix import es.verdnatura.presentation.view.feature.collection.saleSalix
import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO
@ -226,15 +227,11 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
}*/ }*/
fun itemPlacementSupplyAiming( fun itemPlacementSupplyAiming(
usuario: String,
password: String,
shelvingFk: String, shelvingFk: String,
quantity: String, quantity: Int,
itemFk: String itemFk: Int
) { ) {
getSacadorControladorUserCase.itemPlacementSupplyAiming( silex.itemPlacementSupplyAiming(
usuario,
password,
shelvingFk, shelvingFk,
quantity, quantity,
itemFk itemFk
@ -276,7 +273,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
fun itemShelvingSaleSupplyAdd( fun itemShelvingSaleSupplyAdd(
itemShelvingFk: String, itemShelvingFk: String,
saleFk: String, saleFk: Int,
quantity: String quantity: String
) { ) {
silex.itemShelvingSaleSupplyAdd( silex.itemShelvingSaleSupplyAdd(
@ -311,8 +308,6 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
fun saleTrackingReplace( fun saleTrackingReplace(
usuario: String,
password: String,
saleFk: String, saleFk: String,
vOriginalQuantity: String, vOriginalQuantity: String,
vStateFk: String, vStateFk: String,
@ -321,8 +316,6 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
) { ) {
getSacadorControladorUserCase.saleTrackingReplace( getSacadorControladorUserCase.saleTrackingReplace(
usuario,
password,
saleFk, saleFk,
vOriginalQuantity, vOriginalQuantity,
vStateFk, vStateFk,
@ -447,17 +440,13 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
} }
fun collectionMissingTrash( fun collectionMissingTrash(
usuario: String, saleFk: Int,
password: String,
saleFk: String,
quantity: String, quantity: String,
type: String, type: String,
warehouseFk: String, warehouseFk: String,
originalQuantity: String originalQuantity: Int
) { ) {
getSacadorControladorUserCase.collectionMissingTrash( silex.collectionMissingTrash(
usuario,
password,
saleFk, saleFk,
quantity, quantity,
type, type,
@ -489,14 +478,13 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
} }
fun collectionIncreaseQuantity( fun collectionIncreaseQuantity(
token: String, saleFk: Int,
saleFk: String, quantity: Int
quantity: String
) { ) {
getSacadorControladorUserCase.collectionIncreaseQuantitySalix( salix.collectionIncreaseQuantitySalix(
token, SalixSaleQuantity(
saleFk, saleFk,
quantity quantity)
).enqueue(object : Callback<Any> { ).enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) { override fun onFailure(call: Call<Any>, t: Throwable) {
_responseIncQuantity.value = ResponseItemVO( _responseIncQuantity.value = ResponseItemVO(
@ -875,7 +863,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
fun itemShelving_updateFromSale( fun itemShelving_updateFromSale(
saleFk: String saleFk: Int
) { ) {
silex.itemShelving_updateFromSale( silex.itemShelving_updateFromSale(
saleFk saleFk
@ -907,11 +895,11 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
fun transferSalesSalix( fun transferSalesSalix(
ticketFk:String, ticketFk:String,
saleFk: String, saleFk: Int,
quantity: String, quantity: String,
) { ) {
var saleTransfer = listSaleSalix(arrayListOf(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt()))) var saleTransfer = listSaleSalix(arrayListOf(saleSalix(id = saleFk, quantity = quantity.toInt())))
//saleTransfer.sales.add(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt())) //saleTransfer.sales.add(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt()))
salix.transferSalesSalix( salix.transferSalesSalix(
ticketFk,saleTransfer ticketFk,saleTransfer

4
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/mapper/SaleMapper.kt
View File

@ -14,7 +14,7 @@ fun PreSacadorItemVO.toSale() : SaleVO {
isPreviousPrepared = if (quantity == picked) "1" else "0", isPreviousPrepared = if (quantity == picked) "1" else "0",
line1 = longName, line1 = longName,
line2 = if (subName.isNullOrEmpty()) "" else subName,//sergio:cuando subida versión de tarea #3510 se puede quitar isNullOrEmpty line2 = if (subName.isNullOrEmpty()) "" else subName,//sergio:cuando subida versión de tarea #3510 se puede quitar isNullOrEmpty
pickedQuantity = picked.toString(), pickedQuantity = picked,
workerFk = if (trabajador.isNullOrEmpty()) { "0" } else trabajador, workerFk = if (trabajador.isNullOrEmpty()) { "0" } else trabajador,
originalQuantity = quantity, originalQuantity = quantity,
placements = carros, placements = carros,
@ -39,7 +39,7 @@ fun PreSacadorItemVO.toSaleReposicion() : SaleVO {
isPreviousPrepared = if ((quantity - saldo) == 0) "1" else "0", isPreviousPrepared = if ((quantity - saldo) == 0) "1" else "0",
line1 = longName, line1 = longName,
line2 = if (subName.isNullOrEmpty()) "" else subName, line2 = if (subName.isNullOrEmpty()) "" else subName,
pickedQuantity = (quantity - saldo).toString(), pickedQuantity = (quantity - saldo),
workerFk = if (trabajador.isNullOrEmpty()) { "0" } else trabajador, workerFk = if (trabajador.isNullOrEmpty()) { "0" } else trabajador,
originalQuantity = quantity, originalQuantity = quantity,
placements = carros, placements = carros,

2
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/model/PreSacadorItemVO.kt
View File

@ -12,7 +12,7 @@ class PreSacadorItemVO(
var saldo: Int = 0, var saldo: Int = 0,
//var picked : Int = 45, //var picked : Int = 45,
var picked: Int = 0, var picked: Int = 0,
var idMovimiento: String = "", var idMovimiento: Int,
var trabajador: String = "", var trabajador: String = "",
var carros: List<PlacementVO> = listOf(), var carros: List<PlacementVO> = listOf(),
//var priority:Int =0, 7-1-2022 //var priority:Int =0, 7-1-2022

6
app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/adapter/ReposicionAdapter.kt
View File

@ -49,8 +49,8 @@ class ReposicionAdapter (
itemRowLayout.visibility = View.GONE itemRowLayout.visibility = View.GONE
if (sale.pickedQuantity.isNullOrEmpty()) if (sale.pickedQuantity==null)
sale.pickedQuantity = "0" sale.pickedQuantity = 0
val childLayoutManager = LinearLayoutManager(context!!, RecyclerView.HORIZONTAL, false) val childLayoutManager = LinearLayoutManager(context!!, RecyclerView.HORIZONTAL, false)
@ -69,7 +69,7 @@ class ReposicionAdapter (
} }
if (sale.quantity == sale.pickedQuantity.toInt()){ if (sale.quantity == sale.pickedQuantity!!.toInt()){
sale.isPreviousPrepared = "1" sale.isPreviousPrepared = "1"
}else{ }else{
sale.isPreviousPrepared = "0" sale.isPreviousPrepared = "0"

8
app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt
View File

@ -339,15 +339,13 @@ class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionVie
storedShelvingPosition = shelvingPosition storedShelvingPosition = shelvingPosition
storedPosition = position storedPosition = position
binding.splashProgress.visibility = View.VISIBLE binding.splashProgress.visibility = View.VISIBLE
var quantityGet = "0" var quantityGet = 0
try { try {
quantityGet = (sales[position].saldo - sales[position].picked).toString() quantityGet = (sales[position].saldo - sales[position].picked)
} catch (e: Exception) { } catch (e: Exception) {
} }
viewModel.itemPlacementSupplyAiming( viewModel.itemPlacementSupplyAiming(
usuario = getData(USER), itemFk = sales[position].itemFk,
password = getData(PASSWORD),
itemFk = sales[position].itemFk.toString(),
quantity = quantityGet, quantity = quantityGet,
shelvingFk = sales[position].carros[shelvingPosition].shelving shelvingFk = sales[position].carros[shelvingPosition].shelving
) )

10
app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionViewModel.kt
View File

@ -100,16 +100,12 @@ class ReposicionViewModel(context: Context) : BaseViewModel(context) {
} }
fun itemPlacementSupplyAiming( fun itemPlacementSupplyAiming(
usuario: String,
password: String,
shelvingFk: String, shelvingFk: String,
quantity: String, quantity: Int,
itemFk: String itemFk: Int
) { ) {
getSacadorControladorUserCase.itemPlacementSupplyAiming( silex.itemPlacementSupplyAiming(
usuario,
password,
shelvingFk, shelvingFk,
quantity, quantity,
itemFk itemFk

8
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt
View File

@ -31,8 +31,8 @@ class SaleVO(
var rgb: String?, var rgb: String?,
var agencyName: String = "", var agencyName: String = "",
var saleOrder: Int = 9999, var saleOrder: Int = 9999,
var saleFk: String = "", var saleFk: Int,
var itemFk: Int=0, var itemFk: Int = 0,
var quantity: Int?, var quantity: Int?,
var longName: String = "", var longName: String = "",
var size: String = "", var size: String = "",
@ -49,12 +49,12 @@ class SaleVO(
var category: String = "", var category: String = "",
var origin: String = "", var origin: String = "",
var clientFk: String = "", var clientFk: String = "",
var originalQuantity:Int?, var originalQuantity: Int?,
var line1: String = "", var line1: String = "",
var line2: String? = "", var line2: String? = "",
var line3: String = "", var line3: String = "",
var isAdded: String = "", var isAdded: String = "",
var pickedQuantity: String = "", var pickedQuantity: Int? = 0,
var workerFk: String = "", var workerFk: String = "",
var placements: List<PlacementVO> = listOf(), var placements: List<PlacementVO> = listOf(),
var Barcodes: List<String> = listOf(), var Barcodes: List<String> = listOf(),

3
app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt
View File

@ -73,8 +73,9 @@ class ShowTicketFragment(var menuOrigin: String) :
binding.splashProgress.visibility = View.VISIBLE binding.splashProgress.visibility = View.VISIBLE
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
sectorFk = getData(SECTORFK), sectorFk = getDataInt(SECTORFK),
collectionFk = binding.scanInput.text.toString().toInt(), collectionFk = binding.scanInput.text.toString().toInt(),
print="0",
type = type type = type
) )

4
app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketViewModel.kt
View File

@ -27,8 +27,8 @@ class ShowTicketViewModel(context: Context) : BaseViewModel(context) {
val responseTicket: LiveData<ResponseItemVO> val responseTicket: LiveData<ResponseItemVO>
get() = _responseTicket get() = _responseTicket
fun collectionTicketGet(collectionFk:Int,sectorFk:String,type:String){ fun collectionTicketGet(collectionFk:Int,sectorFk:Int,print:String,type:String){
silex.collection_getTickets(collectionFk,sectorFk,"0",type).enqueue(object : silex.collection_getTickets(collectionFk,sectorFk,print,type).enqueue(object :
Callback<CollectionVO> { Callback<CollectionVO> {
override fun onFailure(call: Call<CollectionVO>, t: Throwable) { override fun onFailure(call: Call<CollectionVO>, t: Throwable) {
_collectionTicketList.value = CollectionVO(0,isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!)) _collectionTicketList.value = CollectionVO(0,isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))

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

@ -75,7 +75,7 @@ class AutomaticAddItemFragment(
if (!binding.editMatricula.text.toString().isNullOrEmpty()) { if (!binding.editMatricula.text.toString().isNullOrEmpty()) {
contador += 1 contador += 1
setSubtitle() setSubtitle()
listItems.add(0, ItemEscanerVO(binding.editMatricula.text.toString())) listItems.add(0, ItemEscanerVO(binding.editMatricula.text.toString().toInt()))
adapter!!.notifyDataSetChanged() adapter!!.notifyDataSetChanged()
} }
binding.editMatricula.setText("") binding.editMatricula.setText("")
@ -90,10 +90,9 @@ class AutomaticAddItemFragment(
val listString: ArrayList<String> = ArrayList() val listString: ArrayList<String> = ArrayList()
val listInt: ArrayList<Int> = ArrayList() val listInt: ArrayList<Int> = ArrayList()
listItems.forEach { listItems.forEach {
listString.add(it.item) //listString.add(it.item)
listInt.add(it.item.toInt()) listInt.add(it.item)
} }
listItems = ArrayList()
binding.splashProgress.visibility = View.VISIBLE binding.splashProgress.visibility = View.VISIBLE
if (binding.mainToolbar.toolbarTitle.text.equals(getString(R.string.titleChecker))) { if (binding.mainToolbar.toolbarTitle.text.equals(getString(R.string.titleChecker))) {

2
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt
View File

@ -20,7 +20,7 @@ class ItemUbicadorVO(
) )
class ItemEscanerVO( class ItemEscanerVO(
var item: String = "" var item: Int
) )
class ItemUbicadorListVO( class ItemUbicadorListVO(

4
app/src/main/res/layout/item_article_row_fragment.xml
View File

@ -227,7 +227,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_min" android:layout_marginEnd="@dimen/layout_margin_min"
android:text="@{sale.pickedQuantity}" android:text="@{Integer.toString(sale.pickedQuantity)}"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body1" android:textSize="@dimen/body1"
android:textStyle="bold" android:textStyle="bold"
@ -330,7 +330,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_min" android:layout_marginEnd="@dimen/layout_margin_min"
android:text="@{sale.pickedQuantity}" android:text="@{Integer.toString(sale.pickedQuantity)}"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body3" android:textSize="@dimen/body3"
android:textStyle="bold" android:textStyle="bold"

4
app/src/main/res/layout/item_article_row_presacador.xml
View File

@ -152,7 +152,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_margin_min" android:layout_marginStart="@dimen/layout_margin_min"
android:layout_marginEnd="@dimen/layout_margin_min" android:layout_marginEnd="@dimen/layout_margin_min"
android:text="@{Long.toString(sale.itemFk)}" android:text="@{Integer.toString(sale.itemFk)}"
tool:text="85478" tool:text="85478"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/h6" android:textSize="@dimen/h6"
@ -167,7 +167,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_min" android:layout_marginEnd="@dimen/layout_margin_min"
android:text="@{sale.pickedQuantity}" android:text="@{Integer.toString(sale.pickedQuantity)}"
tool:text="0" tool:text="0"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/h6" android:textSize="@dimen/h6"

2
app/src/main/res/layout/item_escaner_row.xml
View File

@ -39,7 +39,7 @@
android:layout_weight="1" android:layout_weight="1"
android:textSize="@dimen/h5" android:textSize="@dimen/h5"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:text="@{item.item}" android:text="@{Integer.toString(item.item)}"
tool:text="45532" tool:text="45532"
android:textStyle="bold" android:textStyle="bold"
android:gravity="center_vertical"/> android:gravity="center_vertical"/>

1
app/src/main/res/values-es/strings.xml
View File

@ -525,5 +525,6 @@
<string name="scanValues">Escanea los valores:</string> <string name="scanValues">Escanea los valores:</string>
<string name="selectLabeltoPrint">Selecciona etiqueta a imprimir</string> <string name="selectLabeltoPrint">Selecciona etiqueta a imprimir</string>
<string name="formatError">Formato expedición no válido</string> <string name="formatError">Formato expedición no válido</string>
<string name="errorQuantity">Inserta la cantidad correctamente</string>
</resources> </resources>

2
app/src/main/res/values/strings.xml
View File

@ -523,6 +523,6 @@
<string name="titleChecker">Check items</string> <string name="titleChecker">Check items</string>
<string name="selectLabeltoPrint">Select label to print</string> <string name="selectLabeltoPrint">Select label to print</string>
<string name="formatError">Expedition format no valid</string> <string name="formatError">Expedition format no valid</string>
<string name="errorQuantity">Insert the amount correctly</string>
</resources> </resources>