入库扫描界面：品牌输入框隐藏、增加勾选框、选中时显示条码号录入框、增加条码号录入框

增加输入框：LotNo、DataeCode、DC、数量
增加保存按钮
接口对接

app/src/main/java/com/uas/uas_mes_standard/adapter/NewJLTStorageInTodoAdapter.java

@@ -77,7 +77,7 @@ public class NewJLTStorageInTodoAdapter extends SecondaryListAdapter<NewJLTStora
     public void onBindSubViewHolder(RecyclerView.ViewHolder holder, int groupItemIndex, int subItemIndex) {
         try {
             JLTStorageModelBean jltStorageModelBean = mDatas.get(groupItemIndex).getSubItems().get(subItemIndex);
-            ((SubItemViewHolder) holder).modelTextView.setText(jltStorageModelBean.getModel());
+            ((SubItemViewHolder) holder).modelTextView.setText(jltStorageModelBean.getPrcode());
             ((SubItemViewHolder) holder).quantityTextView.setText(jltStorageModelBean.getQuantity());
             ((SubItemViewHolder) holder).doneQtyTextView.setText(jltStorageModelBean.getDoneQty());
             ((SubItemViewHolder) holder).donebrandTextView.setText(jltStorageModelBean.getPr_brand());

app/src/main/java/com/uas/uas_mes_standard/bean/JLTStorageModelBean.java

@@ -12,6 +12,15 @@ public class JLTStorageModelBean {
     private String mDoneQty;
     private String location;
     private String pr_brand;
+    private String prcode;
+
+    public String getPrcode() {
+        return prcode;
+    }
+
+    public void setPrcode(String prcode) {
+        this.prcode = prcode;
+    }
 
     public String getPr_brand() {
         return pr_brand;

app/src/main/java/com/uas/uas_mes_standard/bean/JltSaveBarCodeBean.java

@@ -0,0 +1,156 @@
+package com.uas.uas_mes_standard.bean;
+
+import java.io.Serializable;
+
+/**
+ * Created by jsxiaoshui on 2022-07-14
+ */
+public class JltSaveBarCodeBean implements Serializable {
+
+    private boolean success;
+    private DataBean data;
+
+
+    public JltSaveBarCodeBean(boolean success, DataBean data) {
+        this.success = success;
+        this.data = data;
+    }
+    public JltSaveBarCodeBean() {
+
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public DataBean getData() {
+        return data;
+    }
+
+    public void setData(DataBean data) {
+        this.data = data;
+    }
+
+    public static class DataBean implements Serializable {
+        private String prodcode_ve;
+        private String datecode;
+        private String lotno;
+        private String qty;
+        private String lc;
+        private String barcode;
+        private String parsecode;
+        private String prodcode;
+        private String pkg;
+        private String pn;
+        private String dc;
+        public DataBean(){
+
+        }
+
+        public DataBean(String prodcode_ve, String datecode, String lotno, String qty, String lc, String barcode, String parsecode, String prodcode, String pkg, String pn, String dc) {
+            this.prodcode_ve = prodcode_ve;
+            this.datecode = datecode;
+            this.lotno = lotno;
+            this.qty = qty;
+            this.lc = lc;
+            this.barcode = barcode;
+            this.parsecode = parsecode;
+            this.prodcode = prodcode;
+            this.pkg = pkg;
+            this.pn = pn;
+            this.dc = dc;
+        }
+
+        public String getProdcode_ve() {
+            return prodcode_ve;
+        }
+
+        public void setProdcode_ve(String prodcode_ve) {
+            this.prodcode_ve = prodcode_ve;
+        }
+
+        public String getDatecode() {
+            return datecode;
+        }
+
+        public void setDatecode(String datecode) {
+            this.datecode = datecode;
+        }
+
+        public String getLotno() {
+            return lotno;
+        }
+
+        public void setLotno(String lotno) {
+            this.lotno = lotno;
+        }
+
+        public String getQty() {
+            return qty;
+        }
+
+        public void setQty(String qty) {
+            this.qty = qty;
+        }
+
+        public String getLc() {
+            return lc;
+        }
+
+        public void setLc(String lc) {
+            this.lc = lc;
+        }
+
+        public String getBarcode() {
+            return barcode;
+        }
+
+        public void setBarcode(String barcode) {
+            this.barcode = barcode;
+        }
+
+        public String getParsecode() {
+            return parsecode;
+        }
+
+        public void setParsecode(String parsecode) {
+            this.parsecode = parsecode;
+        }
+
+        public String getProdcode() {
+            return prodcode;
+        }
+
+        public void setProdcode(String prodcode) {
+            this.prodcode = prodcode;
+        }
+
+        public String getPkg() {
+            return pkg;
+        }
+
+        public void setPkg(String pkg) {
+            this.pkg = pkg;
+        }
+
+        public String getPn() {
+            return pn;
+        }
+
+        public void setPn(String pn) {
+            this.pn = pn;
+        }
+
+        public String getDc() {
+            return dc;
+        }
+
+        public void setDc(String dc) {
+            this.dc = dc;
+        }
+    }
+}

app/src/main/java/com/uas/uas_mes_standard/fragment/JLTStorageInBarcodeFragment.java

@@ -23,6 +23,8 @@ import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -30,6 +32,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.google.gson.Gson;
 import com.uas.uas_mes_standard.R;
 import com.uas.uas_mes_standard.activity.FunctionActivity;
 import com.uas.uas_mes_standard.adapter.JLTSearchWhcodeAdapter;
@@ -41,6 +44,7 @@ import com.uas.uas_mes_standard.bean.JLTBrandEntity;
 import com.uas.uas_mes_standard.bean.JLTMpqEntity;
 import com.uas.uas_mes_standard.bean.JLTPkgEntity;
 import com.uas.uas_mes_standard.bean.JLTStorageModelBean;
+import com.uas.uas_mes_standard.bean.JltSaveBarCodeBean;
 import com.uas.uas_mes_standard.bean.WhcodeBean;
 import com.uas.uas_mes_standard.global.GloableParams;
 import com.uas.uas_mes_standard.listener.MyEditorActionListener;
@@ -98,6 +102,16 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
     private TextView mTypeTextView;
     private NewJLTStorageInTodoAdapter mStorageInTodoAdapter;
     private RecyclerView mRecyclerView;
+    private CheckBox jlt_check_ok;
+    private LinearLayout jlt_storage_in_barcode_line;
+    private ClearableEditText jlt_storage_in_barcode_et;
+    private int mFocusId;
+    private RadioGroup mMenuRadioGroup;
+    private RadioButton mInfoRadioButton;
+    private RadioButton mSignRadioButton;
+    private LinearLayout jlt_line_edit;
+    private ClearableEditText clear_edit_lotno;
+
     public void setOnFinishListener(OnFinishListener onFinishListener) {
         mOnFinishListener = onFinishListener;
     }
@@ -135,6 +149,20 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         mEnclosureEditText = root.findViewById(R.id.jlt_storage_in_barcode_enclosure_et);
         mEnclosureFitlerIv = root.findViewById(R.id.jlt_storage_in_barcode_enclosure_filter_iv);
 
+        jlt_check_ok = root.findViewById(R.id.jlt_check_ok);
+        //条码框
+        jlt_storage_in_barcode_line = root.findViewById(R.id.jlt_storage_in_barcode_line);
+        jlt_storage_in_barcode_et = root.findViewById(R.id.jlt_storage_in_barcode_et);
+        //RadioGroup
+        mMenuRadioGroup = root.findViewById(R.id.jlt_pick_material_out_scan_menu_rg);
+        mInfoRadioButton = root.findViewById(R.id.jlt_pick_material_out_scan_info_rb);
+        mSignRadioButton = root.findViewById(R.id.jlt_pick_material_out_scan_sign_rb);
+        jlt_line_edit = root.findViewById(R.id.jlt_line_edit);
+
+        //输入框
+        //LotNo
+        clear_edit_lotno = root.findViewById(R.id.clear_edit_lotno);
+
         mBarcodeParseBean = new JLTBarcodeParseBean();
         mBarcodeParseBean.setCHECKPO("N");
 
@@ -157,6 +185,8 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
         mRecyclerView.addItemDecoration(new RecyclerItemDecoration(2));
         mStorageInTodoAdapter = new NewJLTStorageInTodoAdapter(mActivity);
+        mFocusId = root.findFocus().getId();
+        CheckBoxData();
     }
 
     @Override
@@ -293,8 +323,32 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
 
             }
         });
+        mMenuRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                if (checkedId == R.id.jlt_pick_material_out_scan_info_rb) {
+                    mRecyclerView.setVisibility(View.GONE);
+                    jlt_line_edit.setVisibility(View.VISIBLE);
+                } else if (checkedId == R.id.jlt_pick_material_out_scan_sign_rb) {
+                    mRecyclerView.setVisibility(View.VISIBLE);
+                    jlt_line_edit.setVisibility(View.GONE);
+                }
+            }
+        });
 
-
+    }
+    public void CheckBoxData(){
+        jlt_check_ok.setChecked(true);
+        jlt_check_ok.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked==true){
+                    jlt_storage_in_barcode_line.setVisibility(View.VISIBLE);
+                }else {
+                    jlt_storage_in_barcode_line.setVisibility(View.GONE);
+                }
+            }
+        });
     }
 
     @Override
@@ -329,14 +383,14 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             CommonUtil.toastNoRepeat(getContext(),"请输入条码号");
             return;
         }
-        if (TextUtils.isEmpty(mModelEditTexttrim)){
-            CommonUtil.toastNoRepeat(getContext(),"请输入品牌");
-            return;
-        }
-        if (TextUtils.isEmpty(mLotEditTexttrim)){
-            CommonUtil.toastNoRepeat(getContext(),"请输入仓位");
-            return;
-        }
+//        if (TextUtils.isEmpty(mModelEditTexttrim)){
+//            CommonUtil.toastNoRepeat(getContext(),"请输入品牌");
+//            return;
+//        }
+//        if (TextUtils.isEmpty(mLotEditTexttrim)){
+//            CommonUtil.toastNoRepeat(getContext(),"请输入仓位");
+//            return;
+//        }
 
 
         progressDialog.show();
@@ -731,14 +785,14 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             CommonUtil.toastNoRepeat(getContext(),"请输入条码号");
             return;
         }
-        if (TextUtils.isEmpty(mModelEditTexttrim)){
-            CommonUtil.toastNoRepeat(getContext(),"请输入品牌");
-            return;
-        }
-        if (TextUtils.isEmpty(mLotEditTexttrim)){
-            CommonUtil.toastNoRepeat(getContext(),"请输入仓位");
-            return;
-        }
+//        if (TextUtils.isEmpty(mModelEditTexttrim)){
+//            CommonUtil.toastNoRepeat(getContext(),"请输入品牌");
+//            return;
+//        }
+//        if (TextUtils.isEmpty(mLotEditTexttrim)){
+//            CommonUtil.toastNoRepeat(getContext(),"请输入仓位");
+//            return;
+//        }
         progressDialog.show();
 //        String jsonString = JSON.toJSONString(mBarcodeParseBean);
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
@@ -754,60 +808,70 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
-                try {
+//                try {
                     String result = o.toString();
                     JSONObject resultObject = JSON.parseObject(result);
                     JSONObject dataObject = resultObject.getJSONObject("data");
+                    Gson gson = new Gson();
+                    String s = gson.toJson(o.toString());
                     if (dataObject != null) {
-                        boolean isCheck = FastjsonUtil.getBoolean(dataObject, "isCheck");
-                        if (!isCheck) {
-                            new AlertDialog.Builder(mActivity)
-                                    .setTitle("提示")
-                                    .setMessage("PO：" + mBarcodeParseBean.getORDERCODE() + "不在当前入库单据范围内，是否继续保存？")
-                                    .setNegativeButton("取消", null)
-                                    .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            mPoCheckBox.setChecked(false);
-                                            saveBarcode(exist, false);
-                                        }
-                                    }).create().show();
-                            return;
-                        }
+                        JltSaveBarCodeBean jltSaveBarCodeBean = gson.fromJson(s, JltSaveBarCodeBean.class);
+                        JltSaveBarCodeBean.DataBean data = jltSaveBarCodeBean.getData();
+                        String qty = data.getQty();
+                        clear_edit_lotno.setText(qty);
+                        Log.e("qtyText",qty);
+
 
-                        CommonUtil.toastNoRepeat(mActivity, "归属入库单："
-                                + FastjsonUtil.getText(dataObject, "INOUTNO")
-                                + "成功");
-
-                        boolean isFinish = FastjsonUtil.getBoolean(dataObject, "ISFINISH");
-                        if (isFinish) {
-                            CommonUtil.toastNoRepeat(mActivity, "该入库单最后一行已完成采集！");
-                            mBarcodeEditText.setText("");
-                            mBarcodeEditText.requestFocus();
-//                            resetState();
-//                            getActivity().getSupportFragmentManager().popBackStackImmediate();
-//                            if (mOnFinishListener != null) {
-//                                mOnFinishListener.onFinish();
-//                            }
-                        } else {
-                            if (exist) {
-                                getActivity().getSupportFragmentManager().popBackStack();
-                            } else {
-                                mBarcodeEditText.setText("");
-                                mBarcodeEditText.requestFocus();
-//                                resetState();
-                            }
-                        }
                     }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-//                resetState();
-                mBarcodeEditText.requestFocus();
-                if (!TextUtils.isEmpty(mPiid)) {
-                    getNeedList();
-                    Log.e("刷新","舒心入库俩啊");
-                }
+//                        boolean isCheck = FastjsonUtil.getBoolean(dataObject, "isCheck");
+//                        if (!isCheck) {
+//                            new AlertDialog.Builder(mActivity)
+//                                    .setTitle("提示")
+//                                    .setMessage("PO：" + mBarcodeParseBean.getORDERCODE() + "不在当前入库单据范围内，是否继续保存？")
+//                                    .setNegativeButton("取消", null)
+//                                    .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+//                                        @Override
+//                                        public void onClick(DialogInterface dialog, int which) {
+//                                            mPoCheckBox.setChecked(false);
+//                                            saveBarcode(exist, false);
+//                                        }
+//                                    }).create().show();
+//                            return;
+//                        }
+//
+//                        CommonUtil.toastNoRepeat(mActivity, "归属入库单："
+//                                + FastjsonUtil.getText(dataObject, "INOUTNO")
+//                                + "成功");
+//
+//                        boolean isFinish = FastjsonUtil.getBoolean(dataObject, "ISFINISH");
+//                        if (isFinish) {
+//                            CommonUtil.toastNoRepeat(mActivity, "该入库单最后一行已完成采集！");
+//                            mBarcodeEditText.setText("");
+//                            mBarcodeEditText.requestFocus();
+////                            resetState();
+////                            getActivity().getSupportFragmentManager().popBackStackImmediate();
+////                            if (mOnFinishListener != null) {
+////                                mOnFinishListener.onFinish();
+////                            }
+//                        } else {
+//                            if (exist) {
+//                                getActivity().getSupportFragmentManager().popBackStack();
+//                            } else {
+//                                mBarcodeEditText.setText("");
+//                                mBarcodeEditText.requestFocus();
+////                                resetState();
+//                            }
+//                        }
+//                    }
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
+////                resetState();
+//                mBarcodeEditText.requestFocus();
+//                if (!TextUtils.isEmpty(mPiid)) {
+//                    getNeedList();
+//                    Log.e("刷新","舒心入库俩啊");
+//                }
             }
 
             @Override
@@ -869,6 +933,11 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 modelParse();
             }
         }
+        if (mFocusId==R.id.jlt_storage_in_barcode_et){
+            String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+            jlt_storage_in_barcode_et.setText(result);
+            jlt_storage_in_barcode_et.setSelection(result.length());
+        }
     }
 
     /**
@@ -1194,11 +1263,11 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                                     if (modelObject != null) {
                                         JLTStorageModelBean jltStorageModelBean = new JLTStorageModelBean();
                                         jltStorageModelBean.setModel(FastjsonUtil.getText(modelObject, "ORISPECCODE"));
-//                                        jltStorageModelBean.setProdcode(FastjsonUtil.getText(modelObject,"PD_PRODCODE"));
+                                        jltStorageModelBean.setProdcode(FastjsonUtil.getText(modelObject,"PD_PRODCODE"));
                                         jltStorageModelBean.setQuantity(FastjsonUtil.getText(modelObject, "RESTQTY"));
                                         jltStorageModelBean.setDoneQty(FastjsonUtil.getText(modelObject, "PBQTY"));
                                         jltStorageModelBean.setPr_brand(FastjsonUtil.getText(modelObject, "PR_BRAND"));
-
+                                        jltStorageModelBean.setPrcode(FastjsonUtil.getText(modelObject, "PRCODE"));
                                         jltStorageModelBeans.add(jltStorageModelBean);
                                     }
                                 }

app/src/main/java/com/uas/uas_mes_standard/fragment/MaterialInCollectFragment.java

@@ -450,6 +450,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
      * 获取相应条码号或箱号的物料信息
      */
     private void getCodeData() {
+        Log.e("xxxxxx","进入方法");
         mBarcodeEditText.setEnabled(false);
         String barcode = mBarcodeEditText.getText().toString().trim();
         if (TextUtils.isEmpty(barcode)) {
@@ -484,23 +485,27 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
             url = GloableParams.ADDRESS_INMATERIAL_GETCODEDATA + "?type=barcode&pi_id=" + mPiid
                     + "&whcode=" + URLEncoder.encode(mWhcode, "utf-8")
                     + "&code=" + URLEncoder.encode(mBarcodeEditText.getText().toString().trim(), "utf-8");
+            Log.e("xxxxxx","进入拼接1");
             if ("barcode".equals(mCollectType)) {
                 url = GloableParams.ADDRESS_INMATERIAL_GETCODEDATA + "?type=barcode&pi_id=" + mPiid
                         + "&whcode=" + URLEncoder.encode(mWhcode, "utf-8")
                         + "&code=" + URLEncoder.encode(mBarcodeEditText.getText().toString().trim(), "utf-8")
                         +"&datas="+URLEncoder.encode(datasJson, "utf-8");
+                Log.e("xxxxxx","进入拼接2");
             } else if ("package".equals(mCollectType)) {
                 url = GloableParams.ADDRESS_INMATERIAL_GETCODEDATA + "?type=package&pi_id=" + mPiid
                         + "&whcode=" + URLEncoder.encode(mWhcode, "utf-8")
                         + "&code=" + URLEncoder.encode(mBarcodeEditText.getText().toString().trim(), "utf-8")
                         +"&datas="+URLEncoder.encode(datasJson, "utf-8");
+                Log.e("xxxxxx","进入拼接3");
             }
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
-            Log.e("UnsupportedEncoding:===",e.toString());
         }
         mResultTextView.setText(null);
+        Log.e("xxxxxx","展厅1");
         PdaApplication.mRequestQueue.cancelAll(TAG + "codedata");
+        Log.e("xxxxxx","展厅2");
         mStringRequest = new StringRequest(Request.Method.GET, url,
                 new Response.Listener<String>() {
                     @Override
@@ -578,6 +583,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                             e.printStackTrace();
                         }
                         mIgnoreFocusChange = false;
+                        Log.e("xxxxxx","请求成功");
                     }
                 },
                 new Response.ErrorListener() {
@@ -590,6 +596,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                         mBarcodeEditText.setText(null);
                         mBarcodeEditText.requestFocus();
                         mIgnoreFocusChange = false;
+                        Log.e("xxxxxx","请求失败");
                     }
                 }) {
             @Override

app/src/main/java/com/uas/uas_mes_standard/fragment/MaterialOutRevocationStockFragment.java

@@ -10,25 +10,39 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
+import com.android.volley.AuthFailureError;
+import com.android.volley.DefaultRetryPolicy;
 import com.android.volley.Request;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.JsonObjectRequest;
 import com.android.volley.toolbox.JsonRequest;
-import com.android.volley.toolbox.StringRequest;
 import com.uas.uas_mes_standard.R;
 import com.uas.uas_mes_standard.activity.FunctionActivity;
+import com.uas.uas_mes_standard.application.PdaApplication;
+import com.uas.uas_mes_standard.bean.RevocationStockMultipleBean;
 import com.uas.uas_mes_standard.global.GloableParams;
 import com.uas.uas_mes_standard.tools.SharedPreUtil;
+import com.uas.uas_mes_standard.tools.VolleyUtil;
 import com.uas.uas_mes_standard.util.CameraUtil;
 import com.uas.uas_mes_standard.util.CommonUtil;
 import com.uas.uas_mes_standard.util.Constants;
-import com.uas.uas_mes_standard.util.FastjsonUtil;
-import com.uas.uas_mes_standard.util.HttpCallback;
-import com.uas.uas_mes_standard.util.HttpParams;
-import com.uas.uas_mes_standard.util.VollyRequest;
+import com.uas.uas_mes_standard.util.JsonUtils;
+import com.uas.uas_mes_standard.util.LogUtil;
 import com.uas.uas_mes_standard.view.ClearableEditText;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 材料出库撤销备料页面
  * Created by RaoMeng on 2017/3/14.
@@ -42,11 +56,10 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
     private String mRevokeType;
     private boolean isMultiple;
     private ImageView mScanImageView;
-    private StringRequest mStringRequest;
+
     private JsonRequest mJsonRequest;
     private int mFocusId;
     private OnRevocationSuccessListener mOnRevocationSuccessListener;
-
     public void setOnRevocationSuccessListener(OnRevocationSuccessListener onRevocationSuccessListener) {
         mOnRevocationSuccessListener = onRevocationSuccessListener;
     }
@@ -190,256 +203,194 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
         progressDialog.show();
         mResultTextView.setText(null);
         String barcode = mBarcodeEditText.getText().toString().trim();
-        VollyRequest.getInstance().stringRequest(mStringRequest,
-                new HttpParams.Builder()
-                        .url(GloableParams.ADDRESS_PDAIO_OUT_REVOKEBARCODE)
-                        .method(Request.Method.POST)
-                        .tag(TAG + "revokebarcode")
-                        .flag(0)
-                        .addParam("pi_id", mPiid)
-                        .addParam("barcode", barcode)
-                        .build(), new HttpCallback() {
+        String url = "";
+        if (mRevokeType != null) {
+            try {
+                url = GloableParams.ADDRESS_IN_DELETE_DETAIL + "?bi_piid=" + mPiid + "&whcode="
+                        + mWhcode + "&barcode=" + URLEncoder.encode(barcode, "utf-8");
+                if (mRevokeType.equals("byBarcode")) {
+                    if ("materialin".equals(mWhichPage)) {
+
+                        url = GloableParams.ADDRESS_IN_DELETE_DETAIL + "?bi_piid=" + mPiid
+                                + "&whcode=" + mWhcode + "&barcode=" + URLEncoder.encode(barcode, "utf-8");
+
+                    } else if ("materialout".equals(mWhichPage)) {
+//                        if (isMultiple) {
+                        if (true) {
+                            url = GloableParams.ADDRESS_OUT_MATERIAL_DELETE_DETAIL_DEAL + "?ids=" + mPiid
+                                    + "&barcode=" + URLEncoder.encode(barcode, "utf-8");
+                        } else {
+                            url = GloableParams.ADDRESS_OUT_MATERIAL_DELETE_DETAIL + "?bi_piid=" + mPiid
+                                    + "&whcode=" + mWhcode + "&barcode=" + URLEncoder.encode(barcode, "utf-8");
+                        }
+                    }
+
+                } else if (mRevokeType.equals("byBox")) {
+                    if ("materialin".equals(mWhichPage)) {
+                        url = GloableParams.ADDRESS_IN_DELETE_DETAIL + "?bi_piid=" + mPiid
+                                + "&whcode=" + mWhcode + "&outboxcode=" + URLEncoder.encode(barcode, "utf-8");
+                    } else if ("materialout".equals(mWhichPage)) {
+//                        if (isMultiple) {
+                        if (true) {
+                            url = GloableParams.ADDRESS_OUT_MATERIAL_DELETE_DETAIL_DEAL + "?ids=" + mPiid
+                                    + "&outboxcode=" + URLEncoder.encode(barcode, "utf-8");
+                        } else {
+                            url = GloableParams.ADDRESS_OUT_MATERIAL_DELETE_DETAIL + "?bi_piid=" + mPiid
+                                    + "&whcode=" + mWhcode + "&outboxcode=" + URLEncoder.encode(barcode, "utf-8");
+                        }
+                    }
+
+                }
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        }
+
+        PdaApplication.mRequestQueue.cancelAll(TAG + "revoke");
+
+        mJsonRequest = new JsonObjectRequest(Request.Method.GET, url, null,
+                new Response.Listener<JSONObject>() {
                     @Override
-                    public void onSuccess(int flag, Object o) throws Exception {
-                        try {
-                            progressDialog.dismiss();
-                            mResultTextView.setVisibility(View.VISIBLE);
-
-                            String result = o.toString();
-                            com.alibaba.fastjson.JSONObject resultObject = JSON.parseObject(result);
-                            com.alibaba.fastjson.JSONObject dataObject = resultObject.getJSONObject("data");
-                            if (dataObject != null) {
-                                if (mOnRevocationSuccessListener != null) {
-                                    mOnRevocationSuccessListener.onRevocationSuccess();
-                                }
-                                String barcodeResult
-                                        = "撤销备料成功!\n料号：" + FastjsonUtil.getText(dataObject, "BI_PRODCODE")
-                                        + "；品牌：" + FastjsonUtil.getText(dataObject, "BI_BRAND")
-                                        + "；名称规格：" + FastjsonUtil.getText(dataObject, "PR_DETAIL")
-                                        + "  " + FastjsonUtil.getText(dataObject, "PR_SPEC")
-                                        + "；数量：" + FastjsonUtil.getText(dataObject, "sumQty")
-                                        + "；lotno：" + FastjsonUtil.getText(dataObject, "BI_LOTNO")
-                                        + "；Datecode：" + FastjsonUtil.getText(dataObject, "BI_DATECODE")
-                                        + "；PO：" + FastjsonUtil.getText(dataObject, "BI_ORDERCODE");
-
-                                if (mResultTextView != null) {
-                                    mResultTextView.setText(barcodeResult);
+                    public void onResponse(JSONObject jsonObject) {
+                        LogUtil.i("revokeResult", jsonObject.toString());
+                        progressDialog.dismiss();
+                        mResultTextView.setVisibility(View.VISIBLE);
+                        if ("materialin".equals(mWhichPage)) {
+                            mResultTextView.setText(jsonObject.optString("data"));
+                            mBarcodeEditText.setText(null);
+                            mBarcodeEditText.requestFocus();
+                            CommonUtil.toastNoRepeat(getActivity(), "撤销入库成功");
+                        } else if ("materialout".equals(mWhichPage)) {
+//                            if (isMultiple) {
+                            if (true) {
+                                try {
+                                    JSONArray dataArray = jsonObject.optJSONArray("data");
+                                    if (dataArray != null && dataArray.length() > 0) {
+                                        List<RevocationStockMultipleBean> revocationStockMultipleBeans = new ArrayList<>();
+                                        for (int i = 0; i < dataArray.length(); i++) {
+                                            JSONObject dataObject = dataArray.optJSONObject(i);
+                                            if (dataObject != null) {
+                                                RevocationStockMultipleBean revocationStockMultipleBean = new RevocationStockMultipleBean();
+                                                revocationStockMultipleBean.setBI_PIID(JsonUtils.optLongNotNull(dataObject, "BI_PIID"));
+                                                revocationStockMultipleBean.setBI_INOUTNO(JsonUtils.optStringNotNull(dataObject, "BI_INOUTNO"));
+                                                revocationStockMultipleBean.setBI_OUTQTY(JsonUtils.optDoubleNotNull(dataObject, "BI_OUTQTY"));
+                                                revocationStockMultipleBean.setBI_WHCODE(JsonUtils.optStringNotNull(dataObject, "BI_WHCODE"));
+                                                revocationStockMultipleBean.setBI_PRODCODE(JsonUtils.optStringNotNull(dataObject, "BI_PRODCODE"));
+                                                revocationStockMultipleBean.setBI_BATCHCODE(JsonUtils.optStringNotNull(dataObject, "BI_BATCHCODE"));
+                                                revocationStockMultipleBean.setBARCODE(JsonUtils.optStringNotNull(dataObject, "BARCODE"));
+                                                revocationStockMultipleBean.setBARID(JsonUtils.optLongNotNull(dataObject, "BARID"));
+                                                revocationStockMultipleBean.setPR_DETAIL(JsonUtils.optStringNotNull(dataObject, "PR_DETAIL"));
+                                                revocationStockMultipleBean.setPR_SPEC(JsonUtils.optStringNotNull(dataObject, "PR_SPEC"));
+
+                                                revocationStockMultipleBeans.add(revocationStockMultipleBean);
+                                            }
+                                        }
+
+                                        if (revocationStockMultipleBeans.size() > 0) {
+                                            if (mRevokeType.equals("byBarcode")) {
+                                                String barcodeResult = "撤销备料成功；料号：" + revocationStockMultipleBeans.get(0).getBI_PRODCODE()
+                                                        + "；名称：" + revocationStockMultipleBeans.get(0).getPR_DETAIL()
+                                                        + "；规格：" + revocationStockMultipleBeans.get(0).getPR_SPEC()
+                                                        + "；仓库：" + revocationStockMultipleBeans.get(0).getBI_WHCODE();
+
+                                                for (int i = 0; i < revocationStockMultipleBeans.size(); i++) {
+                                                    barcodeResult = barcodeResult + "\n单号：" + revocationStockMultipleBeans.get(i).getBI_INOUTNO()
+                                                            + ",条码：" + revocationStockMultipleBeans.get(i).getBARCODE()
+                                                            + ",数量：" + CommonUtil.doubleFormat(revocationStockMultipleBeans.get(i).getBI_OUTQTY());
+                                                }
+
+                                                if (mResultTextView != null)
+                                                    mResultTextView.setText(barcodeResult);
+
+                                            } else if (mRevokeType.equals("byBox")) {
+                                                String boxResult = "撤销备料成功；料号：" + revocationStockMultipleBeans.get(0).getBI_PRODCODE()
+                                                        + "；名称：" + revocationStockMultipleBeans.get(0).getPR_DETAIL()
+                                                        + "；规格：" + revocationStockMultipleBeans.get(0).getPR_SPEC()
+                                                        + "；仓库：" + revocationStockMultipleBeans.get(0).getBI_WHCODE();
+
+                                                for (int i = 0; i < revocationStockMultipleBeans.size(); i++) {
+                                                    boxResult = boxResult + "\n单号：" + revocationStockMultipleBeans.get(i).getBI_INOUTNO()
+                                                            + ",条码：" + revocationStockMultipleBeans.get(i).getBARCODE()
+                                                            + ",数量：" + CommonUtil.doubleFormat(revocationStockMultipleBeans.get(i).getBI_OUTQTY());
+                                                }
+
+                                                if (mResultTextView != null)
+                                                    mResultTextView.setText(boxResult);
+
+                                            }
+                                        }
+
+                                    }
+
+                                    if (mBarcodeEditText != null) {
+                                        mBarcodeEditText.setText(null);
+                                        mBarcodeEditText.requestFocus();
+                                    }
+                                    CommonUtil.toastNoRepeat(mActivity, "撤销备料成功");
+                                } catch (Exception e) {
+
                                 }
+                            } else {
+                                try {
+                                    JSONObject messageObject = jsonObject.getJSONObject("data");
+                                    if (messageObject != null) {
+                                        if (mRevokeType.equals("byBarcode")) {
+                                            String barcodeResult = "撤销备料成功；条码：" + JsonUtils.optStringNotNull(messageObject, "BAR_CODE")
+                                                    + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
+                                                    + "；物料：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
+                                                    + "；名称规格：" + JsonUtils.optStringNotNull(messageObject, "PR_DETAIL")
+                                                    + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC")
+                                                    + "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
+                                                    + "；仓位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
+                                            if (mResultTextView != null)
+                                                mResultTextView.setText(barcodeResult);
+
+                                        } else if (mRevokeType.equals("byBox")) {
+                                            String boxResult = "撤销备料成功；箱号：" + JsonUtils.optStringNotNull(messageObject, "BAR_OUTBOXCODE1")
+                                                    + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
+                                                    + "；物料：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
+                                                    + "；名称规格：" + JsonUtils.optStringNotNull(messageObject, "PR_DETAIL")
+                                                    + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC");
+
+                                            if (mResultTextView != null)
+                                                mResultTextView.setText(boxResult);
 
-                                if (mBarcodeEditText != null) {
-                                    mBarcodeEditText.setText(null);
-                                    mBarcodeEditText.requestFocus();
+                                        }
+                                        if (mBarcodeEditText != null) {
+                                            mBarcodeEditText.setText(null);
+                                            mBarcodeEditText.requestFocus();
+                                        }
+                                        CommonUtil.toastNoRepeat(mActivity, "撤销备料成功");
+                                    }
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
                                 }
-                                CommonUtil.toastNoRepeat(mActivity, "撤销备料成功");
                             }
-                        } catch (Exception e) {
 
                         }
-                    }
 
+                    }
+                },
+                new Response.ErrorListener() {
                     @Override
-                    public void onFail(int flag, String failStr) throws Exception {
+                    public void onErrorResponse(VolleyError volleyError) {
                         progressDialog.dismiss();
-                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                        String errorToast = CommonUtil.showErrorToast(volleyError, true);
                         mBarcodeEditText.setText(null);
                         mBarcodeEditText.requestFocus();
                         mResultTextView.setVisibility(View.VISIBLE);
-                        mResultTextView.setText(failStr);
+                        mResultTextView.setText(errorToast);
                     }
-                });
+                }) {
+            @Override
+            public Map<String, String> getHeaders() throws AuthFailureError {
+                return VolleyUtil.getVolleyUtil().setCookies();
+            }
+        };
+        mJsonRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
+        mJsonRequest.setTag(TAG + "revoke");
+        PdaApplication.mRequestQueue.add(mJsonRequest);
     }
-//    private void revokeStock() {
-//        progressDialog.show();
-//        mResultTextView.setText(null);
-//        String barcode = mBarcodeEditText.getText().toString().trim();
-//        String url = "";
-//        if (mRevokeType != null) {
-//            try {
-//                url = GloableParams.ADDRESS_IN_DELETE_DETAIL + "?bi_piid=" + mPiid + "&whcode="
-//                        + mWhcode + "&barcode=" + URLEncoder.encode(barcode, "utf-8");
-//                if (mRevokeType.equals("byBarcode")) {
-//                    if ("materialin".equals(mWhichPage)) {
-//
-//                        url = GloableParams.ADDRESS_IN_DELETE_DETAIL + "?bi_piid=" + mPiid
-//                                + "&whcode=" + mWhcode + "&barcode=" + URLEncoder.encode(barcode, "utf-8");
-//
-//                    } else if ("materialout".equals(mWhichPage)) {
-////                        if (isMultiple) {
-//                        if (true) {
-//                            url = GloableParams.ADDRESS_OUT_MATERIAL_DELETE_DETAIL_DEAL + "?ids=" + mPiid
-//                                    + "&barcode=" + URLEncoder.encode(barcode, "utf-8");
-//                        } else {
-//                            url = GloableParams.ADDRESS_OUT_MATERIAL_DELETE_DETAIL + "?bi_piid=" + mPiid
-//                                    + "&whcode=" + mWhcode + "&barcode=" + URLEncoder.encode(barcode, "utf-8");
-//                        }
-//                    }
-//
-//                } else if (mRevokeType.equals("byBox")) {
-//                    if ("materialin".equals(mWhichPage)) {
-//                        url = GloableParams.ADDRESS_IN_DELETE_DETAIL + "?bi_piid=" + mPiid
-//                                + "&whcode=" + mWhcode + "&outboxcode=" + URLEncoder.encode(barcode, "utf-8");
-//                    } else if ("materialout".equals(mWhichPage)) {
-////                        if (isMultiple) {
-//                        if (true) {
-//                            url = GloableParams.ADDRESS_OUT_MATERIAL_DELETE_DETAIL_DEAL + "?ids=" + mPiid
-//                                    + "&outboxcode=" + URLEncoder.encode(barcode, "utf-8");
-//                        } else {
-//                            url = GloableParams.ADDRESS_OUT_MATERIAL_DELETE_DETAIL + "?bi_piid=" + mPiid
-//                                    + "&whcode=" + mWhcode + "&outboxcode=" + URLEncoder.encode(barcode, "utf-8");
-//                        }
-//                    }
-//
-//                }
-//            } catch (UnsupportedEncodingException e) {
-//                e.printStackTrace();
-//            }
-//        }
-//
-//        PdaApplication.mRequestQueue.cancelAll(TAG + "revoke");
-//
-//        mJsonRequest = new JsonObjectRequest(Request.Method.GET, url, null,
-//                new Response.Listener<JSONObject>() {
-//                    @Override
-//                    public void onResponse(JSONObject jsonObject) {
-//                        LogUtil.i("revokeResult", jsonObject.toString());
-//                        progressDialog.dismiss();
-//                        mResultTextView.setVisibility(View.VISIBLE);
-//                        if ("materialin".equals(mWhichPage)) {
-//                            mResultTextView.setText(jsonObject.optString("data"));
-//                            mBarcodeEditText.setText(null);
-//                            mBarcodeEditText.requestFocus();
-//                            CommonUtil.toastNoRepeat(getActivity(), "撤销入库成功");
-//                        } else if ("materialout".equals(mWhichPage)) {
-////                            if (isMultiple) {
-//                            if (true) {
-//                                try {
-//                                    JSONArray dataArray = jsonObject.optJSONArray("data");
-//                                    if (dataArray != null && dataArray.length() > 0) {
-//                                        List<RevocationStockMultipleBean> revocationStockMultipleBeans = new ArrayList<>();
-//                                        for (int i = 0; i < dataArray.length(); i++) {
-//                                            JSONObject dataObject = dataArray.optJSONObject(i);
-//                                            if (dataObject != null) {
-//                                                RevocationStockMultipleBean revocationStockMultipleBean = new RevocationStockMultipleBean();
-//                                                revocationStockMultipleBean.setBI_PIID(JsonUtils.optLongNotNull(dataObject, "BI_PIID"));
-//                                                revocationStockMultipleBean.setBI_INOUTNO(JsonUtils.optStringNotNull(dataObject, "BI_INOUTNO"));
-//                                                revocationStockMultipleBean.setBI_OUTQTY(JsonUtils.optDoubleNotNull(dataObject, "BI_OUTQTY"));
-//                                                revocationStockMultipleBean.setBI_WHCODE(JsonUtils.optStringNotNull(dataObject, "BI_WHCODE"));
-//                                                revocationStockMultipleBean.setBI_PRODCODE(JsonUtils.optStringNotNull(dataObject, "BI_PRODCODE"));
-//                                                revocationStockMultipleBean.setBI_BATCHCODE(JsonUtils.optStringNotNull(dataObject, "BI_BATCHCODE"));
-//                                                revocationStockMultipleBean.setBARCODE(JsonUtils.optStringNotNull(dataObject, "BARCODE"));
-//                                                revocationStockMultipleBean.setBARID(JsonUtils.optLongNotNull(dataObject, "BARID"));
-//                                                revocationStockMultipleBean.setPR_DETAIL(JsonUtils.optStringNotNull(dataObject, "PR_DETAIL"));
-//                                                revocationStockMultipleBean.setPR_SPEC(JsonUtils.optStringNotNull(dataObject, "PR_SPEC"));
-//
-//                                                revocationStockMultipleBeans.add(revocationStockMultipleBean);
-//                                            }
-//                                        }
-//
-//                                        if (revocationStockMultipleBeans.size() > 0) {
-//                                            if (mRevokeType.equals("byBarcode")) {
-//                                                String barcodeResult = "撤销备料成功；料号：" + revocationStockMultipleBeans.get(0).getBI_PRODCODE()
-//                                                        + "；名称：" + revocationStockMultipleBeans.get(0).getPR_DETAIL()
-//                                                        + "；规格：" + revocationStockMultipleBeans.get(0).getPR_SPEC()
-//                                                        + "；仓库：" + revocationStockMultipleBeans.get(0).getBI_WHCODE();
-//
-//                                                for (int i = 0; i < revocationStockMultipleBeans.size(); i++) {
-//                                                    barcodeResult = barcodeResult + "\n单号：" + revocationStockMultipleBeans.get(i).getBI_INOUTNO()
-//                                                            + ",条码：" + revocationStockMultipleBeans.get(i).getBARCODE()
-//                                                            + ",数量：" + CommonUtil.doubleFormat(revocationStockMultipleBeans.get(i).getBI_OUTQTY());
-//                                                }
-//
-//                                                if (mResultTextView != null)
-//                                                    mResultTextView.setText(barcodeResult);
-//
-//                                            } else if (mRevokeType.equals("byBox")) {
-//                                                String boxResult = "撤销备料成功；料号：" + revocationStockMultipleBeans.get(0).getBI_PRODCODE()
-//                                                        + "；名称：" + revocationStockMultipleBeans.get(0).getPR_DETAIL()
-//                                                        + "；规格：" + revocationStockMultipleBeans.get(0).getPR_SPEC()
-//                                                        + "；仓库：" + revocationStockMultipleBeans.get(0).getBI_WHCODE();
-//
-//                                                for (int i = 0; i < revocationStockMultipleBeans.size(); i++) {
-//                                                    boxResult = boxResult + "\n单号：" + revocationStockMultipleBeans.get(i).getBI_INOUTNO()
-//                                                            + ",条码：" + revocationStockMultipleBeans.get(i).getBARCODE()
-//                                                            + ",数量：" + CommonUtil.doubleFormat(revocationStockMultipleBeans.get(i).getBI_OUTQTY());
-//                                                }
-//
-//                                                if (mResultTextView != null)
-//                                                    mResultTextView.setText(boxResult);
-//
-//                                            }
-//                                        }
-//
-//                                    }
-//
-//                                    if (mBarcodeEditText != null) {
-//                                        mBarcodeEditText.setText(null);
-//                                        mBarcodeEditText.requestFocus();
-//                                    }
-//                                    CommonUtil.toastNoRepeat(mActivity, "撤销备料成功");
-//                                } catch (Exception e) {
-//
-//                                }
-//                            } else {
-//                                try {
-//                                    JSONObject messageObject = jsonObject.getJSONObject("data");
-//                                    if (messageObject != null) {
-//                                        if (mRevokeType.equals("byBarcode")) {
-//                                            String barcodeResult = "撤销备料成功；条码：" + JsonUtils.optStringNotNull(messageObject, "BAR_CODE")
-//                                                    + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
-//                                                    + "；物料：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
-//                                                    + "；名称规格：" + JsonUtils.optStringNotNull(messageObject, "PR_DETAIL")
-//                                                    + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC")
-//                                                    + "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
-//                                                    + "；仓位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
-//                                            if (mResultTextView != null)
-//                                                mResultTextView.setText(barcodeResult);
-//
-//                                        } else if (mRevokeType.equals("byBox")) {
-//                                            String boxResult = "撤销备料成功；箱号：" + JsonUtils.optStringNotNull(messageObject, "BAR_OUTBOXCODE1")
-//                                                    + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
-//                                                    + "；物料：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
-//                                                    + "；名称规格：" + JsonUtils.optStringNotNull(messageObject, "PR_DETAIL")
-//                                                    + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC");
-//
-//                                            if (mResultTextView != null)
-//                                                mResultTextView.setText(boxResult);
-//
-//                                        }
-//                                        if (mBarcodeEditText != null) {
-//                                            mBarcodeEditText.setText(null);
-//                                            mBarcodeEditText.requestFocus();
-//                                        }
-//                                        CommonUtil.toastNoRepeat(mActivity, "撤销备料成功");
-//                                    }
-//                                } catch (JSONException e) {
-//                                    e.printStackTrace();
-//                                }
-//                            }
-//
-//                        }
-//
-//                    }
-//                },
-//                new Response.ErrorListener() {
-//                    @Override
-//                    public void onErrorResponse(VolleyError volleyError) {
-//                        progressDialog.dismiss();
-//                        String errorToast = CommonUtil.showErrorToast(volleyError, true);
-//                        mBarcodeEditText.setText(null);
-//                        mBarcodeEditText.requestFocus();
-//                        mResultTextView.setVisibility(View.VISIBLE);
-//                        mResultTextView.setText(errorToast);
-//                    }
-//                }) {
-//            @Override
-//            public Map<String, String> getHeaders() throws AuthFailureError {
-//                return VolleyUtil.getVolleyUtil().setCookies();
-//            }
-//        };
-//        mJsonRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
-//        mJsonRequest.setTag(TAG + "revoke");
-//        PdaApplication.mRequestQueue.add(mJsonRequest);
-//    }
 
     private void changeToTypeBarcode() {
         mBarcodeEditText.setHint(R.string.please_collect_barcode);

app/src/main/java/com/uas/uas_mes_standard/global/GloableParams.java

@@ -272,8 +272,8 @@ public class GloableParams {
     /**
      * 条码信息采集
      */
-    private static final String ADDRESSTAIL_INMATERIAL_GETBARACCEPTCODE = "/api/pda/inMaterial/getBarAcceptCode.action";
-    private static final String ADDRESSTAIL_INMATERIAL_SAVEBARACCEPTCODE = "/api/pda/inMaterial/saveBarAcceptCode.action";
+    private static final String ADDRESSTAIL_INMATERIAL_GETBARACCEPTCODE = "/api/pda/inMaterial/getBarAcceptCodeByParse.action";
+    private static final String ADDRESSTAIL_INMATERIAL_SAVEBARACCEPTCODE = "/api/pda/inMaterial/saveBarAcceptCodeByParse.action";
 
     /**
      * BOM校验

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

@@ -8,6 +8,7 @@
     android:padding="@dimen/root_layout_padding">
 
     <LinearLayout
+        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -19,10 +20,19 @@
 
         <TextView
             android:id="@+id/jlt_storage_in_barcode_box_tv"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:textColor="#333333"
             tools:text="2138424923" />
+        <CheckBox
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:id="@+id/jlt_check_ok"
+            android:text="选中"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+        </CheckBox>
 
     </LinearLayout>
 
@@ -66,7 +76,7 @@
             android:orientation="vertical">
 
             <LinearLayout
-
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp">
@@ -98,6 +108,42 @@
                     android:paddingRight="10dp"
                     android:src="@drawable/ic_edittext_scan" />
             </LinearLayout>
+            <LinearLayout
+                android:id="@+id/jlt_storage_in_barcode_line"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp">
+
+                <TextView
+                    style="@style/tl_tv_style"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:minWidth="60dp"
+                    android:text="条码号"
+                    android:textColor="@color/body_text_1"
+                    android:textSize="16sp" />
+
+                <com.uas.uas_mes_standard.view.ClearableEditText
+                    android:id="@+id/jlt_storage_in_barcode_et"
+                    style="@style/EditTextStyle"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:hint="请采集条码号" />
+
+                <ImageView
+                    android:visibility="gone"
+                    android:id="@+id/jlt_storage_in_barcode_iv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:background="@color/white"
+                    android:clickable="false"
+                    android:paddingRight="10dp"
+                    android:src="@drawable/ic_edittext_scan" />
+            </LinearLayout>
+
+
+
 
             <LinearLayout
                 android:visibility="gone"
@@ -336,11 +382,129 @@
                 android:padding="10dp"
                 android:textColor="#333333"
                 tools:text="采购验收单" />
+            <RadioGroup
+                android:id="@+id/jlt_pick_material_out_scan_menu_rg"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingTop="6dp"
+                android:paddingBottom="6dp">
+
+                <RadioButton
+                    android:id="@+id/jlt_pick_material_out_scan_info_rb"
+                    android:layout_width="0dp"
+                    android:layout_height="30dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/selector_radio_bg"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="料盘信息"
+                    android:textColor="@color/selector_radio_text_color" />
 
+                <RadioButton
+                    android:id="@+id/jlt_pick_material_out_scan_sign_rb"
+                    android:layout_width="0dp"
+                    android:layout_height="30dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/selector_radio_bg"
+                    android:button="@null"
+                    android:checked="true"
+                    android:gravity="center"
+                    android:text="库位提示"
+                    android:textColor="@color/selector_radio_text_color" />
+            </RadioGroup>
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/jlt_storage_in_todo_list_rv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
+            <LinearLayout
+                android:visibility="gone"
+                android:id="@+id/jlt_line_edit"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        style="@style/tl_tv_style"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:minWidth="60dp"
+                        android:text="LotNo"
+                        android:textColor="@color/body_text_1"
+                        android:textSize="16sp" />
+
+                    <com.uas.uas_mes_standard.view.ClearableEditText
+                        android:id="@+id/clear_edit_lotno"
+                        style="@style/EditTextStyle"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:hint="请采集条码号" />
+
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        style="@style/tl_tv_style"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:minWidth="60dp"
+                        android:text="DataeCode"
+                        android:textColor="@color/body_text_1"
+                        android:textSize="16sp" />
+
+                    <com.uas.uas_mes_standard.view.ClearableEditText
+                        style="@style/EditTextStyle"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:hint="请采集条码号" />
+
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        style="@style/tl_tv_style"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:minWidth="60dp"
+                        android:text="DC"
+                        android:textColor="@color/body_text_1"
+                        android:textSize="16sp" />
+
+                    <com.uas.uas_mes_standard.view.ClearableEditText
+                        style="@style/EditTextStyle"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:hint="请采集条码号" />
+
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        style="@style/tl_tv_style"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:minWidth="60dp"
+                        android:text="数量"
+                        android:textColor="@color/body_text_1"
+                        android:textSize="16sp" />
+
+                    <com.uas.uas_mes_standard.view.ClearableEditText
+                        style="@style/EditTextStyle"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:hint="请采集条码号" />
+
+                </LinearLayout>
+            </LinearLayout>
 
 
 
@@ -366,7 +530,6 @@
             android:visibility="gone" />
 
         <Button
-            android:visibility="gone"
             android:id="@+id/jlt_storage_in_barcode_save_btn"
             style="@style/ButtonStyle"
             android:layout_width="0dp"

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

@@ -54,7 +54,8 @@
         android:layout_marginRight="10dp"
         android:background="@color/transparent"
         android:text="修改数量"
-        android:textSize="@dimen/app_text_size_body_2" />
+        android:textSize="@dimen/app_text_size_body_2"
+        android:visibility="gone"/>
 
     <Button
         android:id="@+id/pop_material_out_menu_5"
@@ -64,7 +65,8 @@
         android:layout_marginRight="10dp"
         android:background="@color/transparent"
         android:text="特殊出库"
-        android:textSize="@dimen/app_text_size_body_2" />
+        android:textSize="@dimen/app_text_size_body_2"
+        android:visibility="gone"/>
 
     <Button
         android:id="@+id/pop_material_out_menu_6"
@@ -74,5 +76,6 @@
         android:layout_marginRight="10dp"
         android:background="@color/transparent"
         android:text="单据过账"
-        android:textSize="@dimen/app_text_size_body_2" />
+        android:textSize="@dimen/app_text_size_body_2"
+        android:visibility="gone"/>
 </LinearLayout>