勾选框记住状态，下次进入时保持上一次的状态，已采集列表增加长按删除

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

@@ -0,0 +1,10 @@
+package com.uas.uas_mes_standard.bean;
+
+/**
+ * Created by cjh on 2022-07-18
+ */
+public class LongClickDeleteBean {
+    public LongClickDeleteBean(String s){
+
+    }
+}

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

@@ -35,6 +35,15 @@ public class StockAlreadyItemBean {
     private String BI_LOCATION;
     private String BI_BATCHCODE;
     private int BI_PDAGET;
+    public String BI_ID;
+
+    public String getBI_ID() {
+        return BI_ID;
+    }
+
+    public void setBI_ID(String BI_ID) {
+        this.BI_ID = BI_ID;
+    }
 
     private String PR_ORISPECCODE;
 

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

@@ -50,6 +50,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.LongClickDeleteBean;
 import com.uas.uas_mes_standard.bean.WhcodeBean;
 import com.uas.uas_mes_standard.global.GloableParams;
 import com.uas.uas_mes_standard.listener.MyEditorActionListener;
@@ -62,6 +63,7 @@ import com.uas.uas_mes_standard.util.FastjsonUtil;
 import com.uas.uas_mes_standard.util.FragmentUtils;
 import com.uas.uas_mes_standard.util.HttpCallback;
 import com.uas.uas_mes_standard.util.HttpParams;
+import com.uas.uas_mes_standard.util.StringUtil;
 import com.uas.uas_mes_standard.util.VolleyRequest;
 import com.uas.uas_mes_standard.util.VollyRequest;
 import com.uas.uas_mes_standard.view.ClearableEditText;
@@ -71,6 +73,7 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONException;
 
 import java.util.ArrayList;
@@ -358,14 +361,29 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
 
     }
     public void CheckBoxData(){
-        jlt_check_ok.setChecked(true);
+        String ischecheds = SharedPreUtil.getString(mActivity, Constants.JLTSTORAGEINISCHCKED, null);
+        if (StringUtil.isEmpty(ischecheds)){
+            jlt_check_ok.setChecked(true);
+            SharedPreUtil.saveString(mActivity, Constants.JLTSTORAGEINISCHCKED, "true");
+        }else {
+            if ("true".equals(ischecheds)){
+                jlt_check_ok.setChecked(true);
+                jlt_storage_in_barcode_line.setVisibility(View.VISIBLE);
+            }else {
+                jlt_check_ok.setChecked(false);
+                jlt_storage_in_barcode_line.setVisibility(View.GONE);
+            }
+        }
+
         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);
+                    SharedPreUtil.saveString(mActivity, Constants.JLTSTORAGEINISCHCKED, "true");
                 }else {
                     jlt_storage_in_barcode_line.setVisibility(View.GONE);
+                    SharedPreUtil.saveString(mActivity, Constants.JLTSTORAGEINISCHCKED, "false");
                 }
             }
         });
@@ -392,6 +410,12 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         }
 
     }
+    //刷新界面
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(LongClickDeleteBean webViewEventBusBean) {
+        getNeedList();
+    }
+
 
     private void barcodeParse(String barcode) {
         if (TextUtils.isEmpty(barcode)) {
@@ -726,8 +750,6 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
     }
     public void Savebtn_barcode(){
         progressDialog.show();
-
-
         String mBarcodeEditTexts = mBarcodeEditText.getText().toString().trim();
         String jlt_storage_in_barcode_ets = jlt_storage_in_barcode_et.getText().toString().trim();
         String mLotEditTexts = mLotEditText.getText().toString().trim();//仓位
@@ -1192,7 +1214,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             @Override
             public void onClick(View v) {
                 closeMenuPopupWindow();
-                FragmentUtils.switchFragment(JLTStorageInBarcodeFragment.this, StorageInCollectListFragment.newInstance(mPiid, pd_whcode));
+                FragmentUtils.switchFragment(JLTStorageInBarcodeFragment.this, StorageInBarDetailsCollectListFragment.newInstance(mPiid, pd_whcode,mPiClass));
             }
         });
         //撤销入库

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

@@ -212,7 +212,7 @@ public class LoginFragment extends BaseFragment implements AdapterView.OnItemSel
     @Override
     protected void initDatas() {
         loadCache();
-
+        userEditText.setSelection(userEditText.getText().toString().trim().length());
     }
 
     @Override

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

@@ -116,7 +116,7 @@ public class StockDataSummaryFragment extends BaseFragment {
                 .url(GloableParams.ADDRESS_OUTMATERIAL_GETPREMATERIALLIST)
                 .method(Request.Method.POST)
                 .addParam("ids", mPiid)
-                .addParam("showall", mCheckBox.isChecked() ? "-1" : "0")
+                .addParam("showall", mCheckBox.isChecked() ? "-1" : "0")//如果CheckBox为真,执行-1否则执行0
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {

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

@@ -0,0 +1,358 @@
+package com.uas.uas_mes_standard.fragment;
+
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
+import com.uas.uas_mes_standard.R;
+import com.uas.uas_mes_standard.adapter.StorageInCollectAdapter;
+import com.uas.uas_mes_standard.bean.LongClickDeleteBean;
+import com.uas.uas_mes_standard.bean.StockAlreadyItemBean;
+import com.uas.uas_mes_standard.global.GloableParams;
+import com.uas.uas_mes_standard.listener.MyEditorActionListener;
+import com.uas.uas_mes_standard.tools.SharedPreUtil;
+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.VolleyRequest;
+import com.uas.uas_mes_standard.view.ClearableEditText;
+import com.uas.uas_mes_standard.view.RecyclerItemDecoration;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by RaoMeng on 2019/8/5
+ * Desc: 入库已采集列表
+ */
+public class StorageInBarDetailsCollectListFragment extends BaseFragment {
+    private ClearableEditText mDeleteEditText;
+    private TextView mDeleteTextView, mTypeTextView;
+    private LinearLayout mDeleteLayout;
+    private RefreshLayout mRefreshLayout;
+    private RecyclerView mRecyclerView;
+    private List<StockAlreadyItemBean> mCollectList;
+    private StorageInCollectAdapter mCollectAdapter;
+    private int mPageSize = 20, mPageIndex = 1;
+    private String mPiid, mWhcode, mPiClass;
+    private String mRevokeType;
+
+    public static StorageInBarDetailsCollectListFragment newInstance(String piid, String whcode,String mPiClass) {
+
+        Bundle args = new Bundle();
+        args.putString("id", piid);
+        args.putString("whcode", whcode);
+        args.putString("mPiClass",mPiClass);
+        StorageInBarDetailsCollectListFragment fragment = new StorageInBarDetailsCollectListFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_storage_in_collect_list;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("已采集列表");
+
+        mDeleteEditText = root.findViewById(R.id.storage_in_colect_delete_et);
+        mDeleteTextView = root.findViewById(R.id.storage_in_colect_delete_btn);
+        mRefreshLayout = root.findViewById(R.id.storage_in_colect_list_srl);
+        mRefreshLayout.setEnableAutoLoadMore(false);
+        mDeleteLayout = root.findViewById(R.id.storage_in_colect_delete_ll);
+        if (CommonUtil.isGoldenMaster(mActivity)) {
+            mDeleteLayout.setVisibility(View.VISIBLE);
+            mDeleteEditText.requestFocus();
+        } else {
+            mDeleteLayout.setVisibility(View.GONE);
+        }
+        mTypeTextView = root.findViewById(R.id.storage_in_colect_delete_type_tv);
+        mRecyclerView = root.findViewById(R.id.storage_in_colect_list_rv);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
+        mRecyclerView.addItemDecoration(new RecyclerItemDecoration(1));
+        mCollectList = new ArrayList<>();
+        mCollectAdapter = new StorageInCollectAdapter(mCollectList);
+        mRecyclerView.setAdapter(mCollectAdapter);
+
+        mRevokeType = SharedPreUtil.getString(getActivity().getApplicationContext(), Constants.FLAG.MATERIAL_IN_REVOKE_TYPE, "byBarcode");
+        if (mRevokeType != null) {
+            if (mRevokeType.equals("byBarcode")) {
+                mRevokeType = "byBarcode";
+                mDeleteEditText.setHint("请采集需要撤销的条码");
+                mTypeTextView.setText("条码");
+            } else if (mRevokeType.equals("byBox")) {
+                mDeleteEditText.setHint("请采集需要撤销的箱号");
+                mTypeTextView.setText("箱号");
+            }
+        }
+    }
+
+    @Override
+    protected void initEvents() {
+        mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(RefreshLayout refreshLayout) {
+                mPageIndex = 1;
+                getCollectList(mPageIndex, mPageSize);
+            }
+        });
+
+        mTypeTextView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String typeName = mTypeTextView.getText().toString().trim();
+                if ("条码".equals(typeName)) {
+                    changeToTypeBox();
+                } else if ("箱号".equals(typeName)) {
+                    changeToTypeBarcode();
+                }
+            }
+        });
+
+        mRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
+            @Override
+            public void onLoadMore(RefreshLayout refreshLayout) {
+                mPageIndex++;
+                getCollectList(mPageIndex, mPageSize);
+            }
+        });
+
+
+            mCollectAdapter.setOnItemLongClickListener(new BaseQuickAdapter.OnItemLongClickListener() {
+                @Override
+                public boolean onItemLongClick(BaseQuickAdapter adapter, View view, int position) {
+                    new AlertDialog.Builder(mActivity)
+                            .setTitle("提示")
+                            .setMessage("确定删除该条数据？")
+                            .setNegativeButton(R.string.cancel, null)
+                            .setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    StockAlreadyItemBean itemBean = mCollectList.get(position);
+                                    Log.e("igetBI_ID()",itemBean.getBI_ID());
+                                    getLongDelete(itemBean.getBI_ID());
+                                }
+                            }).show();
+                    return true;
+                }
+            });
+
+        CommonUtil.setEditorActionListener(mDeleteEditText, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                deleteBarcode(text);
+            }
+        });
+
+        mDeleteTextView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String barcode = mDeleteEditText.getText().toString().trim();
+                deleteBarcode(barcode);
+            }
+        });
+    }
+
+    private void deleteBarcode(String text, boolean isBarcode) {
+        if (!TextUtils.isEmpty(text)) {
+            progressDialog.show();
+            String typeName = mTypeTextView.getText().toString().trim();
+            VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                    .url(GloableParams.ADDRESS_INMATERIAL_DELETEGETDETAIL)
+                    .method(Request.Method.POST)
+                    .tag(TAG + "deletedetail")
+                    .flag(0)
+                    .addParam("bi_piid", mPiid)
+                    .addParam("barcode", ("条码".equals(typeName) || isBarcode) ? text : "")
+                    .addParam("outboxcode", ("箱号".equals(typeName) && !isBarcode) ? text : "")
+                    .addParam("whcode", mWhcode)
+                    .build(), new HttpCallback() {
+                @Override
+                public void onSuccess(int flag, Object o) throws Exception {
+                    CommonUtil.toastNoRepeat(mActivity, "撤销成功");
+                    if (!isBarcode) {
+                        mDeleteEditText.setText("");
+                    }
+                    mDeleteEditText.requestFocus();
+                    getCollectList(1, mPageIndex * mPageSize);
+                }
+
+                @Override
+                public void onFail(int flag, String failStr) throws Exception {
+                    progressDialog.dismiss();
+                    CommonUtil.toastNoRepeat(mActivity, failStr);
+                    if (!isBarcode) {
+                        mDeleteEditText.setText("");
+                        mDeleteEditText.requestFocus();
+                    }
+                }
+            });
+        }
+    }
+
+    private void deleteBarcode(String text) {
+        deleteBarcode(text, false);
+    }
+
+    @Override
+    protected void initDatas() {
+        Bundle arguments = getArguments();
+        if (arguments != null) {
+            mPiid = arguments.getString("id");
+            mWhcode = arguments.getString("whcode");
+            mPiClass = arguments.getString("mPiClass");
+        }
+        getCollectList(mPageIndex, mPageSize);
+    }
+
+    private void changeToTypeBarcode() {
+        mDeleteEditText.setHint("请采集需要撤销的条码");
+        mTypeTextView.setText("条码");
+        SharedPreUtil.saveString(getActivity().getApplicationContext(), Constants.FLAG.MATERIAL_IN_REVOKE_TYPE, "byBarcode");
+        mRevokeType = "byBarcode";
+    }
+
+    private void changeToTypeBox() {
+        mDeleteEditText.setHint("请采集需要撤销的箱号");
+        mTypeTextView.setText("箱号");
+        SharedPreUtil.saveString(getActivity().getApplicationContext(), Constants.FLAG.MATERIAL_IN_REVOKE_TYPE, "byBox");
+        mRevokeType = "byBox";
+
+    }
+
+    private void getCollectList(int pageIndex, int pageSize) {
+        if (!mRefreshLayout.isRefreshing() && !mRefreshLayout.isLoading()) {
+            progressDialog.show();
+        }
+        if (pageIndex == 1) {
+            mCollectList.clear();
+        }
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_HAVE_SUBMIT_LIST_DEAL)
+                .method(Request.Method.GET)
+                .tag(TAG + "submitlist")
+                .flag(0)
+                .addParam("ids", mPiid)
+                .addParam("page", pageIndex + "")
+                .addParam("pagesize", pageSize + "")
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                try {
+                    progressDialog.dismiss();
+                    mRefreshLayout.finishRefresh(0);
+                    mRefreshLayout.finishLoadMore(0);
+
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray dataArray = resultObject.getJSONArray("data");
+                    if ((dataArray == null || dataArray.size() == 0) && pageIndex > 1) {
+                        CommonUtil.toastNoRepeat(mActivity, "没有更多数据！");
+                    }
+                    if (dataArray != null && dataArray.size() > 0) {
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject dataObject = dataArray.getJSONObject(i);
+                            if (dataObject != null) {
+                                StockAlreadyItemBean collectEntity = new StockAlreadyItemBean();
+                                collectEntity.setBI_BARCODE(FastjsonUtil.getText(dataObject, "BI_BARCODE"));
+                                collectEntity.setBI_OUTBOXCODE(FastjsonUtil.getText(dataObject, "BI_OUTBOXCODE"));
+                                collectEntity.setBI_PRODCODE(FastjsonUtil.getText(dataObject, "BI_PRODCODE"));
+                                collectEntity.setBI_INOUTNO(FastjsonUtil.getText(dataObject, "BI_INOUTNO"));
+                                collectEntity.setBI_PIID(FastjsonUtil.getLong(dataObject, "BI_PIID"));
+                                collectEntity.setBI_INQTY(FastjsonUtil.getDouble(dataObject, "BI_INQTY"));
+                                collectEntity.setBI_OUTQTY(FastjsonUtil.getDouble(dataObject, "BI_OUTQTY"));
+                                collectEntity.setPR_DETAIL(FastjsonUtil.getText(dataObject, "PR_DETAIL"));
+                                collectEntity.setBI_WHCODE(FastjsonUtil.getText(dataObject, "BI_WHCODE"));
+                                collectEntity.setPR_ID(FastjsonUtil.getLong(dataObject, "PR_ID"));
+                                collectEntity.setPR_SPEC(FastjsonUtil.getText(dataObject, "PR_SPEC"));
+                                collectEntity.setBI_LOCATION(FastjsonUtil.getText(dataObject, "BI_LOCATION"));
+                                collectEntity.setBI_BATCHCODE(FastjsonUtil.getText(dataObject, "BI_BATCHCODE"));
+                                collectEntity.setBI_PDAGET(FastjsonUtil.getInt(dataObject, "BI_PDAGET"));
+                                collectEntity.setPR_ORISPECCODE(FastjsonUtil.getText(dataObject,"PR_ORISPECCODE"));
+                                collectEntity.setBI_ID(FastjsonUtil.getText(dataObject,"BI_ID"));
+                                mCollectList.add(collectEntity);
+                            }
+                        }
+                    } else {
+                        if (mPageIndex > 1) {
+                            mPageIndex--;
+                        }
+                    }
+                    mCollectAdapter.notifyDataSetChanged();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                mRefreshLayout.finishRefresh(0);
+                mRefreshLayout.finishLoadMore(0);
+                if (mPageIndex > 1) {
+                    mPageIndex--;
+                }
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+                mCollectAdapter.notifyDataSetChanged();
+            }
+        });
+    }
+    //长按删除
+    private void getLongDelete(String biids) {
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_PDAIO_GET_lOGINDELETE)
+                .method(Request.Method.POST)
+                .tag(TAG + "submitlist")
+                .flag(0)
+                .addParam("caller", mPiClass)
+                .addParam("ids", mPiid)
+                .addParam("biids", biids)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                    progressDialog.dismiss();
+                    getCollectList(mPageIndex, mPageSize);
+                    EventBus.getDefault().post(new LongClickDeleteBean("刷新页面"));
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

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

@@ -287,6 +287,7 @@ public class StorageInCollectListFragment extends BaseFragment {
                                 collectEntity.setBI_BATCHCODE(FastjsonUtil.getText(dataObject, "BI_BATCHCODE"));
                                 collectEntity.setBI_PDAGET(FastjsonUtil.getInt(dataObject, "BI_PDAGET"));
                                 collectEntity.setPR_ORISPECCODE(FastjsonUtil.getText(dataObject,"PR_ORISPECCODE"));
+//                                collectEntity.setBI_ID(FastjsonUtil.getText(dataObject,"BI_ID"));
                                 mCollectList.add(collectEntity);
                             }
                         }
@@ -314,7 +315,6 @@ public class StorageInCollectListFragment extends BaseFragment {
             }
         });
     }
-
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         return false;

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

@@ -251,7 +251,7 @@ public class GloableParams {
     public static String ADDRESS_PDAIO_IN_DELETEBARCODE;
     public static String ADDRESS_PDAIO_OUT_DELETEBARCODE;
     public static String ADDRESS_PDAIO_PUT_SAVEBARCODE2CONFIRM;
-
+    public static String ADDRESS_PDAIO_GET_lOGINDELETE;
 
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
@@ -641,8 +641,8 @@ public class GloableParams {
     private static final String ADDRESSTAIL_PDAIO_OUT_DELETEBARCODE = "/api/pdaio/pdaioOut/deleteBarcode.action";
     //入库扫描保存
     private static final String ADDRESSTAIL_PDAIO_PUT_SAVEBARCODE2CONFIRM="/api/pda/receiving/saveBarcode2Confirm.action";
-
-
+    //入库扫描已采集列表长按删除
+    private static final String ADDRESSTAIL_PDAIO_GET_lOGINDELETE="/api/pda/receiving/deleteAllBarDetails.action";
 
 
     /**
@@ -825,7 +825,8 @@ public class GloableParams {
 //            MENU_STORAGE_RANDOM_CHECK,
             MENU_STORAGE_BARCODE_IN,
             MENU_STORAGE_BARCODE_INFO_COLLECT,
-            LIBRARY_COLLECTION};
+//            LIBRARY_COLLECTION
+    };
     public static final int[] storageInMenuImgs = {
             R.drawable.ic_storage_recharge,
 //            R.drawable.ic_storage_inspection,
@@ -835,7 +836,8 @@ public class GloableParams {
 //            R.drawable.ic_storage_random_check,
             R.drawable.ic_storage_barcode_in,
             R.drawable.ic_barcode_info_collect,
-            R.drawable.ic_storage_iqc};
+//            R.drawable.ic_storage_iqc
+    };
 
     //-->SMT校验
     public static final String LISTNAME_SCMAKE_SMTCHECK_FELOA = "飞达+站位";
@@ -1119,7 +1121,7 @@ public class GloableParams {
         GloableParams.ADDRESS_PDAIO_IN_DELETEBARCODE = uriHead + GloableParams.ADDRESSTAIL_PDAIO_IN_DELETEBARCODE;
         GloableParams.ADDRESS_PDAIO_OUT_DELETEBARCODE = uriHead + GloableParams.ADDRESSTAIL_PDAIO_OUT_DELETEBARCODE;
         GloableParams.ADDRESS_PDAIO_PUT_SAVEBARCODE2CONFIRM = uriHead + GloableParams.ADDRESSTAIL_PDAIO_PUT_SAVEBARCODE2CONFIRM;
-
+        GloableParams.ADDRESS_PDAIO_GET_lOGINDELETE = uriHead + GloableParams.ADDRESSTAIL_PDAIO_GET_lOGINDELETE;
 
 
 

app/src/main/java/com/uas/uas_mes_standard/util/Constants.java

@@ -217,6 +217,13 @@ public interface Constants {
         String INVENTORY_DC_TIME_CACHE = "inventory_dc_time_cache";
     }
 
+    /**
+     *入库扫描Checked状态
+     */
+        String JLTSTORAGEINISCHCKED ="is_chcked";
+
+
+
     /**
      * key
      */

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

@@ -17,6 +17,7 @@
         android:textSize="@dimen/app_text_size_body_2" />
 
     <Button
+        android:visibility="gone"
         android:id="@+id/pop_jlt_storage_in_box_menu_2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -67,6 +68,7 @@
         android:textSize="@dimen/app_text_size_body_2" />
 
     <Button
+        android:visibility="gone"
         android:id="@+id/pop_material_in_menu_2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"