仓库管理接口逻辑

app/src/main/AndroidManifest.xml

@@ -21,7 +21,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/icon"
         android:label="@string/my_app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/PdaAppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="icon,label,theme">
 

app/src/main/java/com/uas/pda_wms/activity/IndexActivity.java

@@ -115,6 +115,9 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         }
     }
 
+    /**
+     * 获取验证要求
+     */
     private void getCheckSetting() {
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_JLT_JCOMMON_GETDBSETTING)

app/src/main/java/com/uas/pda_wms/fragment/BarcodeQtyModifyFragment.java

@@ -1,5 +1,6 @@
 package com.uas.pda_wms.fragment;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.text.TextUtils;
 import android.view.KeyEvent;
@@ -8,11 +9,16 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.android.volley.Request;
 import com.uas.pda_wms.R;
+import com.uas.pda_wms.global.GloableParams;
 import com.uas.pda_wms.listener.MyEditorActionListener;
 import com.uas.pda_wms.tools.RegexUtil;
 import com.uas.pda_wms.util.CommonUtil;
 import com.uas.pda_wms.util.Constants;
+import com.uas.pda_wms.util.HttpCallback;
+import com.uas.pda_wms.util.HttpParams;
+import com.uas.pda_wms.util.VolleyRequest;
 import com.uas.pda_wms.view.ClearableEditText;
 
 /**
@@ -76,22 +82,68 @@ public class BarcodeQtyModifyFragment extends BaseFragment {
         });
     }
 
-    private void modifyConfirm(String barcode, String qty) {
-        // TODO: 2019/8/7 条码修改
+    @Override
+    protected void initDatas() {
+
     }
 
     private void barcodeParse(String barcode) {
-        // TODO: 2019/8/7 条码解析
+        if (TextUtils.isEmpty(barcode)) {
+            return;
+        }
+        progressDialog.show();
+        mResultTextView.setText("");
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_WHMGT_CHECKMODIFYBARCODE)
+                .method(Request.Method.GET)
+                .tag(TAG + "checkbarcode")
+                .flag(0)
+                .addParam("barcode", barcode)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                mResultTextView.setText("");
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+                mResultTextView.setText(failStr);
+            }
+        });
     }
 
-    @Override
-    protected void initDatas() {
+    private void modifyConfirm(String barcode, String qty) {
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_WHMGT_MODIFYBARCODE)
+                .method(Request.Method.POST)
+                .addParam("barcode", barcode)
+                .addParam("newqty", qty)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                mResultTextView.setText("");
+                mBarcodeEditText.setText("");
+                mQtyEditText.setText("");
+                CommonUtil.toastNoRepeat(mActivity, "条码修改成功");
+            }
 
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+                mResultTextView.setText(failStr);
+            }
+        });
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == 0x11) {
+        if (requestCode == 0x11 && resultCode == Activity.RESULT_OK) {
             String scanResult = CommonUtil.getScanResult(data);
             mBarcodeEditText.setText(scanResult);
             mBarcodeEditText.setSelection(scanResult.length());

app/src/main/java/com/uas/pda_wms/fragment/BarcodeSplitFragment.java

@@ -1,5 +1,6 @@
 package com.uas.pda_wms.fragment;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.text.TextUtils;
 import android.view.KeyEvent;
@@ -104,8 +105,8 @@ public class BarcodeSplitFragment extends BaseFragment {
         }
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                .url("")
-                .method(Request.Method.GET)
+                .url(GloableParams.ADDRESS_WHMGT_BREAKBARCODE)
+                .method(Request.Method.POST)
                 .tag(TAG + "breakbarcode")
                 .flag(0)
                 .addParam("barcode", barcode)
@@ -179,7 +180,7 @@ public class BarcodeSplitFragment extends BaseFragment {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == SCAN_BARCODE_REQUEST) {
+        if (requestCode == SCAN_BARCODE_REQUEST && resultCode == Activity.RESULT_OK) {
             String scanResult = CommonUtil.getScanResult(data);
             mBarcodeEditText.setText(scanResult);
             mBarcodeEditText.setSelection(scanResult.length());

app/src/main/java/com/uas/pda_wms/fragment/BarcodeSplitUndoFragment.java

@@ -1,5 +1,6 @@
 package com.uas.pda_wms.fragment;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.KeyEvent;
@@ -76,7 +77,7 @@ public class BarcodeSplitUndoFragment extends BaseFragment {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == SCAN_BARCODE_REQUEST) {
+        if (requestCode == SCAN_BARCODE_REQUEST && resultCode == Activity.RESULT_OK) {
             String scanResult = CommonUtil.getScanResult(data);
             mBarcodeEditText.setText(scanResult);
             mBarcodeEditText.setSelection(scanResult.length());

app/src/main/java/com/uas/pda_wms/fragment/InventoryInquiryFragment.java

@@ -84,10 +84,12 @@ public class InventoryInquiryFragment extends BaseFragment {
             public void onCheckedChanged(RadioGroup group, int checkedId) {
                 if (checkedId == R.id.inventory_inquiry_location_rb) {
                     mBarcodeEditText.setText(mLocationText);
+                    mBarcodeEditText.setSelection(mLocationText == null ? 0 : mLocationText.length());
                     mTypeTextView.setText("库位/箱号");
                     setTableData(1);
                 } else if (checkedId == R.id.inventory_inquiry_model_rb) {
                     mBarcodeEditText.setText(mModelText);
+                    mBarcodeEditText.setSelection(mModelText == null ? 0 : mModelText.length());
                     mTypeTextView.setText("型号");
                     setTableData(2);
                 }
@@ -198,7 +200,7 @@ public class InventoryInquiryFragment extends BaseFragment {
     private void setTableData(int type) {
         List<JLTStorageModelBean> datalist = null;
         if (type == 1) {
-            mModelTextView.setText(mLocationText);
+            mModelTextView.setText(mLocationModel);
             mQtyTextView.setText(mLocationQty);
             mBoxQtyTextView.setText(mLocationBoxQty);
             datalist = mLocationDataList;

app/src/main/java/com/uas/pda_wms/fragment/JLTPickMaterialOutScanFragment.java

@@ -62,7 +62,7 @@ import java.util.Map;
 
 /**
  * Created by RaoMeng on 2019/2/25
- * Desc: 出库捡料扫描
+ * Desc: 出库扫描
  */
 public class JLTPickMaterialOutScanFragment extends BaseFragment implements View.OnClickListener, StorageOutTodoModelListFragment.OnItemSelectListener {
     private static final int SCAN_BARCODE_CODE = 101;
@@ -118,7 +118,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
 
     @Override
     protected void initViews() {
-        setTitle("出库捡料扫描");
+        setTitle("出库扫描");
         ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
 
         Bundle arguments = getArguments();
@@ -197,17 +197,28 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
 
         if (isInventory) {
             mOperateLinearLayout.setVisibility(View.VISIBLE);
-            mBarcodeEditText.requestFocus();
+            mBarcodeEditText.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    mBarcodeEditText.requestFocus();
+                }
+            }, 100);
+//            mNextButton.setVisibility(View.VISIBLE);
+            if ("BOX".equals(mPriorityMode)) {
+                mModeTextView.setText("外箱");
+                mNextButton.setVisibility(View.VISIBLE);
+            } else {
+                mModeTextView.setText("料盘");
+                mNextButton.setVisibility(View.GONE);
+            }
         } else {
             mOperateLinearLayout.setVisibility(View.GONE);
-            mModelEditText.requestFocus();
-        }
-
-        if ("BOX".equals(mPriorityMode)) {
-            mModeTextView.setText("外箱");
-            mNextButton.setVisibility(View.VISIBLE);
-        } else {
-            mModeTextView.setText("料盘");
+            mModelEditText.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    mModelEditText.requestFocus();
+                }
+            }, 100);
             mNextButton.setVisibility(View.GONE);
         }
     }
@@ -614,6 +625,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                 .url(GloableParams.ADDRESS_BAROUT_BARCODEPARSE)
                 .method(Request.Method.POST)
                 .tag(TAG + "barcodeparse")
+                .flag(0)
                 .addParam("pi_id", mPiid)
                 .addParam("pn", mMaterialBean.getBAR_MPN())
                 .addParam("pkg", mMaterialBean.getPKG())
@@ -736,11 +748,11 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                                 if ("外箱".equals(mode)) {
                                     mModeTextView.setText("料盘");
                                     mPriorityMode = "PAN";
-                                    mNextButton.setVisibility(View.VISIBLE);
+                                    mNextButton.setVisibility(View.GONE);
                                 } else {
                                     mModeTextView.setText("外箱");
                                     mPriorityMode = "BOX";
-                                    mNextButton.setVisibility(View.GONE);
+                                    mNextButton.setVisibility(View.VISIBLE);
                                 }
                                 resetState(true);
                             }
@@ -1042,7 +1054,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
         if (hidden) {
             ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
         } else {
-            setTitle("出库捡料扫描");
+            setTitle("出库扫描");
             ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
             mMoreButton.setOnClickListener(this);
         }

app/src/main/java/com/uas/pda_wms/fragment/JLTRevokeBoxFragment.java

@@ -1,5 +1,7 @@
 package com.uas.pda_wms.fragment;
 
+import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -7,6 +9,7 @@ import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -37,6 +40,7 @@ import java.util.List;
 public class JLTRevokeBoxFragment extends BaseFragment {
     private ClearableEditText mBoxEditText;
     private Button mConfirmButton;
+    private ImageView mScanImageView;
     private TextView mResultTextView;
     private RecyclerView mRecyclerView;
     private String mPiids;
@@ -58,6 +62,7 @@ public class JLTRevokeBoxFragment extends BaseFragment {
         mBoxEditText = root.findViewById(R.id.pda_wms_in_box_scan_box_et);
         mBoxEditText.requestFocus();
         mConfirmButton = root.findViewById(R.id.pda_wms_in_box_scan_confirm_btn);
+        mScanImageView = root.findViewById(R.id.pda_wms_in_box_scan_box_scan_iv);
         mResultTextView = root.findViewById(R.id.pda_wms_in_box_scan_result_tv);
         mRecyclerView = root.findViewById(R.id.pda_wms_in_box_scan_result_rv);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
@@ -83,6 +88,13 @@ public class JLTRevokeBoxFragment extends BaseFragment {
                 deleteOutBox();
             }
         });
+
+        mScanImageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.scanBarcode(mActivity, JLTRevokeBoxFragment.this, 0x33);
+            }
+        });
     }
 
     @Override
@@ -192,6 +204,16 @@ public class JLTRevokeBoxFragment extends BaseFragment {
         });
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == 0x33 && resultCode == Activity.RESULT_OK) {
+            String scanResult = CommonUtil.getScanResult(data);
+            mBoxEditText.setText(scanResult);
+            mBoxEditText.setSelection(scanResult.length());
+            getOutBoxData();
+        }
+    }
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         return false;

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

@@ -1279,11 +1279,18 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                             try {
                                 if (!TextUtils.isEmpty(mpq)) {
                                     double mpqNum = Double.parseDouble(mpq);
-                                    double pan = qty / mpqNum;
-                                    mPanEditText.setText(CommonUtil.doubleFormat(Math.ceil(pan)));
+                                    if (mpqNum <= 0) {
+                                        mPanEditText.setText("0");
+                                    } else {
+                                        double pan = qty / mpqNum;
+                                        mPanEditText.setText(CommonUtil.doubleFormat(Math.ceil(pan)));
+                                    }
+                                } else {
+                                    mPanEditText.setText("0");
                                 }
                             } catch (Exception e) {
                                 e.printStackTrace();
+                                mPanEditText.setText("0");
                             }
                         }
                     } catch (Exception e) {

app/src/main/java/com/uas/pda_wms/fragment/JltStorageInFilterListFragment.java

@@ -187,6 +187,9 @@ public class JltStorageInFilterListFragment extends BaseFragment implements JLTS
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (mIgnoreChange) {
+                    return;
+                }
                 String filter = s.toString().trim();
                 if (TextUtils.isEmpty(filter)) {
                     mFilterStorageInBeans = mStorageInBeans;
@@ -240,7 +243,10 @@ public class JltStorageInFilterListFragment extends BaseFragment implements JLTS
         mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
             @Override
             public void onRefresh(RefreshLayout refreshLayout) {
+                mIgnoreChange = true;
                 getInDataList();
+                mSearchCet.setText("");
+                mIgnoreChange = false;
             }
         });
     }

app/src/main/java/com/uas/pda_wms/fragment/LoginFragment.java

@@ -212,6 +212,7 @@ public class LoginFragment extends BaseFragment implements AdapterView.OnItemSel
                 } else {
                     pwdEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
                 }
+                pwdEditText.setSelection(pwdEditText.getText().toString().length());
             }
         });
 

app/src/main/java/com/uas/pda_wms/fragment/TransferWhcodeFragment.java

@@ -1,5 +1,6 @@
 package com.uas.pda_wms.fragment;
 
+import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Handler;
@@ -355,7 +356,7 @@ public class TransferWhcodeFragment extends BaseFragment {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == SCAN_BARCODE_REQUEST) {
+        if (requestCode == SCAN_BARCODE_REQUEST && resultCode == Activity.RESULT_OK) {
             String result = CommonUtil.getScanResult(data);
             mBarcodeEditText.setText(result);
             mBarcodeEditText.setSelection(result.length());

app/src/main/java/com/uas/pda_wms/fragment/WHRevokeStockFragment.java

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -51,14 +52,16 @@ import java.util.Map;
 
 /**
  * Created by RaoMeng on 2017/6/16.
- * <p/>
  * 撤销拆分页面
+ * modify:2019/08/09
+ * 页面修改
  */
 public class WHRevokeStockFragment extends BaseFragment {
     private TextView mBarcodeTextView, mProdcodeTextView, mSpecTextView, mWhcodeTextView, mBatchTextView, mQuantityTextView, mBatchQuantityTextView;
     private CheckBox mSelectAllCheckBox;
     private TextView mInSelectTextView, mInQuantityTextView, mOutQuantityTextView, mTotalQuantityTextView, mRevokeButton;
     private ClearableEditText mBarcodeEditText;
+    private ImageView mScanImageView;
     private Button mConfirmButton;
     private boolean mIgnoreChange;
     private MostListView mInListView, mOutListView;
@@ -111,7 +114,6 @@ public class WHRevokeStockFragment extends BaseFragment {
 
     @Override
     protected void initViews() {
-        root.setBackgroundColor(getResources().getColor(R.color.background_color_second));
         FunctionActivity.setTitle("撤销拆分");
 
         mBarcodeTextView = (TextView) root.findViewById(R.id.revoke_stock_barcode_tv);
@@ -138,6 +140,7 @@ public class WHRevokeStockFragment extends BaseFragment {
         mBackProdcodeTextView = (TextView) root.findViewById(R.id.revoke_stock_back_prodcode_tv);
         mBackSpecTextView = (TextView) root.findViewById(R.id.revoke_stock_back_spec_tv);
         mBackQuantityTextView = (TextView) root.findViewById(R.id.revoke_stock_back_quantity_tv);
+        mScanImageView = root.findViewById(R.id.revoke_stock_scan_iv);
 
         mBarcodeEditText.requestFocus();
 
@@ -219,6 +222,13 @@ public class WHRevokeStockFragment extends BaseFragment {
             }
         });
 
+        mScanImageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.scanBarcode(mActivity, WHRevokeStockFragment.this, SCAN_BARCODE_CODE);
+            }
+        });
+
         mConfirmButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -305,6 +315,9 @@ public class WHRevokeStockFragment extends BaseFragment {
 
     private void getSonBarcode() {
         String barcode = mBarcodeEditText.getText().toString().trim();
+        if (TextUtils.isEmpty(barcode)) {
+            return;
+        }
         progressDialog.show();
         mSonBarcodeView.setVisibility(View.GONE);
         mMenuLayout.setVisibility(View.GONE);
@@ -434,6 +447,7 @@ public class WHRevokeStockFragment extends BaseFragment {
                 String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
                 mBarcodeEditText.setText(result);
                 mBarcodeEditText.setSelection(result.length());
+                getSonBarcode();
             }
         }
     }

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

@@ -238,6 +238,9 @@ public class GloableParams {
     public static String ADDRESS_WHMGT_CHECKBREAKBARCODE;
     public static String ADDRESS_WHMGT_GETOUTBOXLIST;
     public static String ADDRESS_WHMGT_REMOVEOUTBOX;
+    public static String ADDRESS_WHMGT_CHECKMODIFYBARCODE;
+    public static String ADDRESS_WHMGT_MODIFYBARCODE;
+    public static String ADDRESS_WHMGT_BREAKBARCODE;
 
     /**
      * WMS标准版
@@ -310,6 +313,16 @@ public class GloableParams {
     private static final String ADDRESSTAIL_WHMGT_REMOVEOUTBOX = "/api/pda/whmgt/removeOutbox.action";
     //拆分-条码校验
     private static final String ADDRESSTAIL_WHMGT_CHECKBREAKBARCODE = "/api/pda/whmgt/checkBreakBarcode.action";
+    //拆分-条码拆分
+    private static final String ADDRESSTAIL_WHMGT_BREAKBARCODE = "/api/pda/whmgt/breakBarcode.action";
+    //条码修改-条码校验
+    private static final String ADDRESSTAIL_WHMGT_CHECKMODIFYBARCODE = "/api/pda/whmgt/checkModifyBarcode.action";
+    //条码修改-确认修改
+    private static final String ADDRESSTAIL_WHMGT_MODIFYBARCODE = "/api/pda/whmgt/modifyBarcode.action";
+    //仓库管理：获取原条码信息以及拆分的子条码数据
+    private static final String ADDRESSTAIL_BATCH_GET_SON_BARCODE = "/api/pda/whmgt/getSonBarcode.action";
+    //仓库管理：撤销拆分
+    private static final String ADDRESSTAIL_BATCH_BACK_BREAKING = "/api/pda/whmgt/rebackBreakBarcode.action";
 
     /**
      * 吉利通
@@ -478,10 +491,6 @@ public class GloableParams {
     private static final String ADDRESSTAIL_WHTRANSFER_DATA = "/api/pda/transfer/getCodeData.action";
     //储位转移：请求诸位转移
     private static final String ADDRESSTAIL_WHTRANSFER = "/api/pda/transfer/locaTransfer.action";
-    //仓库管理：获取原条码信息以及拆分的子条码数据
-    private static final String ADDRESSTAIL_BATCH_GET_SON_BARCODE = "/api/pda/batch/getSonBarcode.action";
-    //仓库管理：撤销拆分
-    private static final String ADDRESSTAIL_BATCH_BACK_BREAKING = "/api/pda/batch/backBreaking.action";
 
 
     // 货物查询:包装信息核查页面
@@ -1038,5 +1047,8 @@ public class GloableParams {
         GloableParams.ADDRESS_WHMGT_CHECKBREAKBARCODE = uriHead + GloableParams.ADDRESSTAIL_WHMGT_CHECKBREAKBARCODE;
         GloableParams.ADDRESS_WHMGT_GETOUTBOXLIST = uriHead + GloableParams.ADDRESSTAIL_WHMGT_GETOUTBOXLIST;
         GloableParams.ADDRESS_WHMGT_REMOVEOUTBOX = uriHead + GloableParams.ADDRESSTAIL_WHMGT_REMOVEOUTBOX;
+        GloableParams.ADDRESS_WHMGT_CHECKMODIFYBARCODE = uriHead + GloableParams.ADDRESSTAIL_WHMGT_CHECKMODIFYBARCODE;
+        GloableParams.ADDRESS_WHMGT_MODIFYBARCODE = uriHead + GloableParams.ADDRESSTAIL_WHMGT_MODIFYBARCODE;
+        GloableParams.ADDRESS_WHMGT_BREAKBARCODE = uriHead + GloableParams.ADDRESSTAIL_WHMGT_BREAKBARCODE;
     }
 }

app/src/main/java/com/uas/pda_wms/util/VolleyRequest.java

@@ -92,7 +92,7 @@ public class VolleyRequest {
             }
         }
 
-        PdaApplication.mRequestQueue.cancelAll(httpParams.getTag());
+        PdaApplication.mRequestQueue.cancelAll(httpParams.getUrl());
 
         stringRequest = new StringRequest(httpParams.getMethod(), url,
                 new Response.Listener<String>() {
@@ -134,14 +134,20 @@ public class VolleyRequest {
             @Override
             protected Map<String, String> getParams() throws AuthFailureError {
                 if (httpParams.getMethod() == Method.POST) {
-                    return httpParams.getParams();
+                    Map<String, String> params = httpParams.getParams();
+                    for (String key : params.keySet()) {
+                        if (params.get(key) == null) {
+                            params.put(key, "");
+                        }
+                    }
+                    return params;
                 }
                 return super.getParams();
             }
         };
 
         stringRequest.setRetryPolicy(new DefaultRetryPolicy(timeoutMs, 0, 1f));
-        stringRequest.setTag(httpParams.getTag());
+        stringRequest.setTag(httpParams.getUrl());
         PdaApplication.mRequestQueue.add(stringRequest);
     }
 }

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

@@ -276,6 +276,7 @@
         android:id="@+id/pick_material_out_scan_info_sv"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:background="@color/white"
         android:layout_weight="1"
         android:visibility="visible">
 
@@ -505,14 +506,14 @@
             android:id="@+id/jlt_pick_material_out_scan_next_btn"
             style="@style/ButtonStyle"
             android:layout_width="0dp"
-            android:layout_margin="14dp"
+            android:layout_margin="@null"
+            android:layout_marginLeft="14dp"
+            android:layout_marginTop="14dp"
+            android:layout_marginRight="40dp"
+            android:layout_marginBottom="14dp"
             android:layout_weight="1"
             android:text="保存并下一箱" />
 
-        <View
-            android:layout_width="26dp"
-            android:layout_height="match_parent" />
-
         <Button
             android:id="@+id/jlt_pick_material_out_scan_save_btn"
             style="@style/ButtonStyle"

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

@@ -11,37 +11,39 @@
         android:layout_height="wrap_content">
 
         <TextView
-            style="@style/tl_tv_style"
-            android:layout_width="70dp"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:text="箱号"
-            android:paddingLeft="8dp"
-            android:textColor="@color/body_text_1"
-            android:textSize="14sp" />
-
-        <com.uas.pda_wms.view.ClearableEditText
-            android:id="@+id/pda_wms_in_box_scan_box_et"
-            style="@style/EditTextStyle"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:background="@drawable/shape_form_input"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:hint="需要撤销采集的箱号"
-            android:imeOptions="actionSend"
-            android:textColor="@color/black" />
+            style="@style/formCaptionStyle"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="箱号" />
 
-    </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_form_input">
 
-    <Button
-        android:id="@+id/pda_wms_in_box_scan_confirm_btn"
-        style="@style/ButtonStyle"
-        android:layout_marginTop="14dp"
-        android:enabled="false"
-        android:text="确认撤销采集" />
+            <com.uas.pda_wms.view.ClearableEditText
+                android:id="@+id/pda_wms_in_box_scan_box_et"
+                style="@style/formInputStyle"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:background="@null"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="需要撤销采集的箱号" />
 
 
+            <ImageView
+                android:id="@+id/pda_wms_in_box_scan_box_scan_iv"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:background="@null"
+                android:clickable="false"
+                android:paddingRight="10dp"
+                android:src="@drawable/ic_edittext_scan" />
+        </LinearLayout>
+    </LinearLayout>
+
     <TextView
         android:id="@+id/pda_wms_in_box_scan_result_tv"
         android:layout_width="match_parent"
@@ -49,13 +51,24 @@
         android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:layout_marginRight="10dp"
+        android:lineSpacingExtra="4dp"
+        android:textColor="#333333"
+        android:textSize="14sp"
         android:visibility="visible"
         tools:text="采集成功，条码：786528238；数量：2；料号：209837；名称规格：瓶子" />
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/pda_wms_in_box_scan_result_rv"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp" />
+        android:layout_marginRight="10dp"
+        android:layout_weight="1" />
+
+    <Button
+        android:id="@+id/pda_wms_in_box_scan_confirm_btn"
+        style="@style/ButtonStyle"
+        android:layout_marginTop="14dp"
+        android:enabled="false"
+        android:text="确认撤销采集" />
 </LinearLayout>

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

@@ -427,6 +427,7 @@
             android:id="@+id/pda_wms_in_barcode_next_btn"
             style="@style/ButtonStyle"
             android:layout_width="0dp"
+            android:layout_margin="@null"
             android:layout_marginLeft="30dp"
             android:layout_marginTop="12dp"
             android:layout_marginRight="30dp"
@@ -440,6 +441,7 @@
             android:id="@+id/pda_wms_in_barcode_save_btn"
             style="@style/ButtonStyle"
             android:layout_width="0dp"
+            android:layout_margin="@null"
             android:layout_marginLeft="30dp"
             android:layout_marginTop="12dp"
             android:layout_marginRight="30dp"

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

@@ -53,15 +53,14 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:paddingBottom="12dp">
+        android:layout_gravity="right|center_vertical"
+        android:paddingBottom="6dp">
 
         <TextView
             android:id="@+id/pda_wms_in_filter_list_delete_tv"
             style="@style/ButtonStyle"
             android:layout_width="100dp"
             android:layout_height="36dp"
-            android:layout_centerVertical="true"
             android:background="@drawable/bg_button_red"
             android:text="删除"
             android:textSize="14sp"
@@ -72,8 +71,6 @@
             style="@style/ButtonStyle"
             android:layout_width="100dp"
             android:layout_height="36dp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
             android:text="合并入库"
             android:textSize="14sp" />
     </LinearLayout>

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

@@ -33,7 +33,7 @@
                 android:hint="请输入原条码" />
 
             <ImageView
-                android:id="@+id/storage_in_barcode_model_iv"
+                android:id="@+id/revoke_stock_scan_iv"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="center"

app/src/main/res/values/styles.xml

@@ -1,8 +1,9 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="PdaAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
+        <item name="android:windowBackground">@color/white</item>
     </style>
 
     <style name="root_layout_style">