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

itemStockUpdate

This commit is contained in:
Enrique Blasco 2020-05-14 10:28:40 +02:00
parent d4819c4e08
commit 1ee28e3dbe
12 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -12,8 +12,8 @@ android {
applicationId "es.verdnatura"
minSdkVersion 21
targetSdkVersion 29
versionCode 1
versionName "5.0"
versionCode 2
versionName "5.0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

BIN
app/release/newapp.apk
View File

Binary file not shown.

2
app/src/main/java/es/verdnatura/domain/GetAjustesUserCase.kt
View File

@ -6,7 +6,7 @@ import retrofit2.Call
class GetAjustesUserCase : RestClient() {
fun getSectors(usuario:String,password:String) : Call<List<SectorItemVO>> {
return restClient!!.getSectors("json","1",usuario,password,"application/json")!!
return restClient!!.getSectors("json","1",usuario,password,"application/json")
}

2
app/src/main/java/es/verdnatura/domain/GetBuscarItemUserCase.kt
View File

@ -8,7 +8,7 @@ class GetBuscarItemUserCase : RestClient() {
fun searchItemsUbicador(usuario:String,password:String,itemFk:String) : Call<List<ItemLocationVO>> {
val params:ArrayList<String> = ArrayList();
params.add(itemFk)
return restClient!!.searchItemsUbicador("json","1",usuario,password,"application/json",params = params)!!
return restClient!!.searchItemsUbicador("json","1",usuario,password,"application/json",params = params)
}
}

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

@ -9,20 +9,20 @@ class GetInventaryUserCase : RestClient() {
fun itemShelvingRadar(usuario:String,password:String,sectorFk:String) : Call<List<ItemInventaryVO>> {
val params:ArrayList<String> = ArrayList();
params.add(sectorFk)
return restClient!!.itemShelvingRadar("json","1",usuario,password,"application/json",params = params)!!
return restClient!!.itemShelvingRadar("json","1",usuario,password,"application/json",params = params)
}
fun faultsReview(usuario:String,password:String,warehouseFk:String) : Call<List<ItemFaltasVO>> {
val params:ArrayList<String> = ArrayList();
params.add(warehouseFk)
return restClient!!.faultsReview("json","1",usuario,password,"application/json",params = params)!!
return restClient!!.faultsReview("json","1",usuario,password,"application/json",params = params)
}
fun faultsReview_isChecked(usuario:String,password:String,itemFk:String,warehouseFk:String) : Call<String> {
val params:ArrayList<String> = ArrayList();
params.add(itemFk)
params.add(warehouseFk)
return restClient!!.faultsReview_isChecked("json","1",usuario,password,"application/json",params = params)!!
return restClient!!.faultsReview_isChecked("json","1",usuario,password,"application/json",params = params)
}
}

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

@ -9,7 +9,7 @@ class GetItemCardUserCase : RestClient() {
val params:ArrayList<String> = ArrayList();
params.add(itemFk)
params.add(warehouseFk)
return restClient!!.getItemCard("json","1",usuario,password,"application/json",params = params)!!
return restClient!!.getItemCard("json","1",usuario,password,"application/json",params = params)
}
@ -19,7 +19,7 @@ class GetItemCardUserCase : RestClient() {
params.add(warehouseFk)
params.add(newVisible)
params.add(isTrash)
return restClient!!.itemStockUpdate("json","1",usuario,password,"application/json",params = params)!!
return restClient!!.itemStockUpdate("json","1",usuario,password,"application/json",params = params)
}
fun itemPlacementSave(usuario:String,password:String,itemFk:String,warehouseFk:String,value:String ) : Call<String> {
@ -27,7 +27,7 @@ class GetItemCardUserCase : RestClient() {
params.add(itemFk)
params.add(warehouseFk)
params.add(value)
return restClient!!.itemPlacementSave("json","1",usuario,password,"application/json",params = params)!!
return restClient!!.itemPlacementSave("json","1",usuario,password,"application/json",params = params)
}
fun updateGrouping(usuario:String,password:String,itemFk:String,value:String ,warehouseFk:String) : Call<String> {
@ -35,7 +35,7 @@ class GetItemCardUserCase : RestClient() {
params.add(itemFk)
params.add(value)
params.add(warehouseFk)
return restClient!!.updateGrouping("json","1",usuario,password,"application/json",params = params)!!
return restClient!!.updateGrouping("json","1",usuario,password,"application/json",params = params)
}
fun updatePacking(usuario:String,password:String,itemFk:String,value:String ,warehouseFk:String) : Call<String> {
@ -43,14 +43,14 @@ class GetItemCardUserCase : RestClient() {
params.add(itemFk)
params.add(value)
params.add(warehouseFk)
return restClient!!.updatePacking("json","1",usuario,password,"application/json",params = params)!!
return restClient!!.updatePacking("json","1",usuario,password,"application/json",params = params)
}
fun itemSaveMin(usuario:String,password:String,itemFk:String,value:String) : Call<String> {
val params:ArrayList<String> = ArrayList();
params.add(itemFk)
params.add(value)
return restClient!!.itemSaveMin("json","1",usuario,password,"application/json",params = params)!!
return restClient!!.itemSaveMin("json","1",usuario,password,"application/json",params = params)
}
fun barcodes_edit(usuario:String,password:String,itemFk:String,value:String, delete:String) : Call<String> {
@ -58,6 +58,6 @@ class GetItemCardUserCase : RestClient() {
params.add(value)
params.add(itemFk)
params.add(delete)
return restClient!!.barcodes_edit("json","1",usuario,password,"application/json",params = params)!!
return restClient!!.barcodes_edit("json","1",usuario,password,"application/json",params = params)
}
}

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

@ -9,18 +9,18 @@ class GetLoginUserCase() : RestClient() {
val params:ArrayList<String> = ArrayList();
params.add(usuario)
params.add(password)
return restClient!!.login("json","1",usuario,password,"application/json",params)!!
return restClient!!.login("json","1",usuario,password,"application/json",params)
}
fun salixLogin(usuario:String,password:String) : Call<LoginSalixVO>{
return salixClient!!.login("application/json", LoginSalixVO(usuario,password))!!
return salixClient!!.login("application/json", LoginSalixVO(usuario,password))
}
fun checkVersion(usuario:String,password:String,version:String) : Call<Boolean> {
val params:ArrayList<String> = ArrayList();
params.add(version)
return restClient!!.version("json","1",usuario,password,"application/json",params)!!
return restClient!!.version("json","1",usuario,password,"application/json",params)
}
}

2
app/src/main/java/es/verdnatura/domain/GetShelvingParkingUserCase.kt
View File

@ -10,7 +10,7 @@ class GetShelvingParkingUserCase : RestClient() {
params.add(vShelvingFk)
params.add(vWarehouseFk)
params.add(vDayRange)
return restClient!!.shelvingParking_get("json","1",usuario,password,"application/json",params)!!
return restClient!!.shelvingParking_get("json","1",usuario,password,"application/json",params)
}
}

16
app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt
View File

@ -8,7 +8,7 @@ class GetUbicadorUserCase : RestClient() {
fun itemShelvingList(usuario:String,password:String,vShelvingFk:String) : Call<List<ItemUbicadorVO>> {
val params:ArrayList<String> = ArrayList();
params.add(vShelvingFk)
return restClient!!.itemShelvingList("json","1",usuario,password,"application/json",params)!!
return restClient!!.itemShelvingList("json","1",usuario,password,"application/json",params)
}
fun itemShelvingMake(usuario:String,password:String,shelving:String,item:String,deep:String,quantity:String,packing:String,warehouse:String,level:String) : Call<String> {
@ -20,7 +20,7 @@ class GetUbicadorUserCase : RestClient() {
params.add(packing)
params.add(warehouse)
params.add(level)
return restClient!!.itemShelvingMake("json","1",usuario,password,"application/json",params)!!
return restClient!!.itemShelvingMake("json","1",usuario,password,"application/json",params)
}
fun itemShelvingMake_multi(usuario:String,password:String,shelving:String,items:List<String>,deep:String,warehouse:String,level:String) : Call<String> {
@ -30,40 +30,40 @@ class GetUbicadorUserCase : RestClient() {
params.add(deep)
params.add(warehouse)
params.add(level)
return restClient!!.itemShelvingMake_multi("json","1",usuario,password,"application/json",params)!!
return restClient!!.itemShelvingMake_multi("json","1",usuario,password,"application/json",params)
}
fun shelvingPark(usuario:String,password:String,shelving:String,parking:String) : Call<String> {
val params:ArrayList<String> = ArrayList();
params.add(shelving)
params.add(parking)
return restClient!!.shelvingPark("json","1",usuario,password,"application/json",params)!!
return restClient!!.shelvingPark("json","1",usuario,password,"application/json",params)
}
fun shelvingChange(usuario:String,password:String,origen:String,destino:String) : Call<String> {
val params:ArrayList<String> = ArrayList();
params.add(origen)
params.add(destino)
return restClient!!.shelvingChange("json","1",usuario,password,"application/json",params)!!
return restClient!!.shelvingChange("json","1",usuario,password,"application/json",params)
}
fun clearShelvingList(usuario:String,password:String,shelvingFk:String) : Call<String> {
val params:ArrayList<String> = ArrayList();
params.add(shelvingFk)
return restClient!!.clearShelvingList("json","1",usuario,password,"application/json",params)!!
return restClient!!.clearShelvingList("json","1",usuario,password,"application/json",params)
}
fun itemShelvingTransfer(usuario:String,password:String,itemFk:String,shelvingFk:String) : Call<String> {
val params:ArrayList<String> = ArrayList();
params.add(itemFk)
params.add(shelvingFk)
return restClient!!.itemShelvingTransfer("json","1",usuario,password,"application/json",params)!!
return restClient!!.itemShelvingTransfer("json","1",usuario,password,"application/json",params)
}
fun itemShelvingDelete(usuario:String,password:String,itemFk:String) : Call<String> {
val params:ArrayList<String> = ArrayList();
params.add(itemFk)
return restClient!!.itemShelvingDelete("json","1",usuario,password,"application/json",params)!!
return restClient!!.itemShelvingDelete("json","1",usuario,password,"application/json",params)
}
}

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

@ -60,7 +60,7 @@ interface VerdnaturaService {
@Body params: List<String>):
Call<ItemCardVO>
@POST("almacennew/item_Stock_Update")
@POST("almacennew/itemStockUpdate")
fun itemStockUpdate(@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,

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

@ -28,6 +28,7 @@ import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO
import es.verdnatura.presentation.view.feature.imageview.activity.ImageViewActivity
import es.verdnatura.presentation.view.feature.inventario.adapter.ToolBarAdapter
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.fragment_item_card.*
import kotlinx.android.synthetic.main.toolbar.*
@ -177,8 +178,9 @@ class ItemCardFragment(
//EDITABLES
listItemsRow.add(ItemCardRowVO(title = "SIN UBICAR",value = itemInfo.enNicho,isEditable = true, action = "itemStockUpdate"))
listItemsRow.add(ItemCardRowVO(title = "NICHO",value = itemInfo.nicho,isEditable = true, action = "itemPlacementSave"))
listItemsRow.add(ItemCardRowVO(title = "RESERVA",value = itemInfo.reserva,isEditable = true, action = "itemPlacementSave"))
listItemsRow.add(ItemCardRowVO(title = "BUSCAR ITEM",value = "",isEditable = true, action = "buscarItem"))
//listItemsRow.add(ItemCardRowVO(title = "NICHO",value = itemInfo.nicho,isEditable = true, action = "itemPlacementSave"))
// listItemsRow.add(ItemCardRowVO(title = "RESERVA",value = itemInfo.reserva,isEditable = true, action = "itemPlacementSave"))
listItemsRow.add(ItemCardRowVO(title = "GROUPING",value = itemInfo.grouping,isEditable = true, action = "updateGrouping"))
listItemsRow.add(ItemCardRowVO(title = "PACKING",value = itemInfo.packing,isEditable = true, action = "updatePacking"))
listItemsRow.add(ItemCardRowVO(title = "MINIMO",value = itemInfo.min,isEditable = true, action = "itemSaveMin"))
@ -189,7 +191,7 @@ class ItemCardFragment(
override fun onItemCardRowClickListener(item: ItemCardRowVO) {
if(item.action != "toBarcode"){
if(item.action != "toBarcode" && item.action != "buscarItem"){
customDialogInput.setTitle(item.title!!).setDescription("Valor actual: "+item.value!!).setOkButton("Guardar"){
(activity as MainActivity).hideKeyboard(customDialogInput.getEditText())
editItemCardRow(item,customDialogInput.getValue())
@ -214,6 +216,8 @@ class ItemCardFragment(
}else if(item.action == "toBarcode"){
//BARCODE ROW
prepareBarcodeDialog(item)
}else if(item.action == "buscarItem"){
(activity as MainActivity).onPasillerosItemClickListener( PasillerosItemVO(title = "Buscar item"),itemFk)
}
}
@ -238,6 +242,7 @@ class ItemCardFragment(
"updateGrouping" -> viewModel.updateGrouping(itemFk = itemFk, user = user, password = password, value = value,warehouseFk = warehouseFk)
"updatePacking" -> viewModel.updatePacking(itemFk = itemFk, user = user, password = password, value = value,warehouseFk = warehouseFk)
"itemSaveMin" -> viewModel.itemSaveMin(itemFk = itemFk, user = user, password = password, value = value)
}
if(item.action != "itemStockUpdate")
changeOfflineValue(item,value, listBarcodes)

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

@ -18,18 +18,17 @@ class PasilleroViewModel : BaseViewModel() {
"Consultar artículo")
)
_pasillerositem.add(
PasillerosItemVO(1,
R.drawable.ic_dashboard_black_24dp,
"Ubicador")
)
_pasillerositem.add(
PasillerosItemVO(2,
R.drawable.ic_visibility_black_24dp,
"Buscar item")
)
_pasillerositem.add(
PasillerosItemVO(1,
R.drawable.ic_dashboard_black_24dp,
"Ubicador")
)
_pasillerositem.add(
PasillerosItemVO(3,