增加物料选择页面

app/src/main/java/com/uas/uas_mes_stw/bean/MaterialBean.java

@@ -0,0 +1,79 @@
+package com.uas.uas_mes_stw.bean;
+
+import java.util.Objects;
+
+public class MaterialBean {
+
+    //"PD_ID": 23,       //单据明细ID
+    //"PD_PRODCODE": "4-004-37-0056",       //物料编号
+    //"PD_OUTQTY": "123",                //数量
+    //"PR_DETAIL": "B4-IC",        //名称
+    //"PR_SPEC": "BAT32G135-S",         //规格
+
+
+    private String PD_ID ;
+    private String PD_PRODCODE ;
+    private String PD_OUTQTY ;
+    private String PR_DETAIL ;
+    private String PR_SPEC ;
+
+
+    public String getPD_ID() {
+        return PD_ID;
+    }
+
+    public void setPD_ID(String PD_ID) {
+        this.PD_ID = PD_ID;
+    }
+
+    public String getPD_PRODCODE() {
+        return PD_PRODCODE;
+    }
+
+    public void setPD_PRODCODE(String PD_PRODCODE) {
+        this.PD_PRODCODE = PD_PRODCODE;
+    }
+
+    public String getPD_OUTQTY() {
+        return PD_OUTQTY;
+    }
+
+    public void setPD_OUTQTY(String PD_OUTQTY) {
+        this.PD_OUTQTY = PD_OUTQTY;
+    }
+
+    public String getPR_DETAIL() {
+        return PR_DETAIL;
+    }
+
+    public void setPR_DETAIL(String PR_DETAIL) {
+        this.PR_DETAIL = PR_DETAIL;
+    }
+
+    public String getPR_SPEC() {
+        return PR_SPEC;
+    }
+
+    public void setPR_SPEC(String PR_SPEC) {
+        this.PR_SPEC = PR_SPEC;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        MaterialBean that = (MaterialBean) o;
+        return Objects.equals(PD_ID, that.PD_ID) &&
+                Objects.equals(PD_PRODCODE, that.PD_PRODCODE) &&
+                Objects.equals(PD_OUTQTY, that.PD_OUTQTY) &&
+                Objects.equals(PR_DETAIL, that.PR_DETAIL) &&
+                Objects.equals(PR_SPEC, that.PR_SPEC);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(PD_ID, PD_PRODCODE, PD_OUTQTY, PR_DETAIL, PR_SPEC);
+    }
+}

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

@@ -239,8 +239,6 @@ public class JltStorageInFilterListFragment extends BaseFragment implements OnCo
             }
         });
 
-
-
         mNumColumn.setOnColumnItemClickListener(this);
         mClassColumn.setOnColumnItemClickListener(this);
         mSupplierColumn.setOnColumnItemClickListener(this);

app/src/main/java/com/uas/uas_mes_stw/fragment/MaterialRequisitionApplicationFragment.java

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -354,7 +355,6 @@ public class MaterialRequisitionApplicationFragment extends BaseFragment impleme
             rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);;
         }
 
-
     }
 
     private void initresourcesPopupWindow() {
@@ -636,11 +636,13 @@ public class MaterialRequisitionApplicationFragment extends BaseFragment impleme
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
-                        .url(GloableParams.ADDRESS_OUTMATERIAL_NEWPRODINOUT)
+//                        .url(GloableParams.ADDRESS_OUTMATERIAL_NEWPRODINOUT)
+                        .url(GloableParams.ADDRESS_PICKING_CONFIRM)
                         .method(Request.Method.POST)
                         .tag(TAG + "getMaCode")
                         .flag(0)
-                        .addParam("pi_class", "其他出库单")//必填单据类型
+//                        .addParam("pi_class", "其他出库单")//必填单据类型
+                        .addParam("pi_type", maFunName)//必填单据类型
                         .addParam("pi_whcode",sc_code)//必填 仓库
                         .build(), new HttpCallback() {
                     @Override
@@ -659,7 +661,6 @@ public class MaterialRequisitionApplicationFragment extends BaseFragment impleme
                                 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);
-
                             }
                         }
                     }
@@ -673,7 +674,9 @@ public class MaterialRequisitionApplicationFragment extends BaseFragment impleme
 
     }
     private void jumpToStorageInAddDetail(String pi_id, String pi_inoutno, String pi_whcode,String pi_whname) {
-        MateriaialequisitionApplictionDetailFragment mFragment = new MateriaialequisitionApplictionDetailFragment();
+//        MateriaialequisitionApplictionDetailFragment mFragment = new MateriaialequisitionApplictionDetailFragment();
+
+        Fragment mFragment = new MaterialSelection();
         Bundle bundle = new Bundle();
         bundle.putString("pi_class", "其它出库单");
         bundle.putString("pi_id", pi_id);
@@ -682,7 +685,6 @@ public class MaterialRequisitionApplicationFragment extends BaseFragment impleme
         bundle.putString("pi_whname", pi_whname);
 
         mFragment.setArguments(bundle);
-
         FragmentUtils.switchFragment(MaterialRequisitionApplicationFragment.this, mFragment);
     }
 

app/src/main/java/com/uas/uas_mes_stw/fragment/MaterialSelection.java

@@ -0,0 +1,441 @@
+package com.uas.uas_mes_stw.fragment;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+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.bin.david.form.core.SmartTable;
+import com.bin.david.form.core.TableConfig;
+import com.bin.david.form.data.CellInfo;
+import com.bin.david.form.data.column.Column;
+import com.bin.david.form.data.column.ColumnInfo;
+import com.bin.david.form.data.format.bg.BaseCellBackgroundFormat;
+import com.bin.david.form.data.format.draw.ImageResDrawFormat;
+import com.bin.david.form.data.style.FontStyle;
+import com.bin.david.form.data.table.TableData;
+import com.bin.david.form.listener.OnColumnClickListener;
+import com.bin.david.form.listener.OnColumnItemClickListener;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+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_stw.R;
+import com.uas.uas_mes_stw.bean.JLTStorageInBean;
+import com.uas.uas_mes_stw.bean.MaterialBean;
+import com.uas.uas_mes_stw.global.GloableParams;
+import com.uas.uas_mes_stw.util.CameraUtil;
+import com.uas.uas_mes_stw.util.CommonUtil;
+import com.uas.uas_mes_stw.util.FastjsonUtil;
+import com.uas.uas_mes_stw.util.HttpCallback;
+import com.uas.uas_mes_stw.util.HttpParams;
+import com.uas.uas_mes_stw.util.StringUtil;
+import com.uas.uas_mes_stw.util.VollyRequest;
+import com.uas.uas_mes_stw.view.ClearableEditText;
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import cc.cloudist.acplibrary.ACProgressFlower;
+import razerdp.basepopup.BasePopupWindow;
+
+public class MaterialSelection extends BaseFragment implements OnColumnItemClickListener<String> {
+
+    private TextView tv_inoutno,tv_cangku;
+    private Button bt_material_selection;
+    private SmartRefreshLayout srl_list_refresh;
+    private SmartTable st_list;
+
+    private Column<Boolean> mCheckColumn;
+    private Column<Long> mPosColumn;
+    private Column<String> mNumColumn, mClassColumn, mStateColumn, mWhcodeColumn, mWhcodeDesColumn, mSupplierColumn;
+    private String pi_inoutno,pi_whcode,pi_id,pi_whname,pi_class;
+
+    private TableData<MaterialBean> mTableData;
+    private List<MaterialBean> mMaterialBeans;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_material_selection;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("物料选择");
+        mMaterialBeans = new ArrayList<>();
+        tv_inoutno = root.findViewById(R.id.tv_inoutno);
+        tv_cangku = root.findViewById(R.id.tv_cangku);
+        bt_material_selection = root.findViewById(R.id.bt_material_selection);
+        srl_list_refresh = root.findViewById(R.id.srl_list_refresh);
+        st_list = root.findViewById(R.id.st_list);
+
+        //        bundle.putString("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);
+        Bundle arguments = getArguments();
+        if (arguments != null) {
+            pi_id = arguments.getString("pi_id");
+            pi_inoutno = arguments.getString("pi_inoutno");
+            pi_whcode = arguments.getString("pi_whcode");
+            pi_whname = arguments.getString("pi_whname");
+            pi_class = arguments.getString("pi_class");
+        }
+
+        tv_inoutno.setText(pi_inoutno);
+        tv_cangku.setText(pi_whname);
+
+        srl_list_refresh.setEnableAutoLoadMore(false);
+
+        WindowManager wm = mActivity.getWindowManager();
+        int screenWith = wm.getDefaultDisplay().getWidth();
+        st_list.getConfig().setMinTableWidth(screenWith)    //设置表格最小宽度
+                .setShowXSequence(false)        //设置是否显示顶部序号列
+                .setShowYSequence(false)           //设置是否显示左侧序号列
+                .setShowTableTitle(false)       //设置是否显示表格标题
+                .setFixedTitle(true)        //固定列标题
+                .setVerticalPadding(CommonUtil.dip2px(mActivity, 12))       //设置网格列padding
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity, 12))    //列标题上下padding
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity, 10))     //设置网格行padding
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity, 10))     //设置序列水平填充
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity, 10))      //增加列标题左右padding
+                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity, 15), Color.parseColor("#000000")))   //设置列标题文字样式
+                .setContentCellBackgroundFormat(new BaseCellBackgroundFormat<CellInfo>() {      //设置内容单元格背景格式
+                    @Override
+                    public int getBackGroundColor(CellInfo cellInfo) {
+                        if (cellInfo.row % 2 == 0) {
+                            return ContextCompat.getColor(mActivity, R.color.blue_50);
+                        }
+                        return TableConfig.INVALID_COLOR;
+                    }
+                });
+
+        mCheckColumn = new Column<Boolean>("全选", "isSelect",
+                new ImageResDrawFormat<Boolean>(CommonUtil.dip2px(mActivity, 20), CommonUtil.dip2px(mActivity, 20)) {
+                    @Override
+                    protected Context getContext() {
+                        return mActivity;
+                    }
+
+                    @Override
+                    protected int getResourceID(Boolean aBoolean, String value, int position) {
+                        if (aBoolean) {
+                            return R.drawable.ic_check;
+                        } else {
+                            return R.drawable.ic_uncheck;
+                        }
+                    }
+                });
+        mCheckColumn.setFixed(true);
+        mPosColumn = new Column<Long>("序号", "POS");
+        mPosColumn.setFixed(true);
+        mNumColumn = new Column<String>("单号", "PI_INOUTNO");
+        mNumColumn.setFixed(true);
+        mClassColumn = new Column<String>("类型", "PI_CLASS");
+        mSupplierColumn = new Column<String>("供应商", "PI_TITLE");
+        mWhcodeColumn = new Column<String>("仓库编号", "PI_WHCODE");
+        mWhcodeDesColumn = new Column<String>("仓库名称", "PI_WHNAME");
+        mStateColumn = new Column<String>("状态", "PI_STATUS");
+
+    }
+
+    @Override
+    protected void initEvents() {
+        bt_material_selection.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //弹出表格
+//                initGetMaterialSelection();
+            }
+        });
+
+        mCheckColumn.setOnColumnItemClickListener(new OnColumnItemClickListener<Boolean>() {
+            @Override
+            public void onClick(Column<Boolean> column, String value, Boolean aBoolean, int position) {
+//                itemCheck(position);
+            }
+        });
+
+        st_list.setOnColumnClickListener(new OnColumnClickListener() {
+            @Override
+            public void onClick(ColumnInfo columnInfo) {
+//                if (columnInfo.column == mCheckColumn) {
+//                    allCheck();
+//                }
+            }
+        });
+
+        srl_list_refresh.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(RefreshLayout refreshLayout) {
+//                mPageIndex = 1;
+//                getInDataList();
+            }
+        });
+
+        srl_list_refresh.setOnLoadMoreListener(new OnLoadMoreListener() {
+            @Override
+            public void onLoadMore(RefreshLayout refreshLayout) {
+//                mPageIndex++;
+//                getInDataList();
+            }
+        });
+
+//        mNumColumn.setOnColumnItemClickListener(this);
+//        mClassColumn.setOnColumnItemClickListener(this);
+//        mSupplierColumn.setOnColumnItemClickListener(this);
+//        mWhcodeColumn.setOnColumnItemClickListener(this);
+//        mWhcodeDesColumn.setOnColumnItemClickListener(this);
+//        mStateColumn.setOnColumnItemClickListener(this);
+    }
+
+    @Override
+    protected void initDatas() {
+        getInDataForm();
+    }
+
+    private StringRequest mStringRequest;
+
+    private void getInDataForm() {
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_PICKING_DOCUMENT_DETAILS)
+                        .method(Request.Method.POST)
+                        .tag(TAG + "getMaCode")
+                        .flag(0)
+                        .addParam("piid",pi_id)//必填 仓库
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        if (isSuccess){
+                            try {
+                                String result = o.toString();
+                                JSONObject resultObject = JSON.parseObject(result);
+                                JSONArray dataArray = resultObject.getJSONArray("data");
+                                List<MaterialBean> list = new ArrayList<>();
+                                if (dataArray != null && dataArray.size() > 0) {
+                                    for (int i = 0; i < dataArray.size(); i++) {
+                                        JSONObject dataObject = dataArray.getJSONObject(i);
+                                        if (dataObject != null) {
+                                            MaterialBean materialBean = new MaterialBean();
+                                            materialBean.setPD_ID(FastjsonUtil.getText(dataObject, "PD_ID"));
+                                            materialBean.setPR_DETAIL(FastjsonUtil.getText(dataObject, "PD_PRODCODE"));
+                                            materialBean.setPD_OUTQTY(FastjsonUtil.getText(dataObject, "PD_OUTQTY"));
+                                            materialBean.setPR_DETAIL(FastjsonUtil.getText(dataObject, "PR_DETAIL"));
+                                            materialBean.setPR_SPEC(FastjsonUtil.getText(dataObject, "PR_SPEC"));
+                                            list.add(materialBean);
+                                        }
+                                    }
+                                }
+                               if (list.size() > 0) {
+                                   mMaterialBeans.addAll(list);
+                                   st_list.addData(list, true);
+                                   new Handler().postDelayed(new Runnable() {
+                                       @Override
+                                       public void run() {
+                                           st_list.postInvalidate();
+                                       }
+                                   }, 100);
+                                   progressDialog.dismiss();
+                                   //                                mRefreshLayout.finishRefresh(0);
+                                   //                                mRefreshLayout.finishLoadMore(0);
+                               }
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                                progressDialog.dismiss();
+//                                mRefreshLayout.finishRefresh(0);
+//                                mRefreshLayout.finishLoadMore(0);
+                            }
+                        }
+                    }
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+    }
+
+//    private void initGetMaterialSelection() {
+//        View contView = LayoutInflater.from(mActivity).inflate(R.layout.pop_material_table, null);
+//        ClearableEditText 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);
+//        SmartTable st_pop_list = contView.findViewById(R.id.st_pop_list);
+//        rv_getline_ip_port_data.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
+//        rv_getline_ip_port_data.setLayoutManager(new LinearLayoutManager(mActivity));
+//        getLinePortAdapter.setmList(personnelList);
+//        rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+//        getPersonnelID();
+//
+//        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);
+//        search_im.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                String mSearchStr = edit_et.getText().toString().trim();
+//                if (!mSearchStr.isEmpty()) {
+//                    List<LineCodeEntity> thisList = new ArrayList<>();
+//                    for(int i=0;i<personnelList.size();i++){
+//                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr)){
+//                            thisList.add(personnelList.get(i));
+//                        }
+//                        if(i == personnelList.size() -1){
+//                            getLinePortAdapter = new GetLinePortAdapter(thisList);
+//                            rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+//                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+//
+//                        }
+//                        List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+//                        for (int j = 0; j < lineCodeEntities.size(); j++) {
+//                            lineCodeEntities.get(j).setChecked(false);
+//                        }
+//                        getLinePortAdapter.notifyDataSetChanged();
+//                    }
+//
+//
+//                } else {
+//                    getLinePortAdapter = new GetLinePortAdapter(personnelList);
+//                    rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
+//                    List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+//                    for (int i = 0; i < lineCodeEntities.size(); i++) {
+//                        lineCodeEntities.get(i).setChecked(false);
+//                    }
+//                    getLinePortAdapter.notifyDataSetChanged();
+//
+//                }
+//                getLinePortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+//                    @Override
+//                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+//                        List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+//                        li_personne_id = lineCodeEntities.get(position).getLI_CODE();
+//                        for (int i = 0; i < lineCodeEntities.size(); i++) {
+//                            lineCodeEntities.get(i).setChecked(false);
+//                        }
+//                        lineCodeEntities.get(position).setChecked(true);
+//                        getLinePortAdapter.notifyDataSetChanged();
+//                    }
+//                });
+//            }
+//        });
+//
+//        getLinePortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+//            @Override
+//            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+//                List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
+//                li_personne_id = lineCodeEntities.get(position).getLI_CODE();
+//                for (int i = 0; i < lineCodeEntities.size(); i++) {
+//                    lineCodeEntities.get(i).setChecked(false);
+//                }
+//                lineCodeEntities.get(position).setChecked(true);
+//                getLinePortAdapter.notifyDataSetChanged();
+//            }
+//        });
+//
+//        //确定
+//        sure_tv.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                if (!StringUtil.isEmpty(li_personne_id)){
+//                    tv_dc_emcode.setText(li_personne_id);
+//                }else {
+//                    CommonUtil.toastNoRepeat(mActivity,"请选择人员编号");
+//                    return;
+//                }
+//                closeListPopupWindow();
+//            }
+//        });
+//
+//        //取消
+//        cancle_tv.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                closeListPopupWindow();
+//            }
+//        });
+//
+//    }
+
+    private void setFilterTableData(List<MaterialBean> filterTableData) {
+        mTableData = new TableData<MaterialBean>("物料单据", filterTableData,
+                mNumColumn, mClassColumn, mSupplierColumn, mWhcodeColumn, mWhcodeDesColumn, mStateColumn);
+        st_list.setTableData(mTableData);
+        //        mSmartTable.requestLayout();
+        st_list.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                st_list.postInvalidate();
+            }
+        }, 100);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            setTitle("入库列表");
+            if (!CommonUtil.isRepeatClick()) {
+//                getInDataList();
+            }
+        }
+    }
+
+
+    @Override
+    public void onClick(Column<String> column, String value, String s, int position) {
+
+    }
+}

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

@@ -300,6 +300,8 @@ public class GloableParams {
     public static String ADDRESS_COMMON_SCANENDTRANS;
     public static String ADDRESS_COMMON_GETLOCATIONPROD;
     public static String ADDRESS_COMMON_GETPRODIODETAIL;
+    public static String ADDRESS_PICKING_CONFIRM;
+    public static String ADDRESS_PICKING_DOCUMENT_DETAILS;
 
 
 
@@ -838,6 +840,11 @@ public class GloableParams {
     private static final String ADDRESSTAIL_COUNTING_GETPRODINOUTLIST = "/api/pdaio/pdaioIn/getProdinoutList.action";
     private static final String ADDRESSTAIL_COMMON_DBFIND = "/mobile/common/dbfind.action";
 
+    //领料确认按钮点击事件
+    private static final String ADDRESSTAIL_NEWPRODOUT = "/api/pdaio/pdaioIn/newProdout.action";
+    //领料单单据明细列表接口
+    private static final String ADDRESSTAIL_PICKING_DOCUMENT_DETAILS = "/api/pdaio/pdaioIn/getProdiodetail.action";
+
     /**
      * 领料
      */
@@ -1339,9 +1346,8 @@ public class GloableParams {
         GloableParams.ADDRESS_COMMON_SCANENDTRANS = uriHead + GloableParams.ADDRESSTAIL_PAD_SCANENDTRANS;
         GloableParams.ADDRESS_COMMON_GETLOCATIONPROD = uriHead + GloableParams.ADDRESSTAIL_PAD_GETLOCATIONPROD;
         GloableParams.ADDRESS_COMMON_GETPRODIODETAIL = uriHead + GloableParams.ADDRESSTAIL_COMMON_GETPRODIODETAIL;
-
-
-
+        GloableParams.ADDRESS_PICKING_CONFIRM = uriHead + GloableParams.ADDRESSTAIL_NEWPRODOUT;
+        GloableParams.ADDRESS_PICKING_DOCUMENT_DETAILS = uriHead + GloableParams.ADDRESSTAIL_PICKING_DOCUMENT_DETAILS;
 
 
 

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

@@ -0,0 +1,83 @@
+<?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="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        >
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="单号：">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_inoutno"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="">
+            </TextView>
+        </LinearLayout>
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="仓库：">
+            </TextView>
+            <TextView
+                android:id="@+id/tv_cangku"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="">
+            </TextView>
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/bt_material_selection"
+        style="@style/ButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:text="领料物料选择"
+       />
+
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/srl_list_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <com.scwang.smartrefresh.layout.header.ClassicsHeader
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <com.bin.david.form.core.SmartTable
+            android:id="@+id/st_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <com.scwang.smartrefresh.layout.footer.ClassicsFooter
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:srlAccentColor="@android:color/darker_gray" />
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+</LinearLayout>

app/src/main/res/layout/pop_material_table.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="wrap_content"
+    android:layout_margin="12dp"
+    android:background="@color/background"
+    android:orientation="vertical">
+
+    <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.uas_mes_stw.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>
+
+    <com.bin.david.form.core.SmartTable
+        android:id="@+id/st_pop_list"
+        android:layout_below="@+id/line_top"
+        android:layout_above="@+id/ll_ok_cancle"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="10dp"
+        />
+
+    <LinearLayout
+        android:id="@+id/ll_ok_cancle"
+        android:layout_alignParentBottom="true"
+        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/bt_cancle"
+            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/bt_ok"
+            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>