修改 半成品入库

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;
     }

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);

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="扫描库位:" />
             <!--          -->