修改 半成品出

app/src/main/java/com/example/haiwei_mom/HomePageActivity.java

@@ -58,6 +58,7 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall {
         map.put("半成品出库", SemiOutActivity.class);
         map.put("半成品调拨", SeimMoveActivity.class);
         map.put("半成品盘点", StoreCheckActivity.class);
+        map.put("半成品退库", RawReturnActivity.class);
         map.put("入库工装绑定", BindVehicleActivity.class);
         map.put("成品批量入库", ProductInActivity.class);
         map.put("成品出库", ProductOutActivity.class);
@@ -70,7 +71,6 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall {
         map.put("机台投料", FeedingMaterialsActivity.class);
         map.put("工装验证", FeedingMaterialsActivity.class);
         map.put("载具绑定", FeedingMaterialsActivity.class);
-
         map.put("系统配置", ConfigActivity.class);
         map.put("班组管理", ClassItemActivity.class);
     }
@@ -124,6 +124,8 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall {
             intent.putExtra("from","2");
         }else if (menuName.equals("载具绑定")){
             intent.putExtra("from","4");
+        }else if (menuName.equals("半成品退库")){
+            intent.putExtra("from","4");
         }
 
         startActivity(intent);

app/src/main/java/com/example/haiwei_mom/wms/raw/RawReturnActivity.java

@@ -1,22 +1,19 @@
 package com.example.haiwei_mom.wms.raw;
 
-import androidx.databinding.DataBindingUtil;
-
 import android.annotation.SuppressLint;
-import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
+
-import android.widget.EditText;
+import androidx.databinding.DataBindingUtil;
 
 import com.example.haiwei_mom.R;
 import com.example.haiwei_mom.base.BaseActivity;
 import com.example.haiwei_mom.base.MyRecultCall;
 import com.example.haiwei_mom.base.MyResult;
-import com.example.haiwei_mom.data.RawReturnVo;
 import com.example.haiwei_mom.data.RawReturnSubmitBeen;
+import com.example.haiwei_mom.data.RawReturnVo;
 import com.example.haiwei_mom.databinding.ActivityRawReturnBinding;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.model.Response;
@@ -25,32 +22,28 @@ import java.math.BigDecimal;
 
 import okhttp3.RequestBody;
 
-public class RawReturnActivity extends BaseActivity implements View.OnFocusChangeListener {
+public class RawReturnActivity extends BaseActivity {
-    private RawReturnVo params;
     ActivityRawReturnBinding binding;
+    private RawReturnVo params;
+    private int type;
 
     @SuppressLint("ClickableViewAccessibility")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         binding = DataBindingUtil.setContentView(this, R.layout.activity_raw_return);
-        binding.rawReturnCode.setOnFocusChangeListener(this);
+        Intent intent = getIntent();
-        binding.rawReturnCode.setOnTouchListener((v, event) -> {
+        String title = intent.getStringExtra("title");
-            final int DRAWABLE_RIGHT = 2;
+        binding.setTitle(title);
-            if (event.getAction() == MotionEvent.ACTION_UP) {
+        assert title != null;
-                // 获取触摸的位置
+        if (title.equals("原材料退库")) {
-                int x = (int) event.getX();
+            type = 1;
-                // 获取图标的边界
+        } else if (title.equals("半成品退库")) {
-                int drawableRightWidth = binding.rawReturnCode.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width();
+            type = 2;
-                int drawableRightStart = (int) (binding.rawReturnCode.getWidth() - binding.rawReturnCode.getPaddingRight() - drawableRightWidth);
+        }
-                // 判断是否点击了右侧图标
+        binding.rawReturnCode.setOnEditorActionListener((v, actionId, event) -> {
-                if (x >= drawableRightStart && x <= (binding.rawReturnCode.getWidth() - binding.rawReturnCode.getPaddingRight())) {
+            selectCode();
-                    selectCode();
+            return true;
-                    return true;
-                }
-            }
-            return false;
         });
         params = new RawReturnVo();
         binding.setVo(params);
@@ -59,6 +52,7 @@ public class RawReturnActivity extends BaseActivity implements View.OnFocusChang
     private void selectCode() {
         OkGo.<MyResult>post(url + "/wms/pda/raw/returnSelectCode")
                 .params("code", params.getBatchCode())
+                .params("type", type)
                 .execute(new MyRecultCall(dialog, this) {
                     @Override
                     public void onSuccess(Response<MyResult> response) {
@@ -113,31 +107,15 @@ public class RawReturnActivity extends BaseActivity implements View.OnFocusChang
                 });
     }
 
-    private EditText focusedView;
-
     @Override
     public void getScannerData(String data) {
         super.getScannerData(data);
-        Log.e("TAG", "getScannerData:" + data);
-        if (focusedView!=null){
-            EditText editText = focusedView;
-            // 将接收到的数据添加到 EditText 中
-            editText.append(data);
-            if (editText==binding.rawReturnCode){
-                selectCode();
-            }
-        }
 
+        binding.rawReturnCode.setText(data);
 
+        selectCode();
 
     }
 
-    @Override
-    public void onFocusChange(View v, boolean hasFocus) {
-        if (hasFocus) {
-            Log.e("TAG", "onFocusChange:" + v.getId());
-            focusedView = (EditText) v;
-        }
 
-    }
 }

app/src/main/java/com/example/haiwei_mom/wms/semi/SemiOutActivity.java

@@ -35,17 +35,17 @@ public class SemiOutActivity extends BaseActivity {
             selectHppStorageInfo(binding.semiOutCode.getText().toString());
             return true;
         });
-        binding.semiOutCode.setOnTouchListener((v, event) -> {
+        // binding.semiOutCode.setOnTouchListener((v, event) -> {
-            if (event.getAction() == MotionEvent.ACTION_UP) {
+        //     if (event.getAction() == MotionEvent.ACTION_UP) {
-                // 获取触摸的位置
+        //         // 获取触摸的位置
-                int x = (int) event.getX();
+        //         int x = (int) event.getX();
-                if (x >= 464) {
+        //         if (x >= 464) {
-                    selectHppStorageInfo(binding.semiOutCode.getText().toString());
+        //             selectHppStorageInfo(binding.semiOutCode.getText().toString());
-                    return true;
+        //             return true;
-                }
+        //         }
-            }
+        //     }
-            return false;
+        //     return false;
-        });
+        // });
     }
 
     private void selectHppStorageInfo(String code) {

app/src/main/res/layout/activity_raw_return.xml

@@ -21,7 +21,7 @@
 
         <include
             layout="@layout/toolbar"
-            app:title='@{title??"原材料退库申请"}' />
+            app:title='@{title}' />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -40,7 +40,9 @@
                 style="@style/text_san"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:drawableRight="@mipmap/icon_chaxun"
+                android:inputType="text"
+                android:lines="1"
+                android:imeOptions="actionSearch"
                 android:text="@={vo.batchCode}"
 
                 />

app/src/main/res/layout/activity_semi_in.xml

@@ -35,7 +35,7 @@
                 style="@style/text_title"
                 android:layout_width="110dp"
                 android:layout_height="match_parent"
-                android:text="扫描流水卡:" />
+                android:text="扫描流转卡:" />
 
             <EditText
                 android:id="@+id/semi_in_vehicle"

app/src/main/res/layout/activity_semi_out.xml

@@ -45,7 +45,7 @@
                 android:lines="1"
                 android:inputType="text"
                 android:imeOptions="actionSearch"
-                android:drawableRight="@mipmap/icon_chaxun" />
+               />
 
         </LinearLayout>