From 471c81bdc7965c4815dfef762c9199f1b4f823af Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Wed, 25 Mar 2026 17:33:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E8=BF=9B=E6=B8=AF?=
 =?UTF-8?q?=E8=88=B1=E5=8D=95=E5=88=97=E8=A1=A8=20REF=20=E7=BB=BF=E8=89=B2?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=E5=8F=8A=E8=A3=85=E6=9C=BA=E5=8D=95=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E5=8F=B7=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 舱单列表项 REF=1 时显示浅绿色背景，展开按钮同步变为黑色
- 装机单列表库位号取值改为 locationTally 字段
- GjjManifest 新增 locationTally 字段

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../java/com/lukouguoji/module_base/bean/GjjManifest.kt   | 3 ++-
 .../src/main/res/drawable/bg_light_green_radius_8.xml     | 5 +++++
 .../com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt | 8 ++++++++
 .../src/main/res/layout/item_int_imp_loading_list.xml     | 2 +-
 module_gjj/src/main/res/layout/item_int_imp_manifest.xml  | 2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 module_base/src/main/res/drawable/bg_light_green_radius_8.xml

diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt
index 3c2d122..adb0ab2 100644
--- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt
@@ -54,7 +54,8 @@ data class GjjManifest(
     var splitFlag: String = "",         // 分批标志
     var subCode: String = "",           // 子代码
     var unNumber: String = "",          // 危险品编号
-    var activeId: Long = 0              // 活动ID
+    var activeId: Long = 0,             // 活动ID
+    var locationTally: String = ""      // 理货库位号
 ) : Serializable {
     // 分单列表
     var haWbList: List<GjjHaWb>? = null
diff --git a/module_base/src/main/res/drawable/bg_light_green_radius_8.xml b/module_base/src/main/res/drawable/bg_light_green_radius_8.xml
new file mode 100644
index 0000000..1b3f7d7
--- /dev/null
+++ b/module_base/src/main/res/drawable/bg_light_green_radius_8.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="8dp" />
+    <solid android:color="#A5D6A7" />
+</shape>
diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt
index 7754940..cb7bd5f 100644
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt
@@ -1,5 +1,6 @@
 package com.lukouguoji.gjj.holder
 
+import android.graphics.Color
 import android.view.View
 import com.lukouguoji.gjj.R
 import com.lukouguoji.gjj.databinding.ItemIntImpManifestBinding
@@ -43,6 +44,13 @@ class IntImpManifestViewHolder(view: View) :
             clickListener?.onItemClick(position, 102)  // 102=删除
         }
 
+        // 展开按钮颜色：绿色背景时黑色，否则保持原色
+        if (bean.ref == "1") {
+            binding.ivShow.setColorFilter(Color.BLACK)
+        } else {
+            binding.ivShow.clearColorFilter()
+        }
+
         // 展开按钮点击事件 - 先加载分单数据，再切换展开状态
         binding.ivShow.setOnClickListener {
             if (!bean.showMore.get() && bean.haWbList.isNullOrEmpty()) {
diff --git a/module_gjj/src/main/res/layout/item_int_imp_loading_list.xml b/module_gjj/src/main/res/layout/item_int_imp_loading_list.xml
index d7e3aaa..3249b4c 100644
--- a/module_gjj/src/main/res/layout/item_int_imp_loading_list.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_loading_list.xml
@@ -259,7 +259,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@{bean.location}"
+                            android:text="@{bean.locationTally}"
                             android:textColor="@color/text_normal"
                             android:textSize="16sp" />
 
diff --git a/module_gjj/src/main/res/layout/item_int_imp_manifest.xml b/module_gjj/src/main/res/layout/item_int_imp_manifest.xml
index b997197..017f3ff 100644
--- a/module_gjj/src/main/res/layout/item_int_imp_manifest.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_manifest.xml
@@ -32,7 +32,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_white_radius_8"
+                android:background="@{`1`.equals(bean.ref) ? @drawable/bg_light_green_radius_8 : @drawable/bg_white_radius_8}"
                 android:orientation="vertical">
 
                 <!-- 主内容区 -->