From 19d02700b8de956a8082bfe5bbae6003808eef44 Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Thu, 27 Aug 2026 16:41:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E5=87=BA=E6=B8=AF?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=B8=85=E4=BB=93=E5=BC=B9=E7=AA=97=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=87=E6=B3=A8=E8=BE=93=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

清仓操作弹窗在「清仓正常」下拉基础上新增选填备注，提交时随 clearRemark 字段传给 updateClear 接口

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../gjc/activity/IntExpStorageUseActivity.kt  |  3 ++-
 .../gjc/dialog/IntExpMoveClearDialogModel.kt  |  3 +++
 .../viewModel/IntExpStorageUseViewModel.kt    |  4 ++-
 .../res/layout/dialog_int_exp_move_clear.xml  | 26 +++++++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpStorageUseActivity.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpStorageUseActivity.kt
index 34d286a..82cada8 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpStorageUseActivity.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpStorageUseActivity.kt
@@ -79,7 +79,8 @@ class IntExpStorageUseActivity :
         IntExpMoveClearDialogModel { dialog ->
             // 用户点击保存后，执行清仓操作
             val clearNormal = dialog.clearNormal.value ?: ""
-            viewModel.performClear(clearNormal, maWbListForClear)
+            val clearRemark = dialog.clearRemark.value ?: ""
+            viewModel.performClear(clearNormal, clearRemark, maWbListForClear)
         }.show(this)
     }
 
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/dialog/IntExpMoveClearDialogModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/dialog/IntExpMoveClearDialogModel.kt
index 8af9afa..0ef23c7 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/dialog/IntExpMoveClearDialogModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/dialog/IntExpMoveClearDialogModel.kt
@@ -18,6 +18,9 @@ class IntExpMoveClearDialogModel(
     // 清仓正常（存储的是 code："0" 或 "1"）
     val clearNormal = MutableLiveData("")
 
+    // 清仓备注（选填）
+    val clearRemark = MutableLiveData("")
+
     // 清仓正常选项列表
     val clearNormalList = MutableLiveData<List<KeyValue>>().apply {
         value = listOf(
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt
index 4af85b6..d1e0036 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt
@@ -140,9 +140,10 @@ class IntExpStorageUseViewModel : BasePageViewModel() {
     /**
      * 执行清仓操作
      * @param clearNormal 清仓正常（"0"或"1"）
+     * @param clearRemark 清仓备注（选填）
      * @param maWbListForClear 包含选中子列表项的主列表数据
      */
-    fun performClear(clearNormal: String, maWbListForClear: List<GjcMaWb>) {
+    fun performClear(clearNormal: String, clearRemark: String, maWbListForClear: List<GjcMaWb>) {
         if (maWbListForClear.isEmpty()) {
             showToast("请至少选择一个库位")
             return
@@ -151,6 +152,7 @@ class IntExpStorageUseViewModel : BasePageViewModel() {
         // 构建请求参数：完整的主子列表结构
         val params = mapOf(
             "clearNormal" to clearNormal,
+            "clearRemark" to clearRemark.ifEmpty { null },
             "maWbList" to maWbListForClear
         ).toRequestBody()
 
diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml b/module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml
index 88206ec..f53169b 100644
--- a/module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml
+++ b/module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml
@@ -61,6 +61,32 @@
 
             </LinearLayout>
 
+            <!-- 备注 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    completeSpace="@{5}"
+                    android:text="备注："
+                    android:textColor="@color/text_normal"
+                    android:textSize="16sp" />
+
+                <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    hint='@{"请输入备注"}'
+                    type="@{SearchLayoutType.INPUT}"
+                    value="@={model.clearRemark}" />
+
+            </LinearLayout>
+
         </LinearLayout>
 
         <!-- 底部按钮 -->