From e4750fc92a785955cdc87c2fae64e8c0a90ef75a Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Wed, 2 Nov 2022 11:37:55 +0100 Subject: [PATCH] =?UTF-8?q?Version=209.4Beta=20Cmr,=20Control=20ubicaci?= =?UTF-8?q?=C3=B3n,=20volver=20atr=C3=A1s=20de=20Controlador,=20bot=C3=B3n?= =?UTF-8?q?=20llamadas,=20volver=20pantalla=20anterior=20parking,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/assetWizardSettings.xml | 37 + .idea/deploymentTargetDropDown.xml | 17 - .idea/misc.xml | 12 +- .idea/modules/app/Gestor_Almacén.app.iml | 40 + .idea/modules/vn-warehouseManager.iml | 8 + .idea/navEditor.xml | 43 + .idea/vn-warehouseManager.iml | 9 + .idea/workspace.xml | 982 ++++++++++++++++++ app/release/output-metadata.json | 4 +- app/release/vn-picking.apk | Bin 6682087 -> 0 bytes .../java/es/verdnatura/di/viewModelModule.kt | 10 +- .../es/verdnatura/domain/GetLoginUserCase.kt | 2 +- .../verdnatura/domain/GetPackagingUserCase.kt | 59 ++ .../domain/GetPaletizadoresUserCase.kt | 6 +- .../domain/GetSacadorControladorUserCase.kt | 3 +- .../verdnatura/domain/GetUbicadorUserCase.kt | 8 +- .../java/es/verdnatura/domain/SalixService.kt | 66 +- .../es/verdnatura/domain/VerdnaturaService.kt | 15 +- .../domain/itemShelvingLogUSerCase.kt | 3 + .../presentation/base/BaseFragment.kt | 34 +- .../presentation/common/UICallbacks.kt | 10 + .../presentation/common/itemScanned.kt | 5 +- .../component/CustomDialogInputTwoValues.kt | 6 + .../feature/collection/adapter/SaleAdapter.kt | 1 + .../collection/fragment/CollectionFragment.kt | 102 +- .../fragment/CollectionViewModel.kt | 7 +- .../ControlVehiculoUsuarioFragment.kt | 7 +- .../adapter/ItemShelvingLogAdapter.kt | 23 +- .../fragment/ItemShelvingLogFragment.kt | 173 +-- .../inventario/fragment/InventaryFragment.kt | 4 +- .../inventario/fragment/SearchBuyerModel.kt | 21 +- .../feature/main/activity/MainActivity.kt | 21 +- .../packaging/adapter/ItemSupplierAdapter.kt | 59 ++ .../packaging/adapter/ListImageAdapter.kt | 56 + .../packaging/fragment/ObservFragment.kt | 175 ++++ .../fragment/PackagingCountFragment.kt | 149 +++ .../fragment/PackagingSummaryFragment.kt | 281 +++++ .../PackagingViewModel/SupplierViewModel.kt | 155 +++ .../packaging/fragment/SupplierFragment.kt | 153 +++ .../feature/packaging/model/EntrySalix.kt | 10 + .../view/feature/packaging/model/Supplier.kt | 31 + .../fragment/CmrExpeditionPalletFragment.kt | 291 +++--- .../fragment/CmrExpeditionPalletViewModel.kt | 2 +- .../fragment/PalletScanFragment.kt | 15 +- .../parking/fragment/ParkingFragment.kt | 4 + .../pasillero/fragment/PasilleroViewModel.kt | 16 +- .../presacador/fragment/EndSacadorFragment.kt | 3 +- .../fragment/PreSacadorViewModel.kt | 6 +- .../ubicador/adapter/UbicadorAdapter.kt | 63 +- .../ubicador/fragment/UbicadorFragment.kt | 194 ++-- .../ubicador/fragment/UbicadorViewModel.kt | 46 +- .../feature/ubicador/model/ItemUbicadorVO.kt | 4 +- .../fragment/WorkermistakeFragment.kt | 3 - app/src/main/res/drawable/.idea/drawable.iml | 9 + app/src/main/res/drawable/check.xml | 8 + app/src/main/res/drawable/ic_packaging.xml | 8 + ...omponent_custom_edit_dialog_two_values.xml | 4 +- .../main/res/layout/fragment_packaging.xml | 144 +++ .../res/layout/fragment_packaging_count.xml | 152 +++ .../res/layout/fragment_packaging_obs.xml | 105 ++ .../res/layout/fragment_packaging_summary.xml | 308 ++++++ .../res/layout/fragment_workermistake.xml | 29 +- .../res/layout/item_general_row_image.xml | 80 ++ app/src/main/res/layout/item_image_row.xml | 78 ++ .../main/res/layout/item_itemsupplier_row.xml | 103 ++ .../main/res/layout/item_ubication_row.xml | 1 + app/src/main/res/layout/toolbar_fragment.xml | 11 +- app/src/main/res/values-es/strings.xml | 22 +- app/src/main/res/values/colors.xml | 2 + app/src/main/res/values/dimens.xml | 2 + app/src/main/res/values/strings.xml | 22 +- app/src/main/res/values/styles.xml | 5 + local.properties | 8 + 73 files changed, 4026 insertions(+), 529 deletions(-) create mode 100644 .idea/assetWizardSettings.xml delete mode 100644 .idea/deploymentTargetDropDown.xml create mode 100644 .idea/modules/app/Gestor_Almacén.app.iml create mode 100644 .idea/modules/vn-warehouseManager.iml create mode 100644 .idea/navEditor.xml create mode 100644 .idea/vn-warehouseManager.iml create mode 100644 .idea/workspace.xml delete mode 100644 app/release/vn-picking.apk create mode 100644 app/src/main/java/es/verdnatura/domain/GetPackagingUserCase.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ItemSupplierAdapter.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/Supplier.kt create mode 100644 app/src/main/res/drawable/.idea/drawable.iml create mode 100644 app/src/main/res/drawable/check.xml create mode 100644 app/src/main/res/drawable/ic_packaging.xml create mode 100644 app/src/main/res/layout/fragment_packaging.xml create mode 100644 app/src/main/res/layout/fragment_packaging_count.xml create mode 100644 app/src/main/res/layout/fragment_packaging_obs.xml create mode 100644 app/src/main/res/layout/fragment_packaging_summary.xml create mode 100644 app/src/main/res/layout/item_general_row_image.xml create mode 100644 app/src/main/res/layout/item_image_row.xml create mode 100644 app/src/main/res/layout/item_itemsupplier_row.xml create mode 100644 local.properties diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml new file mode 100644 index 00000000..caa3055d --- /dev/null +++ b/.idea/assetWizardSettings.xml @@ -0,0 +1,37 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 6b176872..00000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 2d159958..f6be540e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -44,6 +44,7 @@ + @@ -103,6 +104,7 @@ + @@ -196,6 +198,11 @@ + + + + + @@ -217,7 +224,7 @@ - + @@ -232,10 +239,13 @@ + + + diff --git a/.idea/modules/app/Gestor_Almacén.app.iml b/.idea/modules/app/Gestor_Almacén.app.iml new file mode 100644 index 00000000..2acb6145 --- /dev/null +++ b/.idea/modules/app/Gestor_Almacén.app.iml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/vn-warehouseManager.iml b/.idea/modules/vn-warehouseManager.iml new file mode 100644 index 00000000..f4915405 --- /dev/null +++ b/.idea/modules/vn-warehouseManager.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml new file mode 100644 index 00000000..18b1af64 --- /dev/null +++ b/.idea/navEditor.xml @@ -0,0 +1,43 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vn-warehouseManager.iml b/.idea/vn-warehouseManager.iml new file mode 100644 index 00000000..d6ebd480 --- /dev/null +++ b/.idea/vn-warehouseManager.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..4b177804 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,982 @@ + + + + + + + + + + + + + + + + + + + + + es + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +