From cbb7d610ea4fca8018aa79833f5a32bd094c994c Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Thu, 22 May 2025 15:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8D=8A=E6=88=90?=
 =?UTF-8?q?=E5=93=81=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/haiwei_mom/data/SemiInVo.java |  4 +++
 .../haiwei_mom/wms/semi/SemiInActivity.java   | 29 +++++++++++--------
 app/src/main/res/layout/activity_semi_in.xml  | 29 ++++---------------
 3 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/com/example/haiwei_mom/data/SemiInVo.java b/app/src/main/java/com/example/haiwei_mom/data/SemiInVo.java
index b5c17dc..de4970f 100644
--- a/app/src/main/java/com/example/haiwei_mom/data/SemiInVo.java
+++ b/app/src/main/java/com/example/haiwei_mom/data/SemiInVo.java
@@ -66,6 +66,10 @@ public class SemiInVo extends BaseObservable {
         return cardNo;
     }
 
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
     public String getShelfNo() {
         return shelfNo;
     }
diff --git a/app/src/main/java/com/example/haiwei_mom/wms/semi/SemiInActivity.java b/app/src/main/java/com/example/haiwei_mom/wms/semi/SemiInActivity.java
index 59d6686..7baca0b 100644
--- a/app/src/main/java/com/example/haiwei_mom/wms/semi/SemiInActivity.java
+++ b/app/src/main/java/com/example/haiwei_mom/wms/semi/SemiInActivity.java
@@ -41,24 +41,29 @@ public class SemiInActivity extends BaseActivity implements View.OnFocusChangeLi
             return true;
         });
 
-        semiInVehicle.setOnTouchListener((v, event) -> {
-            if (event.getAction() == MotionEvent.ACTION_UP) {
-                // 获取触摸的位置
-                int x = (int) event.getX();
-                if (x >= 464) {
-                    selectVehicleInfo();
-                    return true;
-                }
-            }
-            return false;
-        });
+        // semiInVehicle.setOnTouchListener((v, event) -> {
+        //     final int DRAWABLE_RIGHT = 2;
+        //     if (event.getAction() == MotionEvent.ACTION_UP) {
+        //         // 获取触摸的位置
+        //         int x = (int) event.getX();
+        //         // 获取图标的边界
+        //         int drawableRightWidth = binding.semiInVehicle.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width();
+        //         int drawableRightStart = (int) (binding.semiInVehicle.getWidth() - binding.semiInVehicle.getPaddingRight() - drawableRightWidth);
+        //         // 判断是否点击了右侧图标
+        //         if (x >= drawableRightStart && x <= (binding.semiInVehicle.getWidth() - binding.semiInVehicle.getPaddingRight())) {
+        //             selectVehicleInfo();
+        //             return true;
+        //         }
+        //     }
+        //     return false;
+        // });
         semi=new SemiInVo();
         binding.setData(semi);
     }
 
     private void selectVehicleInfo() {
         OkGo.<MyResult>post(url + "/wms/pda/semi/selectVehicleInfo")
-                .params("code", semi.getShelfNo()).execute(new MyRecultCall(dialog, this) {
+                .params("code", semi.getCardNo()).execute(new MyRecultCall(dialog, this) {
                     @Override
                     public void onSuccess(Response<MyResult> response) {
                         super.onSuccess(response);
diff --git a/app/src/main/res/layout/activity_semi_in.xml b/app/src/main/res/layout/activity_semi_in.xml
index c37b1b8..f2f3c58 100644
--- a/app/src/main/res/layout/activity_semi_in.xml
+++ b/app/src/main/res/layout/activity_semi_in.xml
@@ -33,44 +33,25 @@
 
             <TextView
                 style="@style/text_title"
-                android:layout_width="90dp"
+                android:layout_width="110dp"
                 android:layout_height="match_parent"
-                android:text="扫描载具:" />
+                android:text="扫描流水卡:" />
 
             <EditText
                 android:id="@+id/semi_in_vehicle"
                 style="@style/text_san"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:drawableRight="@mipmap/icon_chaxun"
                 android:imeOptions="actionSearch"
                 android:inputType="text"
                 android:lines="1"
                 android:maxLines="1"
-                android:text="@={data.shelfNo}" />
-
+                android:text="@={data.cardNo}" />
+<!--            android:text="@{data.cardNo}" />-->
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="45dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginEnd="4dp">
 
-            <TextView
-                style="@style/text_title"
-                android:layout_width="110dp"
-                android:layout_height="match_parent"
-                android:text="流水卡号:" />
 
-            <TextView
-                style="@style/text_info"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@{data.cardNo}" />
-            <!--  android:text="@{vo.materialName}"-->
-
-        </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -149,7 +130,7 @@
 
             <TextView
                 style="@style/text_title"
-                android:layout_width="90dp"
+                android:layout_width="110dp"
                 android:layout_height="match_parent"
                 android:text="扫描库位:" />
             <!--          -->