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

Version 23.2Beta en scaleFusion, solucionado doble impresión y Revisar en Controladores

This commit is contained in:
Sergio De la torre 2023-01-11 09:04:52 +01:00
parent 7dfc775299
commit d28ee67bc2
8 changed files with 22 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.idea/deploymentTargetDropDown.xml
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="10.2.3.104:5555" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-01-09T10:47:43.791932400Z" />
</component>
</project>

22
.idea/workspace.xml
View File

@ -83,25 +83,15 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.7.2Beta solucionado tema Ubicador">
<change afterPath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" afterDir="false" />
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.2Beta en scaleFusion">
<change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/Extensions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/Extensions.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/view/feature/ajustes/fragment/AjustesViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.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/controlvehiculo/fragment/ControlVehiculoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragmentViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragmentViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -112,7 +102,7 @@
<component name="CodeInsightWorkspaceSettings">
<option name="optimizeImportsOnTheFly" value="true" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[10.2.3.104:5555]" />
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
<component name="ExportToHTMLSettings">
<option name="OPEN_IN_BROWSER" value="true" />
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@ -278,7 +268,7 @@
<property name="project.structure.side.proportion" value="0.2" />
<property name="recommended.upgrade.last.time.stamp" value="1641190974236" />
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.gradle" />
<property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
</component>
<component name="PsdUISettings">
<option name="MODULE_TAB" value="Default Config" />

3
app/build.gradle
View File

@ -13,8 +13,9 @@ android {
applicationId "es.verdnatura"
minSdkVersion 24 //21
targetSdkVersion 30
versionCode 151
versionCode 152
//versionName = "9.8Beta" version 148
//versionName = "23.2Beta" 150
versionName = "23.2Beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

2
app/release/output-metadata.json
View File

@ -11,7 +11,7 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 151,
"versionCode": 152,
"versionName": "23.2Beta",
"outputFile": "app-release.apk"
}

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

@ -246,7 +246,7 @@ interface VerdnaturaService {
fun collection_getUncheckedTicket(
@Body vararg params: Any
):
Call<Any>
Call<String>
//sergio: de momento se separa para ir viendo como funciona. El precontrol llamara a collectionTicketGet con otro parametro.
@POST("almacennew/collection_getTickets")//REVISADA
@ -292,7 +292,7 @@ interface VerdnaturaService {
):
Call<Any>
@POST("almacennew/collectionStickerPrint")//REVISADA
@POST("almacennew/collection_printSticker")//REVISADA
fun collectionStickerPrint(
@Body vararg params: Any?
):

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

@ -2471,9 +2471,8 @@ class CollectionFragment(
//tarea#4672
var isTicket = false
/* for (t in collection.tickets) {
if (!t.ticketFk.equals(collection.collectionFk)) {
isTicket = false
break
if (t.ticketFk.toInt()==(collection.collectionFk)) {
isTicket = true
}
}*/
if (isTicket) {
@ -2481,12 +2480,11 @@ class CollectionFragment(
builder.setTitle(getString(R.string.selectLabeltoPrint))
val labelCount = arrayOf("1", "2", "3", "4", "5", "6", "7", "8", "9", "10")
builder.setItems(labelCount) { dialog, which ->
d("VERDNATURA::", "EL ELEGIDO ES" + which)
viewModel.collectionStickerPrint(
collectionFk = collection.collectionFk,
labelCount = (which + 1)
)
(getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
}
val dialog = builder.create()
dialog.show()
@ -2494,11 +2492,9 @@ class CollectionFragment(
viewModel.collectionStickerPrint(
collectionFk = collection.collectionFk,
null
)
(getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
}
(getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
}

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

@ -923,7 +923,7 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
silex.collection_getUncheckedTicket(
collectionFk
).enqueue(object :
SilexCallback<Any>(context) {
SilexCallback<String>(context) {
override fun onError(t: Throwable) {
_responseCollectionUnchecked.value = ResponseItemVO(
isError = true,
@ -931,12 +931,12 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
)
}
override fun onSuccess(response: Response<Any>) {
override fun onSuccess(response: Response<String>) {
if (response.body() != null) {
_responseCollectionUnchecked.value = ResponseItemVO(
isError = false,
response = response.body()!!.toString(),
response = response.body()!!,
errorMessage = ""
)
} else {

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

@ -139,9 +139,8 @@ class CollectionShowTicketFragment(
//tarea#4672
var isTicket = false
/* for (t in collection.tickets) {
if (!t.ticketFk.equals(collection.collectionFk)) {
isTicket = false
break
if (t.ticketFk.toInt()==(collection.collectionFk)) {
isTicket = true
}
}*/
if (isTicket){
@ -153,34 +152,20 @@ class CollectionShowTicketFragment(
collectionFk = collection.collectionFk,
labelCount = (which+1)
)
(getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
}
val dialog = builder.create()
dialog.show()
}else{
/* viewModel.collectionStickerPrint(
viewModel.collectionStickerPrint(
collectionFk = collection.collectionFk,
labelCount = null
)
(getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())*/
}
if (ma.havePrinter() && ma.haveSector()) {
viewModel.collectionStickerPrint(
collectionFk = collection.collectionFk,
labelCount = getDataInt(SECTORFK)
)
(getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
}else{
ma.messageWithSound(getString(R.string.printerFault),isError = true,true,getString(R.string.error),false)
}
(getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
}
private fun setEvents() {