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

feat: refs #7920 shelvingFkMerge

This commit is contained in:
Sergio De la torre 2025-02-14 12:15:06 +01:00
parent 2295497e62
commit 6233545418
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/es/verdnatura/dataStore/DataStoreLocal.kt
View File

@ -17,7 +17,9 @@ import es.verdnatura.domain.ConstAndValues.BASEURLLILIUM
import es.verdnatura.domain.ConstAndValues.BASEURLSALIX import es.verdnatura.domain.ConstAndValues.BASEURLSALIX
import es.verdnatura.domain.ConstAndValues.BASE_URL_LILIUM import es.verdnatura.domain.ConstAndValues.BASE_URL_LILIUM
import es.verdnatura.domain.ConstAndValues.BASE_URL_SALIX import es.verdnatura.domain.ConstAndValues.BASE_URL_SALIX
import es.verdnatura.domain.ConstAndValues.COMPANYFK
import es.verdnatura.domain.ConstAndValues.ENTRYID import es.verdnatura.domain.ConstAndValues.ENTRYID
import es.verdnatura.domain.ConstAndValues.ENTRYNUMBERIMAGES
import es.verdnatura.domain.ConstAndValues.ENTRYOBSERVATIONORIGINAL import es.verdnatura.domain.ConstAndValues.ENTRYOBSERVATIONORIGINAL
import es.verdnatura.domain.ConstAndValues.ENTRYOBSERVATIONS import es.verdnatura.domain.ConstAndValues.ENTRYOBSERVATIONS
import es.verdnatura.domain.ConstAndValues.ITEMPACKING import es.verdnatura.domain.ConstAndValues.ITEMPACKING
@ -261,11 +263,13 @@ class DataStoreLocal(var mobileApplication: MobileApplication) {
} }
suspend fun deleteEntryPackaging() { suspend fun deleteEntryPackaging() {
mobileApplication.dataStoreApp.editDataStoreKey(ENTRYID, "") mobileApplication.dataStoreApp.editDataStoreKey(ENTRYID, -1)
mobileApplication.dataStoreApp.editDataStoreKey(SUPPLIERID, "") mobileApplication.dataStoreApp.editDataStoreKey(SUPPLIERID, -1)
mobileApplication.dataStoreApp.editDataStoreKey(SUPPLIERNAME, "") mobileApplication.dataStoreApp.editDataStoreKey(SUPPLIERNAME, "")
mobileApplication.dataStoreApp.editDataStoreKey(ENTRYOBSERVATIONORIGINAL, "") mobileApplication.dataStoreApp.editDataStoreKey(ENTRYOBSERVATIONORIGINAL, "")
mobileApplication.dataStoreApp.editDataStoreKey(ENTRYOBSERVATIONS, "") mobileApplication.dataStoreApp.editDataStoreKey(ENTRYOBSERVATIONS, "")
mobileApplication.dataStoreApp.editDataStoreKey(ENTRYNUMBERIMAGES, 0)
mobileApplication.dataStoreApp.editDataStoreKey(COMPANYFK, -1)
} }

9
app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt
View File

@ -9,7 +9,7 @@ data class EntrySalix(
var created: String? = null, var created: String? = null,
var supplierFk: Number? = null, var supplierFk: Number? = null,
var travelFk: Number? = null, var travelFk: Number? = null,
var companyFk: Number? = null, var companyFk: Number,
var observation: String? = null, var observation: String? = null,
var travel: TravelSalix? = null, var travel: TravelSalix? = null,
var isError: Boolean = false, var isError: Boolean = false,
@ -29,7 +29,8 @@ fun List<EntrySalix>.toDateFormat(): ArrayList<EntrySalix> {
entries.add( entries.add(
EntrySalix( EntrySalix(
dated = convertToDateString(it.dated), dated = convertToDateString(it.dated),
created = convertToDateString(it.created) created = convertToDateString(it.created),
companyFk = it.companyFk
) )
) )
@ -46,3 +47,7 @@ data class NotificationQueue(
val authorFk: Int, val authorFk: Int,
val params: String val params: String
) )
data class DmsType(
val id: Int
)