新增收料单输入框优化，新增出库单输入框优化，库存条码绑定输入框优化--回车后全选

处理放大镜搜索失去焦点问题

app/src/main/java/com/uas/uas_mes_zb_p/activity/CommonSeclecActivity.java

@@ -1,8 +1,8 @@
 package com.uas.uas_mes_zb_p.activity;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -13,6 +13,7 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -22,8 +23,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.chad.library.adapter.base.BaseViewHolder;
 import com.uas.uas_mes_zb_p.R;
+import com.uas.uas_mes_zb_p.adapter.ConsignmentAdapter;
+import com.uas.uas_mes_zb_p.bean.ComDataBean;
 import com.uas.uas_mes_zb_p.global.GloableParams;
 import com.uas.uas_mes_zb_p.util.CommonUtil;
 import com.uas.uas_mes_zb_p.util.HttpCallback;
@@ -46,15 +48,16 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
     private ClearableEditText mSearch;
     private RecyclerView commonRv;
     private List<ComDataBean> mList;
-    private ComListAdapter myAdapter;
+    private ConsignmentAdapter myAdapter;
     private int type;
     private int savePage = 1;
     private int savepageSize = 20;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
-        LogUtil.i(TAG,"onCreate");
+        LogUtil.i(TAG, "onCreate");
     }
 
     @Override
@@ -67,10 +70,17 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
         commonRv = findViewById(R.id.common_select_rv);
         commonRv.addItemDecoration(new DividerItemDecoration(this, LinearLayout.VERTICAL));
         commonRv.setLayoutManager(new LinearLayoutManager(this));
-
+//        Timer timer = new Timer(); //设置定时器
+//        timer.schedule(new TimerTask() {
+//            @Override
+//            public void run() { //弹出软键盘的代码
+
+//                imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY);
+//            }
+//        }, 300);
         mList = new ArrayList<>();
-        myAdapter = new ComListAdapter(mList);
-        myAdapter.setmList(mList);
+        myAdapter = new ConsignmentAdapter(R.layout.fuzzy_search_item);
+//        myAdapter.setmList(mList);
         commonRv.setAdapter(myAdapter);
     }
 
@@ -80,53 +90,32 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
 
         mSearch.addTextChangedListener(new TextWatcher() {
             @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
             @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) { }
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
             @Override
             public void afterTextChanged(Editable s) {
-                mList = new ArrayList<>();
-                myAdapter = new ComListAdapter(mList);
-                myAdapter.setmList(mList);
-                commonRv.setAdapter(myAdapter);
                 generate_detailedData("");
-//                if (s.length() >= 0) {
-//                    String mSearchStr = s.toString().trim();
-//                    LogUtil.i("mSearchStr",mSearchStr);
-//                    List<ComDataBean> thisList = new ArrayList<>();
-//                    for(int i=0;i<mList.size();i++){
-//                        if(mList.get(i).getEm_defaulthsname().contains(mSearchStr) || mList.get(i).getEm_depart().contains(mSearchStr)||mList.get(i).getEm_name().contains(mSearchStr)
-//                                ||mList.get(i).getEm_id().contains(mSearchStr)
-//                                ||mList.get(i).getEm_code().contains(mSearchStr)){
-//                            thisList.add(mList.get(i));
-//                        }
-//
-//                        if(i == mList.size() -1){
-//                            myAdapter = new ComListAdapter(thisList);
-//                            commonRv.setAdapter(myAdapter);
-//                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
-//                        }
-//                    }
-//
-//
-//                } else {
-//                    myAdapter = new ComListAdapter(mList);
-//                    commonRv.setAdapter(myAdapter);
-//
-//                }
+                InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.showSoftInput(mSearch, InputMethodManager.RESULT_HIDDEN);
+
             }
         });
 
         myAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                ComDataBean bean = myAdapter.getBeanByPositon(position);
+                ComDataBean bean = (ComDataBean) adapter.getData().get(position);
                 String itemCode = bean.getEm_defaulthsname();
                 String em_name = bean.getEm_name();
                 String em_code = bean.getEm_code();
                 Intent resultIntent = new Intent();
-                resultIntent.putExtra("ITEM_DATA",itemCode+"-"+em_code+"-"+em_name);
-                setResult(1847,resultIntent);
+                resultIntent.putExtra("ITEM_DATA", itemCode + "-" + em_code + "-" + em_name);
+                setResult(1847, resultIntent);
                 finish();
             }
         });
@@ -137,10 +126,6 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
                         || actionId == EditorInfo.IME_ACTION_SEND
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     String data = mSearch.getText().toString().trim();
-                    mList = new ArrayList<>();
-                    myAdapter = new ComListAdapter(mList);
-                    myAdapter.setmList(mList);
-                    commonRv.setAdapter(myAdapter);
                     generate_detailedData(data);
 
                     return true;
@@ -154,9 +139,9 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
     protected void initDatas() {
         Intent c_intent = getIntent();
         String title = c_intent.getStringExtra("title");
-        type = c_intent.getIntExtra("type",-1);
+        type = c_intent.getIntExtra("type", -1);
         setTitle(title);
-        switch (type){
+        switch (type) {
             case 1:
 //                ceshiData();
                 generate_detailedData("");
@@ -170,69 +155,73 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
             case 4:
                 //                getSC_CODEData();
                 break;
-                default:
-                    break;
+            default:
+                break;
         }
     }
 
-    private void generate_detailedData(String data){//放大镜
+    private void generate_detailedData(String data) {//放大镜
         progressDialog.show();
+        mList.clear();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_OUTBOUNDORDER_AMAGNIFYINGGLASS)
                 .method(Request.Method.GET)
                 .tag(TAG + "datalist")
                 .flag(0)
-                .addParam("which","form")
-                .addParam("caller","ProdInout!Appropriationout")
-                .addParam("field","pi_emcode")
-                .addParam("condition","em_name like '%"+mSearch.getText().toString().trim()+"%'")//传编号
-                .addParam("page",savePage+"")
-                .addParam("pageSize",savepageSize+"")
+                .addParam("which", "form")
+                .addParam("caller", "ProdInout!Appropriationout")
+                .addParam("field", "pi_emcode")
+                .addParam("condition", "em_name like '%" + mSearch.getText().toString().trim() + "%'")//传编号
+                .addParam("page", savePage + "")
+                .addParam("pageSize", savepageSize + "")
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
+                mList.clear();
                 String s = o.toString();
 //                String s = StringEscapeUtils.unescapeJson(o.toString());
 //                s.e("Gson-Gson",s);
 
 //                s.replaceAll("\\","");
-                s.replace("\\","");
-                Log.e("datas===",s);
+                s.replace("\\", "");
+                Log.e("datas===", s);
                 JSONObject resultObject = JSON.parseObject(s);
                 JSONArray dataArray = resultObject.getJSONArray("data");
-                if (dataArray == null || dataArray.size() == 0){
-                        CommonUtil.toastNoRepeat(CommonSeclecActivity.this,"未搜索到匹配数据");
-                    }
-                    for(Object index:dataArray){
-                        //pi_emcode
-                        JSONObject data = (JSONObject) index;
-                        ComDataBean bean = new ComDataBean();
-                        bean.setEm_defaulthsname(data.getString("em_defaulthsname"));
-                        bean.setEm_depart(data.getString("em_depart"));
-                        bean.setEm_name(data.getString("em_name"));
-                        bean.setEm_id(data.getString("em_id"));
-                        bean.setEm_code(data.getString("em_code"));
-                        mList.add(bean);
-                    }
-                    myAdapter.setmList(mList);
-                    myAdapter.notifyDataSetChanged();
+                if (dataArray == null || dataArray.size() == 0) {
+                    CommonUtil.toastNoRepeat(CommonSeclecActivity.this, "未搜索到匹配数据");
+                }
+                for (Object index : dataArray) {
+                    //pi_emcode
+                    JSONObject data = (JSONObject) index;
+                    ComDataBean bean = new ComDataBean();
+                    bean.setEm_defaulthsname(data.getString("em_defaulthsname"));
+                    bean.setEm_depart(data.getString("em_depart"));
+                    bean.setEm_name(data.getString("em_name"));
+                    bean.setEm_id(data.getString("em_id"));
+                    bean.setEm_code(data.getString("em_code"));
+                    mList.add(bean);
+                }
 
+//                myAdapter.addData(mList);
+//                myAdapter.notifyDataSetChanged();
+                myAdapter.replaceData(mList);
+                myAdapter.loadMoreComplete();
+                mSearch.requestFocus();
+                mSearch.setSelection(mSearch.getText().length());
 
             }
+
             @Override
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(CommonSeclecActivity.this, failStr);
+                mSearch.requestFocus();
             }
         });
     }
 
 
-
-
-
-
     @Override
     public void onPointerCaptureChanged(boolean hasCapture) {
 
@@ -241,95 +230,25 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        switch (id){
+        switch (id) {
             case R.id.btn_actionbar_withback:
                 finish();
                 break;
-                default:
-                    break;
+            default:
+                break;
         }
     }
 
     //设置Actionbar标题
-    public  void setTitle(String title) {
+    public void setTitle(String title) {
         if (actionBarTextView == null) {
             CommonUtil.toastNoRepeat(this, "actionBarTextView == null");
             return;
         }
         actionBarTextView.setText(title);
-        mSearch.setHint("请输入要搜索的"+title);
+        mSearch.setHint("请输入要搜索的" + title);
     }
 
-    private class ComListAdapter extends BaseQuickAdapter<ComDataBean, BaseViewHolder> {
-        private List<ComDataBean> mmmmList;
-
-        public List<ComDataBean> getmList() {
-            return mmmmList;
-        }
-
-        public void setmList(List<ComDataBean> mList) {
-            this.mmmmList = mList;
-        }
-        public ComDataBean getBeanByPositon(int position){
-            return mmmmList.get(position);
-        }
 
-        private ComListAdapter(@Nullable List<ComDataBean> data) {
-            super(R.layout.fuzzy_search_item, data);
-            this.mmmmList = data;
-        }
-        @Override
-        protected void convert(BaseViewHolder helper, ComDataBean item) {
-            helper.setText(R.id.macode_Tv,item.getEm_depart()+"-");
-            helper.setText(R.id.remark_Tv,item.getEm_defaulthsname()+"-"+item.getEm_name());
-        }
-    }
-
-    private class ComDataBean{
-        String em_depart = null;
-        String em_name = null;
-        String em_id = null;
-        String em_code = null;
-        String em_defaulthsname=null;
-
-        public String getEm_defaulthsname() {
-            return em_defaulthsname;
-        }
-
-        public void setEm_defaulthsname(String em_defaulthsname) {
-            this.em_defaulthsname = em_defaulthsname;
-        }
-
-        public void setEm_code(String em_code) {
-            this.em_code = em_code;
-        }
-
-        public String getEm_code() {
-            return em_code;
-        }
-
-        public String getEm_id() {
-            return em_id;
-        }
-
-        public void setEm_id(String em_id) {
-            this.em_id = em_id;
-        }
-
-        public String getEm_name() {
-            return em_name;
-        }
-
-        public void setEm_name(String em_name) {
-            this.em_name = em_name;
-        }
-
-        public String getEm_depart() {
-            return em_depart;
-        }
-
-        public void setEm_depart(String em_depart) {
-            this.em_depart = em_depart;
-        }
-    }
 }
+

app/src/main/java/com/uas/uas_mes_zb_p/adapter/ConsignmentAdapter.java

@@ -0,0 +1,19 @@
+package com.uas.uas_mes_zb_p.adapter;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.uas.uas_mes_zb_p.R;
+import com.uas.uas_mes_zb_p.bean.ComDataBean;
+
+
+public class ConsignmentAdapter extends BaseQuickAdapter<ComDataBean, BaseViewHolder> {
+
+    public ConsignmentAdapter(int layoutResId) {
+        super(layoutResId);
+    }
+    @Override
+    protected void convert(BaseViewHolder helper, ComDataBean item) {
+        helper.setText(R.id.macode_Tv, item.getEm_depart() + "-");
+        helper.setText(R.id.remark_Tv, item.getEm_defaulthsname() + "-" + item.getEm_name());
+    }
+}

app/src/main/java/com/uas/uas_mes_zb_p/bean/ComDataBean.java

@@ -0,0 +1,62 @@
+package com.uas.uas_mes_zb_p.bean;
+
+/**
+ * Created by cjh-sail on 2022-10-21
+ */
+public class ComDataBean {
+    private String em_depart;
+    private String em_name;
+    private String em_id;
+    private String em_code;
+    private String em_defaulthsname;
+    public ComDataBean(){
+
+    }
+    public ComDataBean(String em_depart, String em_name, String em_id, String em_code, String em_defaulthsname) {
+        this.em_depart = em_depart;
+        this.em_name = em_name;
+        this.em_id = em_id;
+        this.em_code = em_code;
+        this.em_defaulthsname = em_defaulthsname;
+    }
+
+    public String getEm_defaulthsname() {
+        return em_defaulthsname;
+    }
+
+    public void setEm_defaulthsname(String em_defaulthsname) {
+        this.em_defaulthsname = em_defaulthsname;
+    }
+
+    public void setEm_code(String em_code) {
+        this.em_code = em_code;
+    }
+
+    public String getEm_code() {
+        return em_code;
+    }
+
+    public String getEm_id() {
+        return em_id;
+    }
+
+    public void setEm_id(String em_id) {
+        this.em_id = em_id;
+    }
+
+    public String getEm_name() {
+        return em_name;
+    }
+
+    public void setEm_name(String em_name) {
+        this.em_name = em_name;
+    }
+
+    public String getEm_depart() {
+        return em_depart;
+    }
+
+    public void setEm_depart(String em_depart) {
+        this.em_depart = em_depart;
+    }
+}

app/src/main/java/com/uas/uas_mes_zb_p/fragment/InventoryBindingFragment.java

@@ -2,6 +2,7 @@ package com.uas.uas_mes_zb_p.fragment;
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
@@ -18,6 +19,7 @@ import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -130,6 +132,7 @@ public class InventoryBindingFragment extends BaseFragment implements View.OnCli
     private CheckBox check_box_date;
     private CheckBox check_box_dc;
     private ClearableEditText jlt_edit_warehouse;
+    private InputMethodManager imm;
 
     public void setOnFinishListener(OnFinishListener onFinishListener) {
         mOnFinishListener = onFinishListener;
@@ -223,6 +226,7 @@ public class InventoryBindingFragment extends BaseFragment implements View.OnCli
         mStorageInTodoAdapter = new NewJLTStorageInTodoAdapter(mActivity);
         mFocusId = root.findFocus().getId();
         CheckBoxData();
+        imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
     }
 
     @Override
@@ -1128,14 +1132,17 @@ public class InventoryBindingFragment extends BaseFragment implements View.OnCli
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
-                mBarcodeEditText.setText(null);
-                mBarcodeEditText.requestFocus();
 //                check_box_positions.setChecked(true);
 //                check_box_lono.setChecked(true);
 //                check_box_date.setChecked(true);
 //                check_box_dc.setChecked(true);
             }
         });
+
+        mBarcodeEditText.selectAll();
+        mBarcodeEditText.requestFocus();
+        imm.showSoftInput(mBarcodeEditText, InputMethodManager.RESULT_HIDDEN);
+
     }
     //清空所有输入框
     private void resetState() {

app/src/main/java/com/uas/uas_mes_zb_p/fragment/OutboundListAdd_Fragment.java

@@ -1,6 +1,7 @@
 package com.uas.uas_mes_zb_p.fragment;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
@@ -13,6 +14,7 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -97,7 +99,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
     private ImageView outbound_search_im;
     private String bar_remain;
     private String pi_status;
-
+    private InputMethodManager imm;
     @Override
     protected int getLayout() {
         return R.layout.fragment_outboundlistadd;
@@ -130,7 +132,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
         ed_dial_a_levite = mActivity.findViewById(R.id.ed_dial_a_levite);
         outbound_search_im = mActivity.findViewById(R.id.outbound_search_im);
 
-
+        imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
     }
 
     @Override
@@ -160,6 +162,9 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
 
                     if (add_checkbos.isChecked()==true){
                         getDialogDatalistCodes(data,"");
+                        storage_recharge_collect_ets.selectAll();
+                        storage_recharge_collect_ets.requestFocus();
+                        imm.showSoftInput(storage_recharge_collect_ets, InputMethodManager.RESULT_HIDDEN);
                     }else if (ck_special_outbound.isChecked()==true){
                         getDatalistCodes(data);
                     }else {
@@ -250,6 +255,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                 jlt_storage_in_audit_btn.setEnabled(false);//审核
                 jlt_outbound_in_post_btn.setEnabled(false);//过账
                 storage_recharge_collect_ets.setFocusable(false);//条码框
+                storage_recharge_collect_ets.setEnabled(false);
                 outbound_search_im.setEnabled(false);//放大镜
             }else if (pi_statuscode.equals("UNPOST")){//未过账
                 if (pi_invostatuscode.equals("ENTERING")){//在录入
@@ -265,12 +271,14 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                     jlt_outbound_in_post_btn.setEnabled(true);//过账
                     outbound_search_im.setEnabled(false);//放大镜
                     storage_recharge_collect_ets.setFocusable(false);//条码框
+                    storage_recharge_collect_ets.setEnabled(false);
                 }else if (pi_invostatuscode.equals("AUDITED")){//已审核
                     jlt_storage_in_generate_detailed_btn.setEnabled(false);//明细
                     jlt_storage_in_barcode_save_btn.setEnabled(false);//提交
                     jlt_storage_in_audit_btn.setEnabled(false);//审核
                     jlt_outbound_in_post_btn.setEnabled(true);//过账
                     storage_recharge_collect_ets.setFocusable(false);//条码框
+                    storage_recharge_collect_ets.setEnabled(false);
                     outbound_search_im.setEnabled(false);//放大镜
                 }
             }
@@ -324,7 +332,6 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
-                storage_recharge_collect_ets.setText("");
                 String result = o.toString();
                 JSONObject resultObject = JSON.parseObject(result);
                 JSONObject dataObject = resultObject.getJSONObject("data");
@@ -340,11 +347,13 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
-                storage_recharge_collect_ets.setText("");
                 EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
 
             }
         });
+        storage_recharge_collect_ets.selectAll();
+        storage_recharge_collect_ets.requestFocus();
+        imm.showSoftInput(storage_recharge_collect_ets, InputMethodManager.RESULT_HIDDEN);
     }
 
     /**
@@ -378,7 +387,6 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
-                storage_recharge_collect_ets.setText("");
                 String result = o.toString();
                 JSONObject resultObject = JSON.parseObject(result);
                 JSONObject dataObject = resultObject.getJSONObject("data");
@@ -424,7 +432,6 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
-                storage_recharge_collect_ets.setText("");
 
             }
         });
@@ -591,6 +598,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                             jlt_storage_in_audit_btn.setEnabled(false);//审核
                             jlt_outbound_in_post_btn.setEnabled(false);//过账
                             storage_recharge_collect_ets.setFocusable(false);//条码框
+                            storage_recharge_collect_ets.setEnabled(false);
                         }else if (pi_statuscode.equals("UNPOST")){//未过账
                             if (pi_invostatuscode.equals("ENTERING")){//在录入
                                 jlt_storage_in_generate_detailed_btn.setEnabled(true);//明细
@@ -604,12 +612,14 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                                 jlt_storage_in_audit_btn.setEnabled(true);//审核
                                 jlt_outbound_in_post_btn.setEnabled(true);//过账
                                 storage_recharge_collect_ets.setFocusable(false);//条码框
+                                storage_recharge_collect_ets.setEnabled(false);
                             }else if (pi_invostatuscode.equals("AUDITED")){//已审核
                                 jlt_storage_in_generate_detailed_btn.setEnabled(false);//明细
                                 jlt_storage_in_barcode_save_btn.setEnabled(false);//提交
                                 jlt_storage_in_audit_btn.setEnabled(false);//审核
                                 jlt_outbound_in_post_btn.setEnabled(true);//过账
                                 storage_recharge_collect_ets.setFocusable(false);//条码框
+                                storage_recharge_collect_ets.setEnabled(false);
                             }
                         }
 

app/src/main/java/com/uas/uas_mes_zb_p/fragment/StoragerechargeAdd_Fragment.java

@@ -1,6 +1,7 @@
 package com.uas.uas_mes_zb_p.fragment;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -9,6 +10,7 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ImageView;
@@ -71,6 +73,7 @@ public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColum
     private CheckBox add_checkbos;
     private Button jlt_storage_in_generate_detailed_btn;
     private Button jlt_storage_in_audit_btn;
+    private InputMethodManager imm;
 
     @Override
     protected int getLayout() {
@@ -92,6 +95,8 @@ public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColum
         add_checkbos = mActivity.findViewById(R.id.add_checkbos);
         jlt_storage_in_generate_detailed_btn = mActivity.findViewById(R.id.jlt_storage_in_generate_detailed_btn);
         jlt_storage_in_audit_btn = mActivity.findViewById(R.id.jlt_storage_in_audit_btn);
+        imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
+
     }
 
     @Override
@@ -186,10 +191,12 @@ public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColum
             }else if (va_status.equals("已审核")){
                 jlt_storage_in_generate_detailed_btn.setEnabled(false);
                 storage_recharge_collect_ets.setFocusable(false);
+                storage_recharge_collect_ets.setEnabled(false);
                 tv_delivery_code.setEnabled(false);
             }else if (va_status.equals("已提交")){
                 jlt_storage_in_generate_detailed_btn.setEnabled(false);
                 storage_recharge_collect_ets.setFocusable(false);
+                storage_recharge_collect_ets.setEnabled(false);
                 tv_delivery_code.setEnabled(false);
                 jlt_storage_in_audit_btn.setEnabled(true);
                 jlt_storage_in_barcode_save_btn.setEnabled(false);
@@ -236,7 +243,9 @@ public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColum
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
-                storage_recharge_collect_ets.setText("");
+                storage_recharge_collect_ets.selectAll();
+                storage_recharge_collect_ets.requestFocus();
+
                 String result = o.toString();
                 JSONObject resultObject = JSON.parseObject(result);
                 JSONObject dataObject = resultObject.getJSONObject("data");
@@ -250,9 +259,11 @@ public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColum
                     }else {
                         jlt_storage_in_generate_detailed_btn.setEnabled(true);
                     }
-
+                    CommonUtil.toastNoRepeat(mActivity,"采集成功");
                     EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
                     getDataCommitList(va_id);
+
+
                 }
 
             }
@@ -261,11 +272,14 @@ public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColum
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
-                storage_recharge_collect_ets.setText("");
                 EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
+                storage_recharge_collect_ets.selectAll();
+                storage_recharge_collect_ets.requestFocus();
 
             }
+
         });
+        imm.showSoftInput(storage_recharge_collect_ets, InputMethodManager.RESULT_HIDDEN);
     }
 
     private void commitDataCodes(){//提交
@@ -381,12 +395,14 @@ public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColum
                         }else if (va_statuscode.equals("COMMITED")){
                             jlt_storage_in_generate_detailed_btn.setEnabled(false);
                             storage_recharge_collect_ets.setFocusable(false);
+                            storage_recharge_collect_ets.setEnabled(false);
                             tv_delivery_code.setEnabled(false);
                             jlt_storage_in_audit_btn.setEnabled(true);
                             jlt_storage_in_barcode_save_btn.setEnabled(false);
                         }else if (va_statuscode.equals("AUDITED")){
                             jlt_storage_in_generate_detailed_btn.setEnabled(false);
                             storage_recharge_collect_ets.setFocusable(false);
+                            storage_recharge_collect_ets.setEnabled(false);
                             tv_delivery_code.setEnabled(false);
                             jlt_storage_in_barcode_save_btn.setEnabled(false);
                             jlt_storage_in_audit_btn.setEnabled(false);

app/src/main/java/com/uas/uas_mes_zb_p/fragment/StoragerechargeTwo_fragment.java

@@ -292,6 +292,9 @@ public class StoragerechargeTwo_fragment extends BaseFragment implements OnColum
         Button storageButton = (Button) view.findViewById(R.id.pop_storage_recharge_menu_3);
         Button storageButtonadd = (Button) view.findViewById(R.id.pop_storage_recharge_menu_4);
         mFragment = new StorageRechargeListFragment();
+        doneButton.setVisibility(View.GONE);
+        todoButton.setVisibility(View.GONE);
+        storageButton.setVisibility(View.GONE);
 
         doneButton.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -64,14 +64,24 @@
         android:layout_marginTop="6dp"
         android:background="@drawable/bg_line_edittext">
 
+<!--        <com.uas.uas_mes_zb_p.view.ClearableEditText-->
+<!--            android:id="@+id/jlt_storage_in_barcode_barcode_et"-->
+<!--            style="@style/EditTextStyle"-->
+<!--            android:layout_weight="1"-->
+<!--            android:background="@null"-->
+<!--            android:focusable="true"-->
+<!--            android:selectAllOnFocus="true"-->
+<!--            android:hint="请采集条码号/二维码"-->
+<!--            android:imeOptions="actionSend"-->
+<!--            android:textColor="@color/black" />-->
         <com.uas.uas_mes_zb_p.view.ClearableEditText
             android:id="@+id/jlt_storage_in_barcode_barcode_et"
             style="@style/EditTextStyle"
             android:layout_weight="1"
             android:background="@null"
             android:focusable="true"
-            android:selectAllOnFocus="true"
-            android:hint="请采集条码号/二维码"
+            android:focusableInTouchMode="true"
+            android:hint="请采集条码"
             android:imeOptions="actionSend"
             android:textColor="@color/black" />
 

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

@@ -19,15 +19,25 @@
             android:layout_height="wrap_content"
             android:background="@drawable/bg_line_edittext">
 
+<!--            <com.uas.uas_mes_zb_p.view.ClearableEditText-->
+<!--                android:id="@+id/storage_recharge_collect_ets"-->
+<!--                style="@style/EditTextStyle"-->
+<!--                android:layout_weight="1"-->
+<!--                android:background="@null"-->
+<!--                android:focusable="true"-->
+<!--                android:lines="1"-->
+<!--                android:focusableInTouchMode="true"-->
+<!--                android:hint="请采集单号"-->
+<!--                android:imeOptions="actionSend"-->
+<!--                android:textColor="@color/black" />-->
             <com.uas.uas_mes_zb_p.view.ClearableEditText
                 android:id="@+id/storage_recharge_collect_ets"
                 style="@style/EditTextStyle"
                 android:layout_weight="1"
                 android:background="@null"
                 android:focusable="true"
-                android:lines="1"
                 android:focusableInTouchMode="true"
-                android:hint="请采集单号"
+                android:hint="请采集条码"
                 android:imeOptions="actionSend"
                 android:textColor="@color/black" />
 

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

@@ -4,6 +4,14 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/white">
+    <CheckBox
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_10"
+        android:id="@+id/add_checkbos"
+        android:text="取消采集"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+    </CheckBox>
     <LinearLayout
         android:padding="@dimen/sp_16"
         android:paddingLeft="@dimen/sp_16"
@@ -17,15 +25,25 @@
             android:layout_height="wrap_content"
             android:background="@drawable/bg_line_edittext">
 
+<!--            <com.uas.uas_mes_zb_p.view.ClearableEditText-->
+<!--                android:id="@+id/storage_recharge_collect_ets"-->
+<!--                style="@style/EditTextStyle"-->
+<!--                android:layout_weight="1"-->
+<!--                android:background="@null"-->
+<!--                android:focusable="true"-->
+<!--                android:lines="1"-->
+<!--                android:focusableInTouchMode="true"-->
+<!--                android:hint="请采集单号"-->
+<!--                android:imeOptions="actionSend"-->
+<!--                android:textColor="@color/black" />-->
             <com.uas.uas_mes_zb_p.view.ClearableEditText
                 android:id="@+id/storage_recharge_collect_ets"
                 style="@style/EditTextStyle"
                 android:layout_weight="1"
                 android:background="@null"
                 android:focusable="true"
-                android:lines="1"
                 android:focusableInTouchMode="true"
-                android:hint="请采集单号"
+                android:hint="请采集条码"
                 android:imeOptions="actionSend"
                 android:textColor="@color/black" />
 
@@ -39,13 +57,7 @@
                 android:src="@drawable/ic_edittext_scan" />
 
         </LinearLayout>
-        <CheckBox
-            android:layout_gravity="center"
-            android:id="@+id/add_checkbos"
-            android:text="取消采集"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-        </CheckBox>
+
     </LinearLayout>
     <ScrollView
         android:layout_weight="1"

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

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    >
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_centerHorizontal="true"