From f53ea57accc415319e3e6f94d5cc79d94dd64ab8 Mon Sep 17 00:00:00 2001
From: Anna Balakireva <a.balakireva@evotor.ru>
Date: Wed, 24 Jul 2024 13:18:36 +0300
Subject: [PATCH 1/3] ALCO-627 Add volume to MarkRest

---
 .../egais/api/model/dictionary/MarkRest.kt    | 13 ++++++----
 .../provider/dictionary/MarkRestContract.kt   |  5 ++++
 .../evotor/egais/api/query/MarkRestQuery.kt   | 24 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/api/src/main/java/ru/evotor/egais/api/model/dictionary/MarkRest.kt b/api/src/main/java/ru/evotor/egais/api/model/dictionary/MarkRest.kt
index 51847d9..eacf177 100644
--- a/api/src/main/java/ru/evotor/egais/api/model/dictionary/MarkRest.kt
+++ b/api/src/main/java/ru/evotor/egais/api/model/dictionary/MarkRest.kt
@@ -9,9 +9,14 @@ import java.util.*
  * @property documentUuid uuid документа основания
  * @property informF2RegId справка 2
  * @property mark Марка
+ * @property volume Остаток акцизных марок
  */
 data class MarkRest(
-        @JvmField val documentUuid: UUID,
-        @JvmField val informF2RegId: String,
-        @JvmField val mark: String
-) : EgaisDocument()
+    @JvmField val documentUuid: UUID,
+    @JvmField val informF2RegId: String,
+    @JvmField val mark: String
+) : EgaisDocument() {
+
+    @JvmField
+    var volume: String? = null
+}
diff --git a/api/src/main/java/ru/evotor/egais/api/provider/dictionary/MarkRestContract.kt b/api/src/main/java/ru/evotor/egais/api/provider/dictionary/MarkRestContract.kt
index 8000549..2e9a0b2 100644
--- a/api/src/main/java/ru/evotor/egais/api/provider/dictionary/MarkRestContract.kt
+++ b/api/src/main/java/ru/evotor/egais/api/provider/dictionary/MarkRestContract.kt
@@ -26,4 +26,9 @@ internal object MarkRestContract {
      * Марка
      */
     const val COLUMN_MARK = "MARK"
+
+    /**
+     * Остаток акцизных марок
+     */
+    const val COLUMN_VOLUME_BALANCE = "VOLUME_BALANCE"
 }
\ No newline at end of file
diff --git a/api/src/main/java/ru/evotor/egais/api/query/MarkRestQuery.kt b/api/src/main/java/ru/evotor/egais/api/query/MarkRestQuery.kt
index 8179c2f..6f119a7 100644
--- a/api/src/main/java/ru/evotor/egais/api/query/MarkRestQuery.kt
+++ b/api/src/main/java/ru/evotor/egais/api/query/MarkRestQuery.kt
@@ -29,6 +29,12 @@ class MarkRestQuery : FilterBuilder<MarkRestQuery, MarkRestQuery.SortOrder, Mark
     @JvmField
     val mark = addFieldFilter<String>(MarkRestContract.COLUMN_MARK)
 
+    /**
+     * Остаток акцизных марок
+     */
+    @JvmField
+    val volume = addFieldFilter<String?>(MarkRestContract.COLUMN_VOLUME_BALANCE)
+
     override val currentQuery: MarkRestQuery
         get() = this
 
@@ -55,6 +61,12 @@ class MarkRestQuery : FilterBuilder<MarkRestQuery, MarkRestQuery.SortOrder, Mark
         @JvmField
         val mark = addFieldSorter(MarkRestContract.COLUMN_MARK)
 
+        /**
+         * Остаток акцизных марок
+         */
+        @JvmField
+        val volume = addFieldSorter(MarkRestContract.COLUMN_VOLUME_BALANCE)
+
         override val currentSortOrder: SortOrder
             get() = this
     }
@@ -67,10 +79,20 @@ class MarkRestQuery : FilterBuilder<MarkRestQuery, MarkRestQuery.SortOrder, Mark
         val columnIndexDocUuid = cursor.getColumnIndex(MarkRestContract.COLUMN_DOCUMENT_UUID)
         val columnIndexInformF2RegId = cursor.getColumnIndex(MarkRestContract.COLUMN_NAME_INFORM_F2_REG_ID)
         val columnIndexMark = cursor.getColumnIndex(MarkRestContract.COLUMN_MARK)
-        return MarkRest(
+        val columnIndexVolume = try {
+            cursor.getColumnIndex(MarkRestContract.COLUMN_VOLUME_BALANCE)
+        } catch (exception: Exception) {
+            null
+        }
+        val markRest =  MarkRest(
                 UUID.fromString(cursor.getString(columnIndexDocUuid)),
                 cursor.getString(columnIndexInformF2RegId),
                 cursor.getString(columnIndexMark)
         )
+        columnIndexVolume?.let {
+            markRest.volume = cursor.getString(columnIndexVolume)
+        }
+
+        return markRest
     }
 }

From 1fa839cee80d4f4941433341f275d4b4ffba9593 Mon Sep 17 00:00:00 2001
From: Anna Balakireva <a.balakireva@evotor.ru>
Date: Wed, 24 Jul 2024 14:10:51 +0300
Subject: [PATCH 2/3] ALCO-627 Fix volume (remove JvmField)

---
 .../main/java/ru/evotor/egais/api/model/dictionary/MarkRest.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api/src/main/java/ru/evotor/egais/api/model/dictionary/MarkRest.kt b/api/src/main/java/ru/evotor/egais/api/model/dictionary/MarkRest.kt
index eacf177..45f0383 100644
--- a/api/src/main/java/ru/evotor/egais/api/model/dictionary/MarkRest.kt
+++ b/api/src/main/java/ru/evotor/egais/api/model/dictionary/MarkRest.kt
@@ -17,6 +17,5 @@ data class MarkRest(
     @JvmField val mark: String
 ) : EgaisDocument() {
 
-    @JvmField
     var volume: String? = null
 }

From 2d0af58f243b7825b2b1059e12655635acc115a0 Mon Sep 17 00:00:00 2001
From: "k.bastrykina" <k.bastrykina@evotor.ru>
Date: Mon, 30 Sep 2024 14:43:39 +0700
Subject: [PATCH 3/3] ALCO-779. Add DocType QUERY_REST_B_CODE

---
 .../java/ru/evotor/egais/api/model/document/ticket/DocType.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/src/main/java/ru/evotor/egais/api/model/document/ticket/DocType.kt b/api/src/main/java/ru/evotor/egais/api/model/document/ticket/DocType.kt
index f07fee3..0b4b2b0 100644
--- a/api/src/main/java/ru/evotor/egais/api/model/document/ticket/DocType.kt
+++ b/api/src/main/java/ru/evotor/egais/api/model/document/ticket/DocType.kt
@@ -24,6 +24,7 @@ package ru.evotor.egais.api.model.document.ticket
  * @property REQUEST_REPEAL_WB Запрос на отмену проведения акта для ТТН
  * @property CONFIRM_REPEAL_WB Ответ на запрос об отмене проведения акта для ТТН
  * @property JSON_STRING Документ json в формате String
+ * @property QUERY_REST_B_CODE Запрос акцизных марок по номеру партии и остатков по каждой марке в миллилитрах
  */
 enum class DocType {
     WAY_BILL,
@@ -46,5 +47,6 @@ enum class DocType {
     QUERY_UNPROCESSED_DOCUMENTS,
     REQUEST_REPEAL_WB,
     CONFIRM_REPEAL_WB,
-    JSON_STRING
+    JSON_STRING,
+    QUERY_REST_B_CODE
 }
\ No newline at end of file