加入阿里下载仓库地址，增加生产单据明细接口， 等功能

app/src/main/java/com/uas/pda_smart_com_lg/adapter/CangKuAdapter.java

@@ -0,0 +1,37 @@
+package com.uas.pda_smart_com_lg.adapter;
+
+import android.support.annotation.Nullable;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.uas.pda_smart_com_lg.R;
+import com.uas.pda_smart_com_lg.bean.AddRuKubean;
+
+import java.util.List;
+
+public class CangKuAdapter extends BaseQuickAdapter<AddRuKubean, BaseViewHolder> {
+    private List<AddRuKubean> mmmmList;
+
+    public List<AddRuKubean> getmList() {
+        return mmmmList;
+    }
+
+    public void setmList(List<AddRuKubean> mList) {
+        this.mmmmList = mList;
+    }
+    public AddRuKubean getBeanByPositon(int position){
+        return mmmmList.get(position);
+    }
+
+    public CangKuAdapter(@Nullable List<AddRuKubean> data) {
+        super(R.layout.item_ruku_detail, data);
+        this.mmmmList = data;
+    }
+    
+    @Override
+    protected void convert(BaseViewHolder helper, AddRuKubean item) {
+        TextView tv_pichi=helper.getView(R.id.tv_pichi);
+        tv_pichi.setText(item.getCode()+"("+item.getName()+")");
+    }
+}

app/src/main/java/com/uas/pda_smart_com_lg/bean/AddRuKubean.java

@@ -0,0 +1,30 @@
+package com.uas.pda_smart_com_lg.bean;
+
+/**
+ * Created by cjh-sail on 202024-05-15
+ */
+public class AddRuKubean {
+    public String code;
+    public String name;
+
+    public AddRuKubean(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+    public AddRuKubean(){}
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

app/src/main/java/com/uas/pda_smart_com_lg/fragment/GoodOrBadFragment.java

@@ -0,0 +1,782 @@
+package com.uas.pda_smart_com_lg.fragment;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+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.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+
+import com.uas.pda_smart_com_lg.R;
+import com.uas.pda_smart_com_lg.activity.FunctionActivity;
+import com.uas.pda_smart_com_lg.adapter.CangKuAdapter;
+import com.uas.pda_smart_com_lg.bean.AddRuKubean;
+import com.uas.pda_smart_com_lg.bean.WhcodeBean;
+import com.uas.pda_smart_com_lg.global.GloableParams;
+import com.uas.pda_smart_com_lg.listener.MyEditorActionListener;
+import com.uas.pda_smart_com_lg.tools.SharedPreUtil;
+import com.uas.pda_smart_com_lg.util.CommonUtil;
+import com.uas.pda_smart_com_lg.util.Constants;
+import com.uas.pda_smart_com_lg.util.FastjsonUtil;
+import com.uas.pda_smart_com_lg.util.FragmentUtils;
+import com.uas.pda_smart_com_lg.util.HttpCallback;
+import com.uas.pda_smart_com_lg.util.HttpParams;
+import com.uas.pda_smart_com_lg.util.LogUtil;
+import com.uas.pda_smart_com_lg.util.StringUtil;
+import com.uas.pda_smart_com_lg.util.VollyRequest;
+import com.uas.pda_smart_com_lg.view.ClearableEditText;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+import razerdp.basepopup.BasePopupWindow;
+
+
+public class GoodOrBadFragment extends BaseFragment implements View.OnClickListener{
+
+    private static final int SCAN_BARCODE_CODE = 121;
+
+    private ClearableEditText ed_jump;
+    private StringRequest mStringRequest;
+    private PopupWindow mMenuPopupWindow;
+
+    private String pi_class;
+    private Button storage_in_add_detail_commit_btn;
+    private ImageView iv_search;
+    private String mwhcode;
+    private ImageView mListImageView;
+    private OnFinishListener mOnFinishListener;
+    private ArrayList<ComDataBean> ComDataBeanList;
+    private ClearableEditText edit_et;
+    private RecyclerView rv_line_ip_port_data;
+    private PopupWindow editPW;
+    private IpAndResourcesPortAdapter ipAndResourcesPortAdapter;
+    private String sc_name;
+    private String sc_code;
+    private String pi_type;
+    private String default_warehouse;
+    private List<AddRuKubean> stringList;
+    private ArrayList<AddRuKubean> Liststring;
+    private RecyclerView rv_content;
+    private CangKuAdapter reportDetailAdapter;
+    private String defaultRejectsWarehouse;
+    private TextView tv_moren;
+
+    public void setOnFinishListener(OnFinishListener onFinishListener) {
+        mOnFinishListener = onFinishListener;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        ((FunctionActivity) getActivity()).setScanIvVisible(false);
+    }
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_goodorbadl;
+    }
+
+    @Override
+    protected void initViews() {
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        ed_jump = (ClearableEditText) root.findViewById(R.id.ed_jump);
+        ed_jump.requestFocus();
+        storage_in_add_detail_commit_btn = root.findViewById(R.id.storage_in_add_detail_commit_btn);
+        iv_search = root.findViewById(R.id.iv_search);
+        mListImageView = (ImageView) getActivity().findViewById(R.id.btn_actionbar_list_icon_iv);
+        rv_content = root.findViewById(R.id.rv_data);
+        tv_moren = root.findViewById(R.id.tv_moren);
+    }
+
+    @Override
+    protected void initEvents() {
+//        pi_class = SharedPreUtil.getString(mActivity, "pi_class", "");
+//        pi_type = SharedPreUtil.getString(mActivity, "pi_type", "");
+
+        pi_class = "完工入库单";
+        pi_type = "良品";
+        FunctionActivity.setTitle("新增入库("+pi_type+")");
+
+        Log.e("pi_class",pi_class);
+        storage_in_add_detail_commit_btn.setOnClickListener(this);
+        iv_search.setOnClickListener(this);
+
+        //隐藏右上角列表
+        ImageView btn_actionbar_list_icon_iv = mActivity.findViewById(R.id.btn_actionbar_list_icon_iv);
+        btn_actionbar_list_icon_iv.setVisibility(View.GONE);
+
+        stringList = new ArrayList<>();
+        Liststring = new ArrayList<>();
+        default_warehouse = SharedPreUtil.getString(mActivity
+                , Constants.FLAG.DEFAULT_WAREHOUSE_CACHE + CommonUtil.getUserName(mActivity), null);
+        defaultRejectsWarehouse = SharedPreUtil.getString(mActivity
+                , Constants.FLAG.CACHE_DEFAULT_REJECTS_WAREHOUSE + CommonUtil.getUserName(mActivity), null);
+
+        rv_content.setLayoutManager(new LinearLayoutManager(mActivity));
+        reportDetailAdapter = new CangKuAdapter(Liststring);
+        reportDetailAdapter.setmList(Liststring);
+        rv_content.setAdapter(reportDetailAdapter);
+        reportDetailAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
+                List<AddRuKubean> addRuKubeans = reportDetailAdapter.getmList();
+                sc_code=addRuKubeans.get(i).getCode();
+                ed_jump.setText(addRuKubeans.get(i).getCode()+addRuKubeans.get(i).getName());
+                ed_jump.setSelection(ed_jump.getText().length());
+            }
+        });
+        if (pi_type.equals("良品")){
+            if (!StringUtil.isEmpty(default_warehouse)){
+                tv_moren.setVisibility(View.VISIBLE);
+                getReparukuirStep(default_warehouse);
+            }
+        }else {
+            if (!StringUtil.isEmpty(defaultRejectsWarehouse)){
+                tv_moren.setVisibility(View.VISIBLE);
+                getReparukuirStep(defaultRejectsWarehouse);
+            }
+        }
+
+        CommonUtil.setEditorActionListener(ed_jump, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+
+            }
+        });
+
+        mListImageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+//                GoodBadAddListFragment storageInAddListFragment = new GoodBadAddListFragment();
+//                Bundle bundle = new Bundle();
+//                bundle.putString("pi_class", GoodOrBadFragment.this.pi_class);
+//                bundle.putInt("whichPage", StorageInAddListFragment.PAGE_STORAGE_ADD);
+//                storageInAddListFragment.setArguments(bundle);
+//                FragmentUtils.switchFragment(GoodOrBadFragment.this, storageInAddListFragment);
+            }
+        });
+    }
+
+
+
+    @Override
+    protected void initDatas() {
+        ComDataBeanList = new ArrayList<>();
+    }
+
+
+    @SuppressLint("NonConstantResourceId")
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.iv_search:
+//                Bundle bundle = new Bundle();
+//                bundle.putInt(NewCheckCangKuFragment.FLAG_WHICH_PAGE, NewCheckCangKuFragment.STORAGE_IN_ADD_WAREHOUSE);
+//                bundle.putString("etname",ed_jump.getText().toString().trim());
+//                goSingleFragment(bundle);
+                getRepairStep("");
+                break;
+            case R.id.storage_in_add_detail_commit_btn:
+                getNewProdinout();
+                break;
+            default:
+                break;
+        }
+    }
+    private void getReparukuirStep(String data) {
+        if (pi_type.equals("良品")){
+            pi_type="";
+        }
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_PDAIO_IN_GETWHCODE)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getMaCode")
+                        .addParam("condition","")
+                        .addParam("piclass",pi_class)
+                        .addParam("pi_type",pi_type)
+                        .flag(0)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(), "data");
+                        if (isSuccess){
+                            if (dataArray == null){
+                                CommonUtil.toastNoRepeat(mActivity,"未搜索到匹配数据");
+                            }else {
+                                for (Object index : dataArray) {
+                                    AddRuKubean addRuKubean = new AddRuKubean();
+                                    JSONObject data = (JSONObject) index;
+                                    addRuKubean.setCode(data.getString("WH_CODE"));
+                                    addRuKubean.setName(data.getString("WH_DESCRIPTION"));
+                                    stringList.add(addRuKubean);
+                                }
+
+                                String[] split = data.split(",");
+                                for (String s : split) {
+                                    for (int i=0;i<stringList.size();i++){
+                                        AddRuKubean addRuKubean = new AddRuKubean();
+                                        if(stringList.get(i).getName().contains(s)||stringList.get(i).getCode().contains(s)){
+                                            addRuKubean.setCode(stringList.get(i).getCode());
+                                            addRuKubean.setName(stringList.get(i).getName());
+                                            Liststring.add(addRuKubean);
+                                        }
+
+                                    }
+                                }
+                                reportDetailAdapter = new CangKuAdapter(Liststring);
+                                reportDetailAdapter.setmList(Liststring);
+                                rv_content.setAdapter(reportDetailAdapter);
+                                reportDetailAdapter.notifyDataSetChanged();
+                                reportDetailAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                                    @Override
+                                    public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
+                                        List<AddRuKubean> addRuKubeans = reportDetailAdapter.getmList();
+                                        sc_code=addRuKubeans.get(i).getCode();
+                                        ed_jump.setText(addRuKubeans.get(i).getCode()+addRuKubeans.get(i).getName());
+                                        ed_jump.setSelection(ed_jump.getText().length());
+                                    }
+                                });
+
+                            }
+                        }
+                    }
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+    }
+
+    private void getRepairStep(String trim) {
+        if (pi_type.equals("良品")){
+            pi_type="";
+        }
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_PDAIO_IN_GETWHCODE)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getMaCode")
+                        .addParam("condition",trim)
+                        .addParam("piclass",pi_class)
+                        .addParam("pi_type",pi_type)
+                        .flag(0)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(), "data");
+                        if (isSuccess){
+                            if (dataArray == null){
+                                CommonUtil.toastNoRepeat(mActivity,"未搜索到匹配数据");
+                            }else {
+                                handleFeededlineData(dataArray,trim);
+                            }
+                        }
+                    }
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+    }
+
+    private void handleFeededlineData(JSONArray dataArray,String trim) {
+        ComDataBean bean;
+        ComDataBeanList.clear();
+        for (Object index : dataArray) {
+            JSONObject data = (JSONObject) index;
+            bean= new ComDataBean();
+            bean.setItemName(data.getString("WH_DESCRIPTION"));
+            bean.setItemremark(data.getString("WH_CODE"));
+            ComDataBeanList.add(bean);
+        }
+        if (trim.isEmpty()){
+            initresourcesPopupWindow();
+        }else {
+            ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
+            ipAndResourcesPortAdapter.setmList(ComDataBeanList);
+            rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);;
+        }
+    }
+
+    private void initresourcesPopupWindow() {
+        View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_recycle_item, null);
+        edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
+        TextView sure_tv = (TextView) contView.findViewById(R.id.sure_tv);
+        TextView cancle_tv = (TextView) contView.findViewById(R.id.cancle_tv);
+        ImageView search_im = contView.findViewById(R.id.search_im);
+        LinearLayout line_top = contView.findViewById(R.id.line_top);
+        rv_line_ip_port_data = contView.findViewById(R.id.rv_ip_port_data);
+        rv_line_ip_port_data.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
+        rv_line_ip_port_data.setLayoutManager(new LinearLayoutManager(mActivity));
+        ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
+        ipAndResourcesPortAdapter.setmList(ComDataBeanList);
+        rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+        setlineAdapter(ComDataBeanList);
+//        edit_et.setText(ct_qty.getText().toString().trim());
+
+        edit_et.requestFocus();
+        editPW = new PopupWindow(contView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        editPW.setTouchable(true);
+        editPW.setBackgroundDrawable(new BitmapDrawable());
+        editPW.setOnDismissListener(new BasePopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeListPopupWindow();
+            }
+        });
+        View parentView = mActivity.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        editPW.showAtLocation(parentView, Gravity.CENTER, 0, 0);
+        CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
+        edit_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String mSearchStr = edit_et.getText().toString().trim();
+                    if (!mSearchStr.isEmpty()) {
+                        List<ComDataBean> thisList = new ArrayList<>();
+                        for(int i=0;i<ComDataBeanList.size();i++){
+                            if(ComDataBeanList.get(i).getItemremark().contains(mSearchStr)||ComDataBeanList.get(i).getItemName().contains(mSearchStr)){
+                                thisList.add(ComDataBeanList.get(i));
+                            }
+                            if(i == ComDataBeanList.size() -1){
+                                ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(thisList);
+                                rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+                                LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                            }
+                            List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+                            for (int j = 0; j < lineCodeEntities.size(); j++) {
+                                lineCodeEntities.get(j).setChecked(false);
+                            }
+                            ipAndResourcesPortAdapter.notifyDataSetChanged();
+                        }
+                    } else {
+                        ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
+                        rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+                        List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+                        for (int i = 0; i < lineCodeEntities.size(); i++) {
+                            lineCodeEntities.get(i).setChecked(false);
+                        }
+                        ipAndResourcesPortAdapter.notifyDataSetChanged();
+                    }
+                    ipAndResourcesPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+
+                        @Override
+                        public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                            List<ComDataBean> ipAndPortBeans = ipAndResourcesPortAdapter.getmList();
+                            sc_name = ipAndPortBeans.get(position).getItemName();
+                            sc_code = ipAndPortBeans.get(position).getItemremark();
+                            for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                                ipAndPortBeans.get(i).setChecked(false);
+                            }
+                            ipAndPortBeans.get(position).setChecked(true);
+                            ipAndResourcesPortAdapter.notifyDataSetChanged();
+                        }
+                    });
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        search_im.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String mSearchStr = edit_et.getText().toString().trim();
+                if (!mSearchStr.isEmpty()) {
+                    List<ComDataBean> thisList = new ArrayList<>();
+                    for(int i=0;i<ComDataBeanList.size();i++){
+                        if(ComDataBeanList.get(i).getItemremark().contains(mSearchStr)||ComDataBeanList.get(i).getItemName().contains(mSearchStr)){
+                            thisList.add(ComDataBeanList.get(i));
+                        }
+                        if(i == ComDataBeanList.size() -1){
+                            ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(thisList);
+                            rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                        }
+                        List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+                        for (int j = 0; j < lineCodeEntities.size(); j++) {
+                            lineCodeEntities.get(j).setChecked(false);
+                        }
+                        ipAndResourcesPortAdapter.notifyDataSetChanged();
+                    }
+
+
+                } else {
+                    ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
+                    rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+                    List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+                    for (int i = 0; i < lineCodeEntities.size(); i++) {
+                        lineCodeEntities.get(i).setChecked(false);
+                    }
+                    ipAndResourcesPortAdapter.notifyDataSetChanged();
+
+                }
+//                getRepairStep(mSearchStr);
+                ipAndResourcesPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                        List<ComDataBean> ipAndPortBeans = ipAndResourcesPortAdapter.getmList();
+                        sc_name = ipAndPortBeans.get(position).getItemName();
+                        sc_code = ipAndPortBeans.get(position).getItemremark();
+                        for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                            ipAndPortBeans.get(i).setChecked(false);
+                        }
+                        ipAndPortBeans.get(position).setChecked(true);
+                        ipAndResourcesPortAdapter.notifyDataSetChanged();
+                    }
+                });
+            }
+        });
+
+        List<String> list=new ArrayList<>();
+        //确定
+        sure_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                list.clear();
+                if (StringUtil.isEmpty(sc_code)){
+                    CommonUtil.toastNoRepeat(mActivity,"请选择工序");
+                    return;
+                }
+                ed_jump.setText(sc_code + "(" +sc_name+ ")");
+                ed_jump.requestFocus();
+                ed_jump.setSelection(ed_jump.getText().length());
+                closeListPopupWindow();
+            }
+        });
+
+        //取消
+        cancle_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeListPopupWindow();
+            }
+        });
+
+        String mSearchStr = edit_et.getText().toString().trim();
+        if (mSearchStr.isEmpty()) {
+            ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
+            rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+            List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+            for (int i = 0; i < lineCodeEntities.size(); i++) {
+                lineCodeEntities.get(i).setChecked(false);
+            }
+            ipAndResourcesPortAdapter.notifyDataSetChanged();
+
+            ipAndResourcesPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                @Override
+                public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                    List<ComDataBean> ipAndPortBeans = ipAndResourcesPortAdapter.getmList();
+                    sc_name = ipAndPortBeans.get(position).getItemName();
+                    sc_code = ipAndPortBeans.get(position).getItemremark();
+                    for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                        ipAndPortBeans.get(i).setChecked(false);
+                    }
+                    ipAndPortBeans.get(position).setChecked(true);
+                    ipAndResourcesPortAdapter.notifyDataSetChanged();
+                }
+            });
+        }
+//        edit_et.addTextChangedListener(new TextWatcher() {
+//            @Override
+//            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+//            @Override
+//            public void onTextChanged(CharSequence s, int start, int before, int count) { }
+//            @Override
+//            public void afterTextChanged(Editable s) {
+//                if (ComDataBeanList.isEmpty()){
+//                    getfuzzySearchSourceData(edit_et.getText().toString().trim(),"不良");
+//                }
+//                if (s.length() >= 0) {
+//                    String mSearchStr = s.toString().trim();
+//                    LogUtil.i("mSearchStr",mSearchStr);
+//                    List<ComDataBean> thisList = new ArrayList<>();
+//                    for(int i=0;i<ComDataBeanList.size();i++){
+//                        if(ComDataBeanList.get(i).getSC_CODE().contains(mSearchStr)){
+//                            thisList.add(ComDataBeanList.get(i));
+//                        }
+//                        if(i == ComDataBeanList.size() -1){
+//                            ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(thisList);
+//                            rv_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+//                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+//                        }
+//                    }
+//                    ipAndResourcesPortAdapter.notifyDataSetChanged();
+//
+//                } else {
+//
+//                    ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
+//                    rv_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+//
+//                }
+//                ipAndResourcesPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+//                    @Override
+//                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+//                        List<ComDataBean> ipAndPortBeans = ipAndResourcesPortAdapter.getmList();
+//                        for (int i = 0; i < ipAndPortBeans.size(); i++) {
+//                            ipAndPortBeans.get(i).setChecked(false);
+//                        }
+//                        ipAndPortBeans.get(position).setChecked(true);
+//                        ipAndResourcesPortAdapter.notifyDataSetChanged();
+//                    }
+//                });
+//            }
+//
+//        });
+    }
+
+    private void setlineAdapter(ArrayList<ComDataBean> mList) {
+        LogUtil.i("mList", JSON.toJSONString(mList));
+        ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(mList);
+        ipAndResourcesPortAdapter.setmList(ComDataBeanList);
+        ipAndResourcesPortAdapter.notifyDataSetChanged();
+        rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+    }
+
+    private void closeListPopupWindow() {
+        if (editPW != null) {
+            editPW.dismiss();
+            editPW = null;
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+    }
+
+    private void getNewProdinout() {
+        if (pi_type.equals("良品")){
+            pi_type="";
+        }
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_OUTMATERIAL_NEWPRODINOUT)
+                        .method(Request.Method.POST)
+                        .tag(TAG + "getMaCode")
+                        .flag(0)
+                        .addParam("pi_class", pi_class)//必填单据类型
+                        .addParam("pi_whcode",sc_code)//必填 仓库
+                        .addParam("pi_type",pi_type)//必填 仓库
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        if (isSuccess){
+                            JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
+                            if (dataObject == null){
+
+                            }else {
+                                String pi_id = dataObject.getString("PI_ID") == null ? "" : dataObject.getString("PI_ID");
+                                String pi_inoutno = dataObject.getString("PI_INOUTNO") == null ? "" : dataObject.getString("PI_INOUTNO");
+                                String pi_status = dataObject.getString("PI_STATUS") == null ? "" : dataObject.getString("PI_STATUS");
+                                String pi_invostatus = dataObject.getString("PI_INVOSTATUS") == null ? "" : dataObject.getString("PI_INVOSTATUS");
+                                String pi_whcode = dataObject.getString("PI_WHCODE") == null ? "" : dataObject.getString("PI_WHCODE");
+                                String pi_whname = dataObject.getString("PI_WHNAME") == null ? "" : dataObject.getString("PI_WHNAME");
+                                jumpToStorageInAddDetail(pi_id,pi_inoutno,pi_whcode,pi_whname);
+
+                            }
+                        }
+                    }
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+
+
+    }
+    private void jumpToStorageInAddDetail(String pi_id, String pi_inoutno, String pi_whcode,String pi_whname) {
+//        GoodOrBadAddDetailFragment mFragment = new GoodOrBadAddDetailFragment();
+//        Bundle bundle = new Bundle();
+//        bundle.putString("pi_class", pi_class);
+//        bundle.putString("pi_id", pi_id);
+//        bundle.putString("pi_inoutno", pi_inoutno);
+//        bundle.putString("pi_whcode", pi_whcode);
+//        bundle.putString("pi_whname", pi_whname);
+//        mFragment.setArguments(bundle);
+//        FragmentUtils.switchFragment(GoodOrBadFragment.this, mFragment);
+
+        NewBePutInStorageOrderDetailFragment newOutboundDeliveryOrderDetailFragment = new NewBePutInStorageOrderDetailFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("pi_inoutno", pi_inoutno);
+        newOutboundDeliveryOrderDetailFragment.setArguments(bundle);
+        //        jltStorageInBarcodeFragment.setOnFinishListener(this);
+        FragmentUtils.switchFragment(GoodOrBadFragment.this, newOutboundDeliveryOrderDetailFragment);
+
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+    }
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (hidden) {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+            ((FunctionActivity) getActivity()).setScanIvVisible(false);
+        } else {
+            pi_class = "完工入库单";
+            pi_type = "良品";
+            FunctionActivity.setTitle("新增入库("+pi_type+")");
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+            ((FunctionActivity) getActivity()).setScanIvVisible(false);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+//        if (mWhichPage == PAGE_STORAGE_IN_ADD) {
+//            if (mOnStorageInToListListener != null) {
+//                mOnStorageInToListListener.onStorageInToList();
+//                return true;
+//            } else {
+//                return false;
+//            }
+//        } else {
+        return false;
+//        }
+    }
+
+//    private WhcodeBean mWhcodeBean;
+//    @SuppressLint("SetTextI18n")
+//    @Override
+//    public void onSelection(int flag, Object selection) {
+//        switch (flag) {
+//            case NewCheckCangKuFragment.STORAGE_IN_ADD_WAREHOUSE:
+//                mWhcodeBean = (WhcodeBean) selection;
+//                mwhcode = mWhcodeBean.getWH_CODE();
+//                ed_jump.setText(mWhcodeBean.getWH_CODE() + "(" + mWhcodeBean.getWH_DESCRIPTION() + ")");
+//                ed_jump.requestFocus();
+//                ed_jump.setSelection(ed_jump.getText().length());
+//                break;
+//            default:
+//                break;
+//        }
+//    }
+
+    public interface OnStorageInAddListener {
+        void onStorageInAdd();
+    }
+
+    public interface OnStorageInToListListener {
+        void onStorageInToList();
+    }
+
+    public interface OnFinishListener {
+        void onFinish(String pi_class, String pi_whcode, String pi_cardcode, long pi_id, String pi_inoutno, String pi_status, String pi_invostatus);
+    }
+
+    private class IpAndResourcesPortAdapter extends BaseQuickAdapter<ComDataBean, BaseViewHolder> {
+        private List<ComDataBean> mmmmList;
+
+        public List<ComDataBean> getmList() {
+            return mmmmList;
+        }
+
+        public void setmList(List<ComDataBean> mList) {
+            this.mmmmList = mList;
+        }
+        public ComDataBean getBeanByPositon(int position){
+            return mmmmList.get(position);
+        }
+
+        private IpAndResourcesPortAdapter(@Nullable List<ComDataBean> data) {
+            super(R.layout.fuzzy_ipandport_item, data);
+            this.mmmmList = data;
+        }
+        @Override
+        protected void convert(BaseViewHolder helper, ComDataBean item) {
+            helper.setText(R.id.macode_ip__Tv,item.getItemremark()+"-("+item.getItemName()+")");
+            LinearLayout line_true = helper.itemView.findViewById(R.id.line_true);
+            if (item.getChecked()) {
+                line_true.setSelected(true);
+            } else {
+                line_true.setSelected(false);
+            }
+        }
+    }
+
+    private class ComDataBean{
+        String itemName = null;
+        String itemremark = null;
+        boolean Checked;
+
+        public boolean getChecked() {
+            return Checked;
+        }
+
+        public void setChecked(boolean checked) {
+            Checked = checked;
+        }
+
+        public String getItemName() {
+            return itemName;
+        }
+
+        public void setItemName(String itemName) {
+            this.itemName = itemName;
+        }
+
+        public String getItemremark() {
+            return itemremark;
+        }
+
+        public void setItemremark(String itemremark) {
+            this.itemremark = itemremark;
+        }
+    }
+
+}

app/src/main/java/com/uas/pda_smart_com_lg/fragment/NewBePutInStorageOrderDetailFragment.java

@@ -4,11 +4,13 @@ import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.content.ContextCompat;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
@@ -53,6 +55,7 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
     private ClearableEditText jlt_storage_in_barcode_barcode_et;
     private CheckBox ck_cancel;
     private TextView tv_productdetails;
+    private TextView tv_generate_document_details;
     private TextView tv_hint;
     private TextView tv_qty;
     private RadioGroup radiogroup1;
@@ -74,6 +77,7 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
         jlt_storage_in_barcode_barcode_et = root.findViewById(R.id.jlt_storage_in_barcode_barcode_et);
         ck_cancel = root.findViewById(R.id.ck_cancel);
         tv_productdetails = root.findViewById(R.id.tv_productdetails);
+        tv_generate_document_details = root.findViewById(R.id.tv_generate_document_details);
         tv_hint = root.findViewById(R.id.tv_hint);
         tv_qty = root.findViewById(R.id.tv_qty);
 
@@ -92,10 +96,8 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
         mDetailColumn = new Column<String>("名称", "PR_DETAIL");
         mDetailColumn.setFixed(true);
 
-
         mFilterStorageInBeans = new ArrayList<>();
 
-
         WindowManager wm = mActivity.getWindowManager();
         int screenWith = wm.getDefaultDisplay().getWidth();
         mSmartTable.getConfig().setMinTableWidth(screenWith)
@@ -119,10 +121,6 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
                     }
                 });
 
-
-
-
-
         jlt_storage_in_barcode_barcode_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -159,13 +157,48 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
             }
         });
 
+        tv_generate_document_details.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getDocumentDetails();
+            }
+        });
+    }
+
+    private void getDocumentDetails() {
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_DOCUMENT_DETAILS)
+                .method(Request.Method.POST)
+                .tag(TAG + "getindatalist")
+                .flag(0)
+                .addParam("inoutno",mPiInoutno)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                String result = o.toString();
+                Log.e("result",result);
+                JSONObject resultObject = JSON.parseObject(result);
+                String data = FastjsonUtil.getText(resultObject, "data");
+                //{"success":true,"data":"生成明細成功"}
+                if (!TextUtils.isEmpty(data)) {
+                    CommonUtil.toastNoRepeat(mActivity, data);
+                }
+            }
 
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
     }
 
     @Override
     protected void initDatas() {
         getCollectList();
     }
+
     public void getCollectList(){
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
@@ -258,7 +291,6 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
 //                if (dataObject != null) {
 //                    String lotno = FastjsonUtil.getText(dataObject, "LOTNO");
 //                }
-
             }
 
             @Override

app/src/main/java/com/uas/pda_smart_com_lg/fragment/NewJltStorageInFilterListFragment.java

@@ -14,6 +14,7 @@ import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -76,6 +77,7 @@ public class NewJltStorageInFilterListFragment extends BaseFragment implements O
     private ImageView mScanImageView;
     private int mFocusId;
     private int mPageIndex = 1, mPageSize = 20;
+    private Button mMoreButton;
 
     @Override
     protected int getLayout() {
@@ -85,7 +87,20 @@ public class NewJltStorageInFilterListFragment extends BaseFragment implements O
     @Override
     protected void initViews() {
         setTitle("入库列表");
-//        ((FunctionActivity) mActivity).setScanIvVisible(true);
+        ((FunctionActivity) mActivity).setMoreBtnVisible(true);
+        mMoreButton = mActivity.findViewById(R.id.btn_actionbar_more);
+        mMoreButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                GoodOrBadFragment goodOrBadFragment = new GoodOrBadFragment();
+                //                Bundle bundle = new Bundle();
+                //                String trim = mSearchCet.getText().toString().trim();
+                //                bundle.putString("pi_inoutno", trim);
+                //                goodOrBadFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(NewJltStorageInFilterListFragment.this, goodOrBadFragment);
+            }
+        });
+
         mRefreshLayout = root.findViewById(R.id.pda_wms_in_filter_list_srl);
         mRefreshLayout.setEnableAutoLoadMore(false);
         mSearchCet = root.findViewById(R.id.jlt_storage_in_filter_list_search_cet);
@@ -98,7 +113,6 @@ public class NewJltStorageInFilterListFragment extends BaseFragment implements O
                 mSearchCet.requestFocus();
             }
         }, 100);
-
         mFilterStorageInBeans = new ArrayList<>();
 
         mSmartTable = root.findViewById(R.id.jlt_storage_in_filter_list_st);
@@ -151,7 +165,6 @@ public class NewJltStorageInFilterListFragment extends BaseFragment implements O
         mWhcodeColumn = new Column<String>("仓库编号", "PI_WHCODE");
         mWhcodeDesColumn = new Column<String>("仓库名称", "PI_WHNAME");
         mStateColumn = new Column<String>("状态", "PI_STATUS");
-
     }
 
     @Override
@@ -239,8 +252,6 @@ public class NewJltStorageInFilterListFragment extends BaseFragment implements O
             }
         });
 
-
-
         mNumColumn.setOnColumnItemClickListener(this);
         mClassColumn.setOnColumnItemClickListener(this);
         mSupplierColumn.setOnColumnItemClickListener(this);
@@ -503,20 +514,29 @@ public class NewJltStorageInFilterListFragment extends BaseFragment implements O
         Bundle bundle = new Bundle();
         bundle.putString("pi_inoutno", pi_inoutno);
         newOutboundDeliveryOrderDetailFragment.setArguments(bundle);
-//        jltStorageInBarcodeFragment.setOnFinishListener(this);
         FragmentUtils.switchFragment(NewJltStorageInFilterListFragment.this, newOutboundDeliveryOrderDetailFragment);
     }
 
     @Override
     public void onHiddenChanged(boolean hidden) {
         super.onHiddenChanged(hidden);
-        if (!hidden) {
+        if (hidden) {  //Fragment被隐藏了
+            ((FunctionActivity) mActivity).setMoreBtnVisible(false);
+        }else {
             setTitle("入库列表");
             if (!CommonUtil.isRepeatClick()) {
                 getInDataList();
             }
+            ((FunctionActivity) mActivity).setMoreBtnVisible(true);
         }
     }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) mActivity).setMoreBtnVisible(false);
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -549,9 +569,5 @@ public class NewJltStorageInFilterListFragment extends BaseFragment implements O
             supportFragmentManager.popBackStack();
         }
     }
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        ((FunctionActivity) getActivity()).setScanIvVisible(false);
-    }
+
 }

app/src/main/java/com/uas/pda_smart_com_lg/fragment/ProductDetailsFragment.java

@@ -82,8 +82,6 @@ public class ProductDetailsFragment extends BaseFragment{
                         return TableConfig.INVALID_COLOR;
                     }
                 });
-
-
     }
 
     @Override

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

@@ -255,6 +255,9 @@ public class GloableParams {
     public static String ADDRESS_DOCUMENTLIBRARY_DETAIL_OUTBOUNDLIST;
     public static String ADDRESS_DOCUMENTLIBRARY_SAVE_OUTBOUNDLIST;
     public static String ADDRESS_DOCUMENTLIBRARY_SAVE_GETBARCODEINFODEVICE;
+    public static String ADDRESS_PDAIO_IN_GETWHCODE;
+    public static String ADDRESS_OUTMATERIAL_NEWPRODINOUT;
+    public static String ADDRESS_DOCUMENT_DETAILS;
 
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
@@ -271,6 +274,8 @@ public class GloableParams {
     private static final String ADDRESSTAIL_COMMON_DOWNLOADBYID = "/common/downloadbyId.action";
     //获取应用版本信息
     private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/outMaterial/getPdaVersion.action";
+    //生成单据明细
+    private static final String ADDRESSTAIL_DOCUMENT_DETAILS = "/api/pda/receiving/GenProdiodetail.action";
 
     /**
      * 条码信息采集
@@ -493,6 +498,12 @@ public class GloableParams {
     private static final String ADDRESSTAIL_MSDOUTOVEN = "/api/pda/msd/confirmOutOven.action";
     // 仓库管理:条码数量修改
     private static final String ADDRESSTAIL_BARSTOCK_MODIFY_NUMBER = "/api/pda/barStock/modifyNumber.action";
+
+    //入库获取仓库列表
+    private static final String ADDRESSTAIL_PDAIO_IN_GETWHCODE = "/api/pdaio/pdaioIn/getWhcode.action";
+    private static final String ADDRESSTAIL_COUNTING_NEWPRODINOUT = "/api/pdaio/pdaioIn/newProdinout.action";
+
+
     /**
      * 补贴库存条码
      */
@@ -1125,6 +1136,9 @@ public class GloableParams {
         GloableParams.ADDRESS_DOCUMENTLIBRARY_SAVE_OUTBOUNDLIST= uriHead + GloableParams.ADDRESSTAIL_SAVVE_OUTBOUNDLIST;
         GloableParams.ADDRESS_DOCUMENTLIBRARY_SAVE_GETBARCODEINFODEVICE= uriHead + GloableParams.ADDRESSTAIL_BARSTOCK_GETBARCODEINFODEVICE;
 
+        GloableParams.ADDRESS_PDAIO_IN_GETWHCODE = uriHead + GloableParams.ADDRESSTAIL_PDAIO_IN_GETWHCODE;
+        GloableParams.ADDRESS_OUTMATERIAL_NEWPRODINOUT = uriHead + GloableParams.ADDRESSTAIL_COUNTING_NEWPRODINOUT;
+        GloableParams.ADDRESS_DOCUMENT_DETAILS = uriHead + GloableParams.ADDRESSTAIL_DOCUMENT_DETAILS;
 
 
 

app/src/main/res/drawable/login_technological_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="@color/bg_recycle"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/bg_recycle"/>
+
+</shape>

app/src/main/res/drawable/login_technological_process.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/login_technological_bg" android:state_selected="true" />
+    <item android:drawable="@drawable/un_login_technological_bg" />
+</selector>

app/src/main/res/drawable/un_login_technological_bg.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <corners android:radius="4dp"/>
+
+    <solid android:color="@color/white"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/white"/>
+
+</shape>

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

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F2F2F2"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical"
+        android:padding="16dp">
+        <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:padding="10dp"
+                android:text="仓库编号"
+                android:textColor="@color/red"
+                android:textSize="14sp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_line_edittext"
+                android:orientation="horizontal"
+                android:layout_weight="1">
+
+                <com.uas.pda_smart_com_lg.view.ClearableEditText
+                    android:id="@+id/ed_jump"
+                    style="@style/EditTextStyle"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:hint="请输入仓库编号"
+                    android:imeOptions="actionSend"
+                    android:textColor="@color/black" />
+
+
+            </LinearLayout>
+            <ImageView
+                android:id="@+id/iv_search"
+                android:layout_width="@dimen/dp_40"
+                android:layout_height="@dimen/dp_40"
+                android:layout_gravity="center_vertical"
+                android:background="@drawable/bg_button"
+                android:layout_marginLeft="@dimen/space_left_5"
+                android:src="@drawable/search_48"/>
+
+        </LinearLayout>
+        <TextView
+            android:id="@+id/tv_moren"
+            android:text="默认仓库:"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/blueq"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginBottom="5dp"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:visibility="gone">
+        </TextView>
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_data"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+        </android.support.v7.widget.RecyclerView>
+
+
+    </LinearLayout>
+    <Button
+        android:id="@+id/storage_in_add_detail_commit_btn"
+        style="@style/ButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:text="确认" />
+</RelativeLayout>

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

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:ignore="MissingDefaultResource">
+
+    <LinearLayout
+        android:background="@drawable/login_technological_process"
+        android:id="@+id/line_true"
+        android:layout_marginTop="5dp"
+        android:layout_marginLeft="30dp"
+        android:layout_marginRight="30dp"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp">
+
+        <TextView
+            android:id="@+id/macode_ip__Tv"
+            android:gravity="center"
+            android:text=""
+            android:layout_gravity="center"
+            android:layout_width="0dp"
+            android:layout_weight="5"
+            android:layout_height="wrap_content"
+            />
+
+    </LinearLayout>
+</RelativeLayout>

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

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="12dp"
+    android:background="@color/background"
+    android:orientation="vertical">
+    <TextView
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:padding="14dp"
+        android:text="请采集岗位资源" />
+
+    <LinearLayout
+        android:layout_marginTop="@dimen/dp_10"
+        android:id="@+id/line_top"
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:background="@color/white"
+        android:orientation="horizontal">
+
+        <com.uas.pda_smart_com_lg.view.ClearableEditText
+            android:id="@+id/edit_et"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_line_edittext"
+            android:gravity="center_vertical"
+            android:hint="请输入要搜索的内容"
+            android:padding="5dp"
+            android:textSize="14sp"/>
+
+        <ImageView
+            android:id="@+id/search_im"
+            android:layout_width="46dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/bg_button"
+            android:src="@drawable/search_48" />
+    </LinearLayout>
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_ip_port_data"
+        android:layout_centerHorizontal="true"
+        android:layout_width="match_parent"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginRight="@dimen/dp_10"
+        android:layout_below="@+id/line_top"
+        android:layout_height="200dp"
+        android:layout_marginTop="30dp">
+    </android.support.v7.widget.RecyclerView>
+    <LinearLayout
+        android:layout_below="@+id/rv_ip_port_data"
+        android:layout_centerHorizontal="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp">
+
+
+        <Button
+            android:id="@+id/cancle_tv"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:background="@drawable/selector_cancel_bg"
+            android:gravity="center"
+            android:text="取消"
+            android:textColor="@color/selector_cancel_text_color" />
+        <Button
+            android:id="@+id/sure_tv"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:background="@drawable/selector_confirm_bg"
+            android:gravity="center"
+            android:text="确定"
+            android:textColor="@color/white" />
+    </LinearLayout>
+
+
+
+
+
+
+</RelativeLayout>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--主菜单griditem布局-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="10dp"
+    android:paddingBottom="10dp"
+    android:paddingLeft="15dp"
+    android:paddingRight="10dp"
+    >
+
+    <TextView
+        android:id="@+id/tv_pichi"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingLeft="6dp"
+        android:textColor="@color/body_text_1"
+        android:textSize="14sp"
+        android:layout_gravity="right"
+        tools:text="" />
+
+
+</LinearLayout>
+

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

@@ -38,7 +38,18 @@
             android:padding="5dp"
             android:text="产品明细">
         </TextView>
+
+        <TextView
+            android:layout_marginStart="10dp"
+            android:id="@+id/tv_generate_document_details"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/gray_light"
+            android:padding="5dp"
+            android:text="生成单据明细"/>
+
     </LinearLayout>
+
     <TextView
         android:id="@+id/tv_qty"
         android:layout_width="wrap_content"

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

@@ -16,6 +16,7 @@
                     android:id="@+id/title_dialog_confirm"
                     style="@style/PopWinTitleStyle"
                     android:text="提示"/>
+
                 <com.uas.pda_smart_com_lg.view.CustomScrollView
                     android:layout_below="@id/title_dialog_confirm"
                     android:id="@+id/sl_popwin_confirm"
@@ -26,6 +27,7 @@
                         android:id="@+id/tv_dialog_confirm_notice"
                         style="@style/PopWinContentTextStyle"/>
                 </com.uas.pda_smart_com_lg.view.CustomScrollView>
+
                 <RelativeLayout
                     android:id="@+id/rl_btn_confirmdialog"
                     android:layout_below="@id/sl_popwin_confirm"

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

@@ -58,7 +58,6 @@
                 android:text="@string/text_btn_close"/>
             <Button
                 android:id="@+id/btn_print"
-                android:layout_toLeftOf="@id/btn_dialog_confirm_ok"
                 style="@style/PopwinCancleButtonStyle"
                 android:text="@string/text_btn_print"/>
         </RelativeLayout>

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

@@ -100,4 +100,7 @@
     <color name="menu_item_press">#DFDEDE</color>
 
     <color name="titleBlue">#BF2F95DD</color> <!-- 青蓝色 -->
+
+    <color name="bg_recycle">#96CBF8</color>
+
 </resources>

build.gradle

@@ -3,6 +3,11 @@
 
 buildscript {
     repositories {
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
+        maven { url "https://jitpack.io" }
         google()
         jcenter()
         maven {
@@ -11,7 +16,9 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        //classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.1'
+
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
 //        classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.13'
@@ -23,6 +30,11 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
+        maven { url "https://jitpack.io" }
         google()
         jcenter()
         maven {
@@ -39,7 +51,7 @@ task clean(type: Delete) {
 
 ext {
     android = [
-            minSdkVersion    : 16,
+            minSdkVersion    : 17,
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

pda_libs/pulltoreflashlibrary/.gitignore

@@ -0,0 +1 @@
+/build

pda_libs/pulltoreflashlibrary/src/main/AndroidManifest.xml

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="2110"
-    android:versionName="2.1.1" >
-
-    <uses-sdk android:minSdkVersion="12" />
-
-    <application />
-
+    >
 </manifest>