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

Merge branch 'Tarea3420-quantity_y_originalQuantity' into testWithout3420 

# Conflicts:
#	.idea/misc.xml
This commit is contained in:
Sergio De la torre 2022-10-07 06:54:06 +02:00
parent 6f7abca1b1 f058f239ab
commit da26cb6d08
14 changed files with 76 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt
View File

@ -35,5 +35,22 @@ class ApiSalixUtils {
val preferences = PreferenceManager.getDefaultSharedPreferences(context) val preferences = PreferenceManager.getDefaultSharedPreferences(context)
return preferences.getString(key, null) return preferences.getString(key, null)
} }
}
}
class ApiSalixUtilsSend {
companion object {
const val BASE_URL: String = "https://salix.verdnatura.es/api/"
fun getApiService(context: Context): SalixServiceSend {
val salixRetrofit = Retrofit.Builder().baseUrl(BASE_URL).addConverterFactory(
GsonConverterFactory.create()
).build()
//d("VERDNATURA::","El server Salix es "+getBaseUrlLocal(context = context))
return salixRetrofit.create(SalixServiceSend::class.java)
}
} }
} }

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

@ -79,7 +79,7 @@ class GetLoginUserCase(context: Context) : RestClient(context)
fun sendChekingPresence(token:String,workerId:Int,message:String) : Call<Boolean>{ fun sendChekingPresence(token:String,workerId:Int,message:String) : Call<Boolean>{
var working_in_test=false // Enviar a grupo test Android o a los usuarios var working_in_test=true // Enviar a grupo test Android o a los usuarios
if (!working_in_test) { if (!working_in_test) {
return salixClient!!.sendChekingPresence( return salixClient!!.sendChekingPresence(
@ -89,7 +89,7 @@ fun sendChekingPresence(token:String,workerId:Int,message:String) : Call<Boolean
) )
}else{ }else{
return salixClient!!.sendGroup( return salixClientSend!!.sendGroup(
content_type = "application/json", content_type = "application/json",
authorization = token, authorization = token,
params = SalixGrupo(to = "#android-test", message = message)) params = SalixGrupo(to = "#android-test", message = message))

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

@ -6,11 +6,13 @@ open class RestClient(context: Context) {
var restClient: VerdnaturaService? = null var restClient: VerdnaturaService? = null
var salixClient: SalixService? = null var salixClient: SalixService? = null
var nodejsClient: NodeJsService? = null var nodejsClient: NodeJsService? = null
var salixClientSend:SalixServiceSend?=null
init { init {
restClient = ApiUtils.getApiService(context) restClient = ApiUtils.getApiService(context)
salixClient = ApiSalixUtils.getApiService(context) salixClient = ApiSalixUtils.getApiService(context)
nodejsClient = ApiNodeJsUtils.getApiService() nodejsClient = ApiNodeJsUtils.getApiService()
salixClientSend = ApiSalixUtilsSend.getApiService(context)
} }
} }

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

@ -155,4 +155,15 @@ interface SalixService {
): ):
Call<List<ShelvingLogSalix>> Call<List<ShelvingLogSalix>>
}
interface SalixServiceSend {
@POST("chats/send")
fun sendGroup(
@Header("Content-Type") content_type: String,
@Header("Authorization") authorization: String,
@Body params: SalixGrupo
):
Call<Boolean>
} }

2
app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt
View File

@ -113,7 +113,7 @@ class SaleAdapter(
txtError.text = txtError.text =
binding.root.context.getString(R.string.originalQuantity) + sale.originalQuantity binding.root.context.getString(R.string.originalQuantity) + sale.originalQuantity
if (sale.isPrepared == "1" || sale.isControlled == "1") if (sale.isPrepared == "1" || sale.isControlled == "1")
sale.pickedQuantity = sale.quantity sale.pickedQuantity = sale.quantity.toString()
} }
if (sale.isNew) { if (sale.isNew) {

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

@ -74,14 +74,14 @@ class CollectionFragment(
private var mistakeSale: SaleVO? = null private var mistakeSale: SaleVO? = null
private var positionIncreaseQuantity = 0 private var positionIncreaseQuantity = 0
private var positionReject = 0 private var positionReject = 0
private var quantityIncrease = "" private var quantityIncrease:Int=0
private var quantityReject = "" private var quantityReject = ""
private var typeCollectionMissing = "" private var typeCollectionMissing = ""
private var positionCollectionMissing = 0 private var positionCollectionMissing = 0
private var quantityCollectionMissing = "" private var quantityCollectionMissing:Int=0
private var isMarking = false private var isMarking = false
private var positionCollectionSplit = 0 private var positionCollectionSplit = 0
private var quantityCollectionSplit = "" private var quantityCollectionSplit:Int=0
private lateinit var ticketToParking: String private lateinit var ticketToParking: String
private lateinit var ticketScanTxt: String private lateinit var ticketScanTxt: String
@ -933,7 +933,7 @@ class CollectionFragment(
private fun responseSaleMoveSuccesful() { private fun responseSaleMoveSuccesful() {
sales[positionCollectionSplit].quantity = quantityCollectionSplit sales[positionCollectionSplit].quantity = quantityCollectionSplit
if (quantityCollectionSplit == "0") if (quantityCollectionSplit == 0)
markLine(positionCollectionSplit, type) markLine(positionCollectionSplit, type)
saleAdapter!!.notifyDataSetChanged() saleAdapter!!.notifyDataSetChanged()
@ -1015,7 +1015,7 @@ class CollectionFragment(
var observations = "" var observations = ""
collection.tickets.forEach { ticket -> collection.tickets.forEach { ticket ->
ticket.sales.forEach { saleVO -> ticket.sales.forEach { saleVO ->
if (type == SACADOR && saleVO.quantity != "0") { if (type == SACADOR && saleVO.quantity != 0) {
salesList.add(saleVO) salesList.add(saleVO)
if (tickets.firstOrNull { it == saleVO.ticketFk }.isNullOrEmpty()) if (tickets.firstOrNull { it == saleVO.ticketFk }.isNullOrEmpty())
tickets.add(saleVO.ticketFk) tickets.add(saleVO.ticketFk)
@ -1409,7 +1409,7 @@ class CollectionFragment(
if (type == SACADOR) { if (type == SACADOR) {
sales[position].isPrepared = if (sales[position].isPrepared == "1") "0" else "1" sales[position].isPrepared = if (sales[position].isPrepared == "1") "0" else "1"
if (sales[position].isPrepared == "1") { if (sales[position].isPrepared == "1") {
sales[position].pickedQuantity = sales[position].quantity sales[position].pickedQuantity = sales[position].quantity.toString()
} }
} else if (type == CONTROLADOR) } else if (type == CONTROLADOR)
@ -1518,7 +1518,7 @@ class CollectionFragment(
getData(USER), getData(USER),
getData(PASSWORD), getData(PASSWORD),
sales[position].saleFk, sales[position].saleFk,
sales[position].quantity sales[position].quantity.toString()
) )
positionUnmarked = position positionUnmarked = position
@ -1550,7 +1550,7 @@ class CollectionFragment(
var quantityGet = "0" var quantityGet = "0"
try { try {
quantityGet = quantityGet =
(sales[position].quantity.toInt() - sales[position].pickedQuantity.toInt()).toString() (sales[position].quantity!!.toInt() - sales[position].pickedQuantity.toInt()).toString()
} catch (e: Exception) { } catch (e: Exception) {
} }
//Log.i("VERDNATURA:","Aparece para enviar") //Log.i("VERDNATURA:","Aparece para enviar")
@ -1613,7 +1613,7 @@ class CollectionFragment(
mpok?.start() mpok?.start()
ReviewQuantityForRefreshingAndSorting( ReviewQuantityForRefreshingAndSorting(
customDialogList.getValue().toInt(), customDialogList.getValue().toInt(),
sales[storedPosition].quantity.toInt(), sales[storedPosition].quantity!!.toInt(),
sales[storedPosition].pickedQuantity.toInt() sales[storedPosition].pickedQuantity.toInt()
) )
customDialogList.dismiss() customDialogList.dismiss()
@ -1692,7 +1692,7 @@ class CollectionFragment(
mpok?.start() mpok?.start()
ReviewQuantityForRefreshingAndSorting( ReviewQuantityForRefreshingAndSorting(
customDialogList.getValue().toInt(), customDialogList.getValue().toInt(),
sales[storedPosition].quantity.toInt(), sales[storedPosition].quantity!!.toInt(),
sales[storedPosition].pickedQuantity.toInt() sales[storedPosition].pickedQuantity.toInt()
) )
// SalesSorter(sales) // SalesSorter(sales)
@ -1855,7 +1855,7 @@ class CollectionFragment(
//Tarea #4371 //Tarea #4371
itemShelvingTracking_mark = itemShelvingFk itemShelvingTracking_mark = itemShelvingFk
if (sales[storedPosition].pickedQuantity != sales[storedPosition].quantity) { if (sales[storedPosition].pickedQuantity != sales[storedPosition].quantity.toString()) {
sales[storedPosition].isPrepared = "1" sales[storedPosition].isPrepared = "1"
markLine(storedPosition, OK) markLine(storedPosition, OK)
} else { } else {
@ -2083,7 +2083,7 @@ class CollectionFragment(
if (type == SACADOR) { if (type == SACADOR) {
if (it.isPrepared == "1" || it.isControlled == "1" || it.isPreviousPrepared == "1") { if (it.isPrepared == "1" || it.isControlled == "1" || it.isPreviousPrepared == "1") {
totalMark += 1 totalMark += 1
} else if (it.quantity == "0") { } else if (it.quantity == 0) {
totalMark += 1 totalMark += 1
} }
} else if (type == CONTROLADOR) { } else if (type == CONTROLADOR) {
@ -2305,11 +2305,11 @@ class CollectionFragment(
} else { } else {
when (action) { when (action) {
getString(R.string.Agregar) -> increaseQuantity(position, value) getString(R.string.Agregar) -> increaseQuantity(position, value.toInt())
getString(R.string.BasuraRechazar) -> TrashMissingReject(position, value, "TRUE") getString(R.string.BasuraRechazar) -> TrashMissingReject(position, value.toInt(), "TRUE")
getString(R.string.titleFaults) -> TrashMissingReject(position, value, "FALSE") getString(R.string.titleFaults) -> TrashMissingReject(position, value.toInt(), "FALSE")
getString(R.string.Reject) -> TrashMissingReject(position, value, "reject") getString(R.string.Reject) -> TrashMissingReject(position, value.toInt(), "reject")
getString(R.string.Split) -> split(position, value) getString(R.string.Split) -> split(position, value.toInt())
} }
@ -2318,7 +2318,7 @@ class CollectionFragment(
} }
} }
private fun split(position: Int, quantity: String) { private fun split(position: Int, quantity: Int) {
//sergio: SPLIT SALIX //sergio: SPLIT SALIX
@ -2327,7 +2327,7 @@ class CollectionFragment(
var totalQuantity: Int = 0 var totalQuantity: Int = 0
try { try {
totalQuantity = sales[position].quantity.toInt() - quantity.toInt() totalQuantity = sales[position].quantity!!.toInt() - quantity.toInt()
} catch (e: Exception) { } catch (e: Exception) {
} }
@ -2362,7 +2362,7 @@ class CollectionFragment(
private fun TrashMissingReject( private fun TrashMissingReject(
position: Int, position: Int,
quantity: String, quantity: Int,
typeCollectionTrashMissingReject: String typeCollectionTrashMissingReject: String
) { ) {
typeCollectionMissing = typeCollectionTrashMissingReject typeCollectionMissing = typeCollectionTrashMissingReject
@ -2371,7 +2371,7 @@ class CollectionFragment(
var totalQuantity: Int = 0 var totalQuantity: Int = 0
try { try {
totalQuantity = sales[position].quantity.toInt() - quantity.toInt() totalQuantity = sales[position].quantity!!.toInt() - quantity.toInt()
} catch (e: Exception) { } catch (e: Exception) {
} }
@ -2382,7 +2382,7 @@ class CollectionFragment(
quantity = totalQuantity.toString(), quantity = totalQuantity.toString(),
warehouseFk = getData(WAREHOUSEFK), warehouseFk = getData(WAREHOUSEFK),
type = typeCollectionTrashMissingReject, type = typeCollectionTrashMissingReject,
originalQuantity = quantity originalQuantity = quantity.toString()
) )
/* sales[position].quantity = quantity /* sales[position].quantity = quantity
saleAdapter!!.notifyDataSetChanged() saleAdapter!!.notifyDataSetChanged()
@ -2510,13 +2510,13 @@ class CollectionFragment(
sales[positionCollectionMissing].quantity = quantityCollectionMissing sales[positionCollectionMissing].quantity = quantityCollectionMissing
saleAdapter!!.notifyDataSetChanged() saleAdapter!!.notifyDataSetChanged()
if (quantityCollectionMissing == "0") if (quantityCollectionMissing == 0)
markLine(positionCollectionMissing, type) markLine(positionCollectionMissing, type)
var totalQuantity: Int = 0 var totalQuantity: Int = 0
try { try {
totalQuantity = totalQuantity =
sales[positionCollectionMissing].originalQuantity.toInt() - quantityCollectionMissing.toInt() sales[positionCollectionMissing].originalQuantity!!.toInt() - quantityCollectionMissing.toInt()
} catch (e: Exception) { } catch (e: Exception) {
} }
@ -2598,7 +2598,7 @@ class CollectionFragment(
) )
} }
private fun increaseQuantity(position: Int, quantity: String) { private fun increaseQuantity(position: Int, quantity: Int) {
positionIncreaseQuantity = position positionIncreaseQuantity = position
quantityIncrease = quantity quantityIncrease = quantity
@ -2616,7 +2616,7 @@ class CollectionFragment(
viewModel.collectionIncreaseQuantitySalix( viewModel.collectionIncreaseQuantitySalix(
getData(TOKEN), getData(TOKEN),
saleFk = sales[position].saleFk, saleFk = sales[position].saleFk,
quantity = quantity quantity = quantity.toString()
) )
/* }*/ /* }*/

15
app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt
View File

@ -28,17 +28,12 @@ fun CollectionVO.map(context: Context): CollectionVO {
//Log.d("VERDNATURA::","quantity"+it.quantity) //Log.d("VERDNATURA::","quantity"+it.quantity)
//Log.d("VERDNATURA::","quantity original"+it.originalQuantity) //Log.d("VERDNATURA::","quantity original"+it.originalQuantity)
it.quantity = if (it.quantity.indexOf(".") > 0) { it.quantity = it.quantity!!.toInt()
it.quantity.substring(0, it.quantity.indexOf("."))
} else {
it.quantity
}
it.originalQuantity = (if (it.originalQuantity.indexOf(".") > 0) {
it.originalQuantity.substring(0, it.originalQuantity.indexOf("."))
} else it.originalQuantity)
if (it.originalQuantity.equals("-1")) it.originalQuantity = it.quantity it.originalQuantity = it.originalQuantity!!.toInt()
if (it.originalQuantity==-1) it.originalQuantity = it.quantity
/* it.originalQuantity = /* it.originalQuantity =
if (it.originalQuantity != "-1") it.originalQuantity.substring( if (it.originalQuantity != "-1") it.originalQuantity.substring(
@ -48,7 +43,7 @@ fun CollectionVO.map(context: Context): CollectionVO {
it.pickedQuantity = it.pickedQuantity =
if (it.isPrepared == "1" || it.isPreviousPrepared == "1" || it.isControlled == "1") it.quantity else it.pickedQuantity if (it.isPrepared == "1" || it.isPreviousPrepared == "1" || it.isControlled == "1") it.quantity.toString() else it.pickedQuantity
if (!it.placements.isNullOrEmpty()) { if (!it.placements.isNullOrEmpty()) {
it.placements.forEachIndexed { index, placement -> it.placements.forEachIndexed { index, placement ->
if (index == 0) { if (index == 0) {

2
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt
View File

@ -78,7 +78,7 @@ class PreSacadorAdapter (
onQuantityClick.onQuantityClick(sale) onQuantityClick.onQuantityClick(sale)
} }
if (sale.quantity == sale.pickedQuantity){ if (sale.quantity == sale.pickedQuantity.toInt()){
sale.isPreviousPrepared = "1" sale.isPreviousPrepared = "1"
}else{ }else{
sale.isPreviousPrepared = "0" sale.isPreviousPrepared = "0"

8
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/mapper/SaleMapper.kt
View File

@ -9,14 +9,14 @@ fun PreSacadorItemVO.toSale() : SaleVO {
level = "1", level = "1",
saleFk = idMovimiento, saleFk = idMovimiento,
itemFk = itemFk, itemFk = itemFk,
quantity = saldo.toString(), quantity = saldo,
longName = if (longName != null) longName else "", longName = if (longName != null) longName else "",
isPreviousPrepared = if (quantity == picked) "1" else "0", isPreviousPrepared = if (quantity == picked) "1" else "0",
line1 = longName, line1 = longName,
line2 = if (subName.isNullOrEmpty()) "" else subName,//sergio:cuando subida versión de tarea #3510 se puede quitar isNullOrEmpty line2 = if (subName.isNullOrEmpty()) "" else subName,//sergio:cuando subida versión de tarea #3510 se puede quitar isNullOrEmpty
pickedQuantity = picked.toString(), pickedQuantity = picked.toString(),
workerFk = if (trabajador.isNullOrEmpty()) { "0" } else trabajador, workerFk = if (trabajador.isNullOrEmpty()) { "0" } else trabajador,
originalQuantity = quantity.toString(), originalQuantity = quantity,
placements = carros, placements = carros,
agencyName = if (trabajador.isNullOrEmpty()) { "" } else trabajador, agencyName = if (trabajador.isNullOrEmpty()) { "" } else trabajador,
packingType=packingType, packingType=packingType,
@ -34,14 +34,14 @@ fun PreSacadorItemVO.toSaleReposicion() : SaleVO {
level = "1", level = "1",
saleFk = idMovimiento, saleFk = idMovimiento,
itemFk = itemFk, itemFk = itemFk,
quantity = quantity.toString(), quantity = quantity,
longName = if (longName != null) longName else "", longName = if (longName != null) longName else "",
isPreviousPrepared = if ((quantity - saldo) == 0) "1" else "0", isPreviousPrepared = if ((quantity - saldo) == 0) "1" else "0",
line1 = longName, line1 = longName,
line2 = if (subName.isNullOrEmpty()) "" else subName, line2 = if (subName.isNullOrEmpty()) "" else subName,
pickedQuantity = (quantity - saldo).toString(), pickedQuantity = (quantity - saldo).toString(),
workerFk = if (trabajador.isNullOrEmpty()) { "0" } else trabajador, workerFk = if (trabajador.isNullOrEmpty()) { "0" } else trabajador,
originalQuantity = quantity.toString(), originalQuantity = quantity,
placements = carros, placements = carros,
agencyName = if (trabajador.isNullOrEmpty()) { "" } else trabajador, agencyName = if (trabajador.isNullOrEmpty()) { "" } else trabajador,
rgb=null rgb=null

2
app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/adapter/ReposicionAdapter.kt
View File

@ -69,7 +69,7 @@ class ReposicionAdapter (
} }
if (sale.quantity == sale.pickedQuantity){ if (sale.quantity == sale.pickedQuantity.toInt()){
sale.isPreviousPrepared = "1" sale.isPreviousPrepared = "1"
}else{ }else{
sale.isPreviousPrepared = "0" sale.isPreviousPrepared = "0"

4
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt
View File

@ -33,7 +33,7 @@ class SaleVO(
var saleOrder: Int = 9999, var saleOrder: Int = 9999,
var saleFk: String = "", var saleFk: String = "",
var itemFk: String = "", var itemFk: String = "",
var quantity: String = "", var quantity: Int?,
var longName: String = "", var longName: String = "",
var size: String = "", var size: String = "",
var reserved: String = "", var reserved: String = "",
@ -49,7 +49,7 @@ class SaleVO(
var category: String = "", var category: String = "",
var origin: String = "", var origin: String = "",
var clientFk: String = "", var clientFk: String = "",
var originalQuantity: String = "", var originalQuantity:Int?,
var line1: String = "", var line1: String = "",
var line2: String? = "", var line2: String? = "",
var line3: String = "", var line3: String = "",

2
app/src/main/res/layout/item_article_row.xml
View File

@ -224,7 +224,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_1" android:layout_marginEnd="@dimen/layout_margin_1"
android:text="@{sale.quantity}" android:text="@{Integer.toString(sale.quantity)}"
tool:text="10" tool:text="10"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/h6" android:textSize="@dimen/h6"

4
app/src/main/res/layout/item_article_row_fragment.xml
View File

@ -257,7 +257,7 @@
android:paddingRight="10dp" android:paddingRight="10dp"
android:visibility="gone" android:visibility="gone"
android:text="@{sale.quantity}" android:text="@{Integer.toString(sale.quantity)}"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body1" android:textSize="@dimen/body1"
android:textStyle="bold" android:textStyle="bold"
@ -370,7 +370,7 @@
android:paddingBottom="@dimen/layout_margin_minest" android:paddingBottom="@dimen/layout_margin_minest"
android:paddingLeft="@dimen/layout_margin_1" android:paddingLeft="@dimen/layout_margin_1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{sale.quantity}" android:text="@{Integer.toString(sale.quantity)}"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body3" android:textSize="@dimen/body3"
android:textStyle="bold" android:textStyle="bold"

2
app/src/main/res/layout/item_article_row_presacador.xml
View File

@ -191,7 +191,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_min" android:layout_marginEnd="@dimen/layout_margin_min"
android:text="@{sale.quantity}" android:text="@{Integer.toString(sale.quantity)}"
tool:text="10" tool:text="10"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/h6" android:textSize="@dimen/h6"