入库采集撤销采集界面返回上一界面时去除右上角列表按钮

app/src/main/java/com/uas/hy_electronic/fragment/IOCOutMakeMaterialOper.java

@@ -1587,6 +1587,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             FunctionActivity.setTitle(getResources().getString(R.string.out_material_collect));
             ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
             ((FunctionActivity) getActivity()).setScanIvVisible(true);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
             mScanImageView.setOnClickListener(this);
             etBarCode.requestFocus();
 
@@ -1596,6 +1597,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         } else {
             ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
             ((FunctionActivity) getActivity()).setScanIvVisible(false);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
         }
     }
 

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

@@ -1454,7 +1454,7 @@ public class InventoryBindingFragment extends BaseFragment implements View.OnCli
         if (hidden) {
             ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
         } else {
-            ((FunctionActivity) getActivity()).setTitle("库存条码绑定");
+            FunctionActivity.setTitle("库存条码绑定");
 //            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
             mMoreButton.setOnClickListener(this);
         }

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

@@ -1,13 +1,19 @@
 package com.uas.hy_electronic.fragment;
 
 import android.app.Activity;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.android.volley.AuthFailureError;
@@ -27,8 +33,11 @@ import com.uas.hy_electronic.tools.VolleyUtil;
 import com.uas.hy_electronic.util.CameraUtil;
 import com.uas.hy_electronic.util.CommonUtil;
 import com.uas.hy_electronic.util.Constants;
+import com.uas.hy_electronic.util.HttpCallback;
+import com.uas.hy_electronic.util.HttpParams;
 import com.uas.hy_electronic.util.JsonUtils;
 import com.uas.hy_electronic.util.LogUtil;
+import com.uas.hy_electronic.util.VollyRequest;
 import com.uas.hy_electronic.view.ClearableEditText;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
@@ -42,6 +51,7 @@ import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 材料出库撤销备料页面
@@ -60,6 +70,8 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
     private JsonRequest mJsonRequest;
     private int mFocusId;
     private OnRevocationSuccessListener mOnRevocationSuccessListener;
+    private ImageView btn_actionbar_list_icon_iv;
+
     public void setOnRevocationSuccessListener(OnRevocationSuccessListener onRevocationSuccessListener) {
         mOnRevocationSuccessListener = onRevocationSuccessListener;
     }
@@ -70,13 +82,14 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
 
     @Override
     protected void initViews() {
+        ((FunctionActivity) getActivity()).setListIconIvVisible(true);
         mInoutnoTextView = (TextView) root.findViewById(R.id.material_out_revocation_stock_inoutno);
         mWhcodeTextView = (TextView) root.findViewById(R.id.material_out_revocation_stock_whcode);
         mTypeTextView = (TextView) root.findViewById(R.id.material_out_revocation_stock_type);
         mResultTextView = (TextView) root.findViewById(R.id.material_out_revocation_stock_result);
         mBarcodeEditText = (ClearableEditText) root.findViewById(R.id.material_out_revocation_stock_barcode);
         mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
-
+        btn_actionbar_list_icon_iv = (ImageView) getActivity().findViewById(R.id.btn_actionbar_list_icon_iv);
         mBarcodeEditText.requestFocus();
         Bundle bundle = getArguments();
         if (bundle != null) {
@@ -117,6 +130,12 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
 
     @Override
     protected void initEvents() {
+        btn_actionbar_list_icon_iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showDialog();
+            }
+        });
 //        if (!isMultiple) {
 //        if (mWhichPage.equals("materialin")) {
         mTypeTextView.setOnClickListener(new View.OnClickListener() {
@@ -162,6 +181,83 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
         });
     }
 
+    private PopupWindow listPopupWindow;
+    private void showDialog(){
+        View materialOutMoreView = View.inflate(getActivity(), R.layout.pop_material_out_revocation_menu, null);
+        Button stockTaskBtn = (Button) materialOutMoreView.findViewById(R.id.pop_material_out_menu_1);
+        stockTaskBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                closeListPopupWindow();
+                new AlertDialog.Builder(mActivity)
+                        .setMessage("是否确认一键取消备货？")
+                        .setNegativeButton(R.string.cancel, null)
+                        .setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                dialogInterface.dismiss();
+                                OneKeyNo();
+
+                            }
+                        }).create().show();
+            }
+        });
+
+        listPopupWindow = new PopupWindow(materialOutMoreView, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        listPopupWindow.setBackgroundDrawable(new BitmapDrawable());
+        listPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeListPopupWindow();
+            }
+        });
+        CommonUtil.setBackgroundAlpha(getActivity(), 0.5f);
+        listPopupWindow.showAsDropDown(btn_actionbar_list_icon_iv);
+
+
+    }
+
+    private void closeListPopupWindow() {
+        if (listPopupWindow != null) {
+            listPopupWindow.dismiss();
+            listPopupWindow = null;
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+
+    }
+
+
+    /**
+     * 一键撤销备货
+     */
+    private void OneKeyNo() {
+        progressDialog.show();
+        mResultTextView.setText(null);
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_DELETEALLDETAIL)
+                .method(Request.Method.POST)
+                .addParam("ids", mPiid)
+                .tag(TAG + "confirmpost")
+                .build(), 30 * 1000, new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, "撤销备料成功");
+                mResultTextView.setText("撤销备料成功");
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+                mResultTextView.setVisibility(View.VISIBLE);
+                mResultTextView.setText(failStr);
+            }
+        });
+
+
+    }
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -415,15 +511,23 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
         mWhcodeTextView.setText(mWhcode);
 
     }
-
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            FunctionActivity.setTitle(getResources().getString(R.string.material_in_revoke_stock));
+        }
+        ((FunctionActivity) Objects.requireNonNull(getActivity())).setListIconIvVisible(false);
+    }
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
+
         return false;
     }
 
     @Override
     public boolean onFragmentBackPressed() {
-
+        ((FunctionActivity) Objects.requireNonNull(getActivity())).setListIconIvVisible(false);
         return false;
     }
     public interface OnRevocationSuccessListener {

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

@@ -270,6 +270,7 @@ public class GloableParams {
     public static String ADDRESS_GETPRODLOCATION;
     public static String ADDRESS_GETBATCHLOCATION;
     public static String ADDRESS_GETNOTIFYBARLIST;
+    public static String ADDRESS_DELETEALLDETAIL;
 
 
 
@@ -582,6 +583,8 @@ public class GloableParams {
 
     private static String ADDRESSTAIL_OUTMATERIAL_GETNOTIFYBARLIST = "/api/pda/acceptNToVerify/getNotifyBarList.action";
 
+    private static String ADDRESSTAIL_OUTMATERIAL_DELETEALLDETAIL = "/api/pda/outMaterial/deleteAllDetail.action";
+
 
 
     //材料出库获取下一采集货品信息
@@ -1244,6 +1247,7 @@ public class GloableParams {
         GloableParams.ADDRESS_GETPRODLOCATION= uriHead + GloableParams.ADDRESSTAIL_OUTMATERIAL_GETPRODLOCATION;
         GloableParams.ADDRESS_GETBATCHLOCATION= uriHead + GloableParams.ADDRESSTAIL_OUTMATERIAL_GETBATCHLOCATION;
         GloableParams.ADDRESS_GETNOTIFYBARLIST= uriHead + GloableParams.ADDRESSTAIL_OUTMATERIAL_GETNOTIFYBARLIST;
+        GloableParams.ADDRESS_DELETEALLDETAIL= uriHead + GloableParams.ADDRESSTAIL_OUTMATERIAL_DELETEALLDETAIL;
 
     }
 }

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/pop_material_out_menu_1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/transparent"
+        android:text="一键取消备货"
+        android:textSize="@dimen/app_text_size_body_2" />
+
+
+</LinearLayout>

build.gradle

@@ -50,8 +50,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 20,
-            versionName      : "v1.1.0"
+            versionCode      : 21,
+            versionName      : "v1.1.1"
     ]
 
     depsVersion = [