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

feat reservas #refs 6861

This commit is contained in:
Sergio De la torre 2024-07-10 07:35:56 +02:00
parent 7ba19ba370
commit bac377d47f
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -646,7 +646,7 @@ interface SalixService {
@Query("schema") schema: String = "vn" @Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/itemShelvingTransfer/execute-proc") @POST("Applications/itemShelving_transfer/execute-proc")
fun itemShelvingTransfer( fun itemShelvingTransfer(
@Query("params") params: Any, @Query("params") params: Any,
@Query("schema") schema: String = "vn" @Query("schema") schema: String = "vn"
@ -683,7 +683,7 @@ interface SalixService {
): Call<List<ItemShelvingLog>> ): Call<List<ItemShelvingLog>>
//Tarea 7168 //Tarea 7168
@GET("Applications/itemShelvingLogs") @GET("ItemShelvingLogs")
fun itemShelvingLogGet( fun itemShelvingLogGet(
@Query("filter") filter: String, @Query("filter") filter: String,
): Call<List<ItemShelvingLog>> ): Call<List<ItemShelvingLog>>

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

@ -116,9 +116,8 @@ class CollectionFragmentPickerPreviousNew(
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)
viewModel.collectionTicketGetSalix( println("create onRunning")
collection.collectionFk, print = false
)
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
} }
@ -137,6 +136,9 @@ class CollectionFragmentPickerPreviousNew(
setEvents() setEvents()
setToolBar() setToolBar()
viewModel.collectionTicketGetSalix(
collection.collectionFk, print = false
)
super.init() super.init()
} }
@ -406,15 +408,15 @@ class CollectionFragmentPickerPreviousNew(
) )
setTotalLines() setTotalLines()
} }
if (!it.isError) { else{
myGroupList[positionConfirm].isPicked = 1 myGroupList[positionConfirm].isPicked = 1
saleAdapter!!.notifyItemChanged(positionConfirm) saleAdapter!!.notifyItemChanged(positionConfirm)
lm!!.scrollToPositionWithOffset(storedBackPosition + 1, 0) lm!!.scrollToPositionWithOffset(storedBackPosition + 1, 0)
setTotalLines() setTotalLines()
/*viewModel.collectionTicketGetSalix( viewModel.collectionTicketGetSalix(
collection.collectionFk, print = false collection.collectionFk, print = false
)*/ )
} }
} }
@ -433,7 +435,8 @@ class CollectionFragmentPickerPreviousNew(
"Confirmada acción", it.isError, !it.isError "Confirmada acción", it.isError, !it.isError
) )
} }
responseItemShelvingSaleUnPicked.observe(viewLifecycleOwner) { loadUnpicked.observe(viewLifecycleOwner) { event ->
event.getContentIfNotHandled().notNull {
myGroupList[positionUnmarked].isPicked = 1 myGroupList[positionUnmarked].isPicked = 1
myGroupList[positionUnmarked].reservedQuantity = quantityConfirm myGroupList[positionUnmarked].reservedQuantity = quantityConfirm
@ -444,7 +447,7 @@ class CollectionFragmentPickerPreviousNew(
//saleAdapter!!.notifyDataSetChanged() //saleAdapter!!.notifyDataSetChanged()
ma.messageWithSound( ma.messageWithSound(
"Confirmada acción", it.isError, !it.isError "Confirmada acción", it.isError, !it.isError
) )}
} }
responseItemShelvingSaleGroup.observe(viewLifecycleOwner) { responseItemShelvingSaleGroup.observe(viewLifecycleOwner) {

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

@ -108,6 +108,9 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
val responseItemShelvingSaleUnPicked: LiveData<ResponseItemVO> val responseItemShelvingSaleUnPicked: LiveData<ResponseItemVO>
get() = _responseItemShelvingSaleUnPicked get() = _responseItemShelvingSaleUnPicked
val loadUnpicked: LiveData<Event<ResponseItemVO>> =
_responseItemShelvingSaleUnPicked.map { Event(it) }
private val _responseCollectionAddItem by lazy { MutableLiveData<ResponseItemVO>() } private val _responseCollectionAddItem by lazy { MutableLiveData<ResponseItemVO>() }
val responseCollectionAddItem: LiveData<ResponseItemVO> val responseCollectionAddItem: LiveData<ResponseItemVO>
get() = _responseCollectionAddItem get() = _responseCollectionAddItem
@ -435,6 +438,7 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
} else { } else {
_responseConfirmReservedItemShelvingSale.value = _responseConfirmReservedItemShelvingSale.value =
ResponseItemVO(isError = false, response = "") ResponseItemVO(isError = false, response = "")
} }
} }
}) })

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

@ -54,7 +54,7 @@ class SectorCollectionReserveFragment(
} }
override fun onPause() { override fun onPause() {
onBack = true // onBack = true
super.onPause() super.onPause()
} }
@ -67,7 +67,8 @@ class SectorCollectionReserveFragment(
setToolBar() setToolBar()
println("reserve collec $collectionFk") println("reserve collec $collectionFk")
super.init() println("reserve collec onBack$onBack")
if (!onBack) { if (!onBack) {
println("check parkings $collectionFk") println("check parkings $collectionFk")
checkParkingsToPicker() checkParkingsToPicker()
@ -81,6 +82,7 @@ class SectorCollectionReserveFragment(
) )
} }
} }
super.init()
} }
private fun checkParkingsToPicker() { private fun checkParkingsToPicker() {