移动端物料变更界面功能开发，点击可更改料号和数量数据，多选，全选

app/src/main/java/com/uas/uas_mes_zb_p/adapter/TakeApartThePalletAdapter.java

@@ -0,0 +1,25 @@
+package com.uas.uas_mes_zb_p.adapter;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.uas.uas_mes_zb_p.bean.TakeApartThePalletBean;
+
+/**
+ * Created by cjh-sail on 2023-02-15
+ */
+public class TakeApartThePalletAdapter extends BaseQuickAdapter<TakeApartThePalletBean, BaseViewHolder> {
+
+    public TakeApartThePalletAdapter(int layoutResId) {
+        super(layoutResId);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, TakeApartThePalletBean item) {
+
+    }
+
+    @Override
+    public void onBindViewHolder(BaseViewHolder holder, int position) {
+        super.onBindViewHolder(holder, position);
+    }
+}

app/src/main/java/com/uas/uas_mes_zb_p/bean/CheckProdcodeBean.java

@@ -0,0 +1,80 @@
+package com.uas.uas_mes_zb_p.bean;
+
+/**
+ * Created by cjh-sail on 2023-02-17
+ */
+public class CheckProdcodeBean {
+    private String pd_pdno;
+    private String pd_id;
+    private String pd_prodcode;
+    private String pr_detail;
+    private String pr_spec;
+    private String pd_outqty;
+    boolean isChecked;
+
+    public CheckProdcodeBean(String pd_pdno, String pd_id, String pd_prodcode, String pr_detail, String pr_spec, String pd_outqty) {
+        this.pd_pdno = pd_pdno;
+        this.pd_id = pd_id;
+        this.pd_prodcode = pd_prodcode;
+        this.pr_detail = pr_detail;
+        this.pr_spec = pr_spec;
+        this.pd_outqty = pd_outqty;
+    }
+    public CheckProdcodeBean(){}
+
+    public String getPd_pdno() {
+        return pd_pdno;
+    }
+
+    public void setPd_pdno(String pd_pdno) {
+        this.pd_pdno = pd_pdno;
+    }
+
+    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 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;
+    }
+
+    public String getPd_outqty() {
+        return pd_outqty;
+    }
+
+    public void setPd_outqty(String pd_outqty) {
+        this.pd_outqty = pd_outqty;
+    }
+
+    public boolean getChecked() {
+        return isChecked;
+    }
+
+    public void setChecked(boolean checked) {
+        isChecked = checked;
+    }
+}

app/src/main/java/com/uas/uas_mes_zb_p/bean/JsonStorateBean.java

@@ -0,0 +1,40 @@
+package com.uas.uas_mes_zb_p.bean;
+
+/**
+ * Created by cjh-sail on 2023-02-02
+ */
+public class JsonStorateBean {
+    private String pd_id;
+    private String pd_prodcode;
+    private String pd_outqty;
+
+    public JsonStorateBean(String pd_id, String pd_prodcode, String pd_outqty) {
+        this.pd_id = pd_id;
+        this.pd_prodcode = pd_prodcode;
+        this.pd_outqty = pd_outqty;
+    }
+
+    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;
+    }
+}

app/src/main/java/com/uas/uas_mes_zb_p/bean/OutBoundListAddDalieBean.java

@@ -29,6 +29,7 @@ public class OutBoundListAddDalieBean {
     private String PD_BARCODEQTY;
     private String PD_WMPDNO;
     private String PR_SPEC;
+    private String BAR_LOACTION;
 
 
     public OutBoundListAddDalieBean(){
@@ -54,6 +55,14 @@ public class OutBoundListAddDalieBean {
 
     }
 
+    public String getBAR_LOACTION() {
+        return BAR_LOACTION;
+    }
+
+    public void setBAR_LOACTION(String BAR_LOACTION) {
+        this.BAR_LOACTION = BAR_LOACTION;
+    }
+
     public String getPR_SPEC() {
         return PR_SPEC;
     }

app/src/main/java/com/uas/uas_mes_zb_p/bean/TakeApartThePalletBean.java

@@ -0,0 +1,72 @@
+package com.uas.uas_mes_zb_p.bean;
+
+/**
+ * Created by cjh-sail on 2023-02-15
+ */
+public class TakeApartThePalletBean {
+    private String pd_pdno;
+    private String pd_id;
+    private String pd_prodcode;
+    private String pr_detail;
+    private String pr_spec;
+    private String pd_outqty;
+
+    public TakeApartThePalletBean(String pd_pdno, String pd_id, String pd_prodcode, String pr_detail, String pr_spec, String pd_outqty) {
+        this.pd_pdno = pd_pdno;
+        this.pd_id = pd_id;
+        this.pd_prodcode = pd_prodcode;
+        this.pr_detail = pr_detail;
+        this.pr_spec = pr_spec;
+        this.pd_outqty = pd_outqty;
+    }
+
+    public String getPd_pdno() {
+        return pd_pdno;
+    }
+
+    public void setPd_pdno(String pd_pdno) {
+        this.pd_pdno = pd_pdno;
+    }
+
+    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 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 String setPr_spec(String pr_spec) {
+        this.pr_spec = pr_spec;
+        return pr_spec;
+    }
+
+    public String getPd_outqty() {
+        return pd_outqty;
+    }
+
+    public String setPd_outqty(String pd_outqty) {
+        this.pd_outqty = pd_outqty;
+        return pd_outqty;
+    }
+}

app/src/main/java/com/uas/uas_mes_zb_p/fragment/MaterialChangeFragment.java

@@ -0,0 +1,54 @@
+package com.uas.uas_mes_zb_p.fragment;
+
+import android.view.KeyEvent;
+
+import com.uas.uas_mes_zb_p.R;
+import com.uas.uas_mes_zb_p.activity.FunctionActivity;
+
+/**
+ * Created by cjh-sail on 2023-02-15
+ * 拆分(有库存)
+ */
+public class MaterialChangeFragment extends BaseFragment{
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_materialchage;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle(getString(R.string.title_takeapartthepallet));
+        ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+    }
+
+    @Override
+    protected void initEvents() {
+
+    }
+
+    @Override
+    protected void initDatas() {
+
+    }
+
+    @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) {
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        } else {
+            FunctionActivity.setTitle(getString(R.string.title_takeapartthepallet));
+            ((FunctionActivity) getActivity()).setListIconIvVisible(true);
+        }
+    }
+
+}

app/src/main/java/com/uas/uas_mes_zb_p/fragment/OutboundListAdd_Fragment.java

@@ -51,6 +51,7 @@ import com.uas.uas_mes_zb_p.util.CameraUtil;
 import com.uas.uas_mes_zb_p.util.CommonUtil;
 import com.uas.uas_mes_zb_p.util.Constants;
 import com.uas.uas_mes_zb_p.util.FastjsonUtil;
+import com.uas.uas_mes_zb_p.util.FragmentUtils;
 import com.uas.uas_mes_zb_p.util.HttpCallback;
 import com.uas.uas_mes_zb_p.util.HttpParams;
 import com.uas.uas_mes_zb_p.util.StringUtil;
@@ -79,7 +80,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
     private TextView tv_documents_code;
     private static final int SCAN_BARCODE_CODE = 111;
     private int mFocusId;
-    private Column<String> va_detnoColumn,va_Pd_wmpdnoCoulmn,va_pucodeCoulmn,va_prodcodeColumn,va_qtyColumn,va_codeColumn,va_detailColumn,va_pr_specColumn;
+    private Column<String> va_detnoColumn,va_Pd_wmpdnoCoulmn,va_pucodeCoulmn,va_prodcodeColumn,va_qtyColumn,va_codeColumn,va_detailColumn,va_pr_specColumn,va_bar_loactioncColumn;
     private TableData<OutBoundListAddDalieBean> mTableData;
     private List<OutBoundListAddDalieBean> mFilterStorageInBeans;
     private String va_ids;
@@ -226,6 +227,8 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
 
         va_detailColumn = new Column<String>("名称", "PR_DETAIL");
         va_pr_specColumn = new Column<String>("规格", "PR_SPEC");
+        va_bar_loactioncColumn = new Column<String>("储位", "BAR_LOACTION");
+
         va_detnoColumn.setOnColumnItemClickListener(this);
         va_pucodeCoulmn.setOnColumnItemClickListener(this);
         va_prodcodeColumn.setOnColumnItemClickListener(this);
@@ -233,6 +236,8 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
         va_detailColumn.setOnColumnItemClickListener(this);
         va_codeColumn.setOnColumnItemClickListener(this);
         va_pr_specColumn.setOnColumnItemClickListener(this);
+        va_bar_loactioncColumn.setOnColumnItemClickListener(this);
+
 
 //        ceshiData();
     }
@@ -676,6 +681,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                                 jltStorageInBean.setPD_OUTQTY(FastjsonUtil.getText(dataObject, "PD_OUTQTY"));
                                 jltStorageInBean.setPR_DETAIL(FastjsonUtil.getText(dataObject, "PR_DETAIL"));
                                 jltStorageInBean.setPR_SPEC(FastjsonUtil.getText(dataObject, "PR_SPEC"));
+                                jltStorageInBean.setBAR_LOACTION(FastjsonUtil.getText(dataObject, "BAR_LOACTION"));
 
                                 jltStorageInBean.setPI_INVOSTATUSCODE(FastjsonUtil.getText(dataObject, "PI_INVOSTATUSCODE"));
                                 jltStorageInBean.setPI_STATUSCODE(FastjsonUtil.getText(dataObject, "PI_STATUSCODE"));
@@ -920,7 +926,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
     }
     private void setFilterTableData(List<OutBoundListAddDalieBean> filterTableData) {
         mTableData = new TableData<OutBoundListAddDalieBean>("列表", filterTableData,
-                va_detnoColumn,va_Pd_wmpdnoCoulmn,va_pucodeCoulmn,va_prodcodeColumn,va_qtyColumn,va_codeColumn,va_detailColumn,va_pr_specColumn);
+                va_detnoColumn,va_Pd_wmpdnoCoulmn,va_pucodeCoulmn,va_prodcodeColumn,va_qtyColumn,va_codeColumn,va_detailColumn,va_pr_specColumn,va_bar_loactioncColumn);
         mSmartTable.setTableData(mTableData);
 //        mSmartTable.requestLayout();
         mSmartTable.postDelayed(new Runnable() {
@@ -936,6 +942,8 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             mMenuView = View.inflate(mActivity, R.layout.pop_outboundlist_out_menu2, null);
         }
         Button pop_material_out_resolution = (Button) mMenuView.findViewById(R.id.pop_material_out_resolution);
+        Button take_apart_the_pallet = (Button) mMenuView.findViewById(R.id.take_apart_the_pallet);
+        Button pop_materialchange = (Button) mMenuView.findViewById(R.id.pop_materialchange);
         pop_material_out_resolution.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -944,14 +952,38 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 resolutionData();
-
-
                             }
                         }).setNegativeButton(getString(R.string.cancel), null).create().show();
                 closeMenuPopupWindow();
             }
 
         });
+
+        TakeApartThePalletFragment mfragment=new TakeApartThePalletFragment();
+        take_apart_the_pallet.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Bundle bundle = new Bundle();
+                bundle.putString("pi_id", va_ids);
+                mfragment.setArguments(bundle);
+                FragmentUtils.switchFragment(OutboundListAdd_Fragment.this, mfragment);
+                closeMenuPopupWindow();
+            }
+        });
+
+
+
+        MaterialChangeFragment MaterialChange_fragment=new MaterialChangeFragment();
+        pop_materialchange.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FragmentUtils.switchFragment(OutboundListAdd_Fragment.this, MaterialChange_fragment);
+                closeMenuPopupWindow();
+            }
+        });
+
+
+
         if (mMenuPopupWindow == null) {
             mMenuPopupWindow = new PopupWindow(mMenuView, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
         }

app/src/main/java/com/uas/uas_mes_zb_p/fragment/TakeApartThePalletFragment.java

@@ -0,0 +1,625 @@
+package com.uas.uas_mes_zb_p.fragment;
+
+import android.annotation.SuppressLint;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.DefaultItemAnimator;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.util.SparseBooleanArray;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.uas.uas_mes_zb_p.R;
+import com.uas.uas_mes_zb_p.activity.FunctionActivity;
+import com.uas.uas_mes_zb_p.bean.CheckProdcodeBean;
+import com.uas.uas_mes_zb_p.bean.JsonStorateBean;
+import com.uas.uas_mes_zb_p.bean.TakeApartThePalletBean;
+import com.uas.uas_mes_zb_p.global.GloableParams;
+import com.uas.uas_mes_zb_p.util.CommonUtil;
+import com.uas.uas_mes_zb_p.util.FastjsonUtil;
+import com.uas.uas_mes_zb_p.util.HttpCallback;
+import com.uas.uas_mes_zb_p.util.HttpParams;
+import com.uas.uas_mes_zb_p.util.VollyRequest;
+import com.uas.uas_mes_zb_p.view.ClearableEditText;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import razerdp.basepopup.BasePopupWindow;
+
+/**
+ * Created by cjh-sail on 2023-02-15
+ * 拆分（无库存）
+ */
+public class TakeApartThePalletFragment extends BaseFragment{
+
+    private RecyclerView ra_data;
+    private SelectAdapter selectAdapter;
+    private ArrayList<TakeApartThePalletBean> takeApartThePalletlist;
+    private String va_ids;
+    private PopupWindow editPW;
+    private IpAndPortAdapter andPortAdapter;
+    private List<CheckProdcodeBean> delists;
+    private String pd_prodcode;
+    private CheckBox ck_all;
+    private Button btn_commit;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_takeapartthepallet;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle(getString(R.string.title_materialchange));
+        ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        ra_data = root.findViewById(R.id.ra_data);
+        ck_all = root.findViewById(R.id.ck_all);
+        btn_commit = root.findViewById(R.id.btn_commit);
+    }
+
+    @Override
+    protected void initEvents() {
+        takeApartThePalletlist = new ArrayList<>();
+
+        selectAdapter = new SelectAdapter(takeApartThePalletlist);
+
+        ra_data.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
+        ra_data.setLayoutManager(new LinearLayoutManager(mActivity));
+        //设置Item增加、移除动画
+        ra_data.setItemAnimator(new DefaultItemAnimator());
+        setAdapter(takeApartThePalletlist);
+        ra_data.setAdapter(selectAdapter);
+        Bundle bundle = getArguments();
+        if (bundle != null) {
+            va_ids = bundle.getString("pi_id");
+        }
+
+        setDataarry();
+//        getNewNameData();
+    }
+    public void setDataarry(){
+        JSONObject jsonObject = new JSONObject();
+        JSONArray jsonArray = new JSONArray();
+        JSONObject object_1 = new JSONObject();
+        JSONObject object_2 = new JSONObject();
+        JSONObject object_3 = new JSONObject();
+        JSONObject object_4 = new JSONObject();
+        JSONObject object_5 = new JSONObject();
+        JSONObject object_6 = new JSONObject();
+        try {
+            object_1.put("pd_pdno", "2");
+            object_1.put("pd_id", "11");
+            object_1.put("pd_prodcode", "AA00760H0H04100490-150-NNN000-SY");
+            object_1.put("pr_detail", "生益S1000H(TG150) 耐CAF FR-4");
+            object_1.put("pr_spec", "0.76mm H/Hoz 不含铜 41*49");
+            object_1.put("pd_outqty", "3049");
+
+
+            object_2.put("pd_pdno", "3");
+            object_2.put("pd_id", "11");
+            object_2.put("pd_prodcode", "DB-39217");
+            object_2.put("pr_detail", "加工上板机铝板");
+            object_2.put("pr_spec", "10mm*40mm*940mm");
+            object_2.put("pd_outqty", "1315.995");
+
+            object_3.put("pd_pdno", "4");
+            object_3.put("pd_id", "13");
+            object_3.put("pd_prodcode", "DB-39217");
+            object_3.put("pr_detail", "加工上板机铝板");
+            object_3.put("pr_spec", "10mm*40mm*940mm");
+            object_3.put("pd_outqty", "1315.995");
+
+            object_4.put("pd_pdno", "5");
+            object_4.put("pd_id", "11");
+            object_4.put("pd_prodcode", "DB-39217");
+            object_4.put("pr_detail", "加工上板机铝板");
+            object_4.put("pr_spec", "10mm*40mm*940mm");
+            object_4.put("pd_outqty", "1315.995");
+
+            object_5.put("pd_pdno", "1");
+            object_5.put("pd_id", "11");
+            object_5.put("pd_prodcode", "EM-832408jfaghafo");
+            object_5.put("pr_detail", "涡轮增压");
+            object_5.put("pr_spec", "速度快，耗油");
+            object_5.put("pd_outqty", "10");
+
+            object_6.put("pd_pdno", "1");
+            object_6.put("pd_id", "11");
+            object_6.put("pd_prodcode", "EM-822222222jfaghafo");
+            object_6.put("pr_detail", "涡轮增压2");
+            object_6.put("pr_spec", "速度快2，耗油");
+            object_6.put("pd_outqty", "12");
+            jsonArray.add(object_1);
+            jsonArray.add(object_2);
+            jsonArray.add(object_3);
+            jsonArray.add(object_4);
+            jsonArray.add(object_5);
+            jsonArray.add(object_6);
+            jsonObject.put("items", jsonArray);
+
+            JSONArray dataArray = FastjsonUtil.getJSONArray(jsonObject.toString(), "items");
+            handleFeededData(dataArray);
+            handleRecycleFeededData(dataArray);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    //选择下拉框获取项目名称
+    public void getNewNameData(){
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_ADDRESSTAIL_GETPRODIODETAILT)
+                .method(Request.Method.GET)
+                .addParam("pi_id", va_ids)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(), "items");
+                handleFeededData(dataArray);
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+
+            }
+        });
+    }
+
+    private void handleFeededData(JSONArray dataArray) {
+        TakeApartThePalletBean bean;
+        takeApartThePalletlist.clear();
+        for (Object index : dataArray) {
+            JSONObject data = (JSONObject) index;
+            bean= new TakeApartThePalletBean(
+                    data.getString("pd_pdno"),
+                    data.getString("pd_id"),
+                    data.getString("pd_prodcode"),
+                    data.getString("pr_detail"),
+                    data.getString("pr_spec"),
+                    data.getString("pd_outqty"));
+            takeApartThePalletlist.add(bean);
+        }
+        setAdapter(takeApartThePalletlist);
+    }
+
+
+
+    private void setAdapter(ArrayList<TakeApartThePalletBean> mList) {
+        selectAdapter = new SelectAdapter(mList);
+        ra_data.setAdapter(selectAdapter);
+
+    }
+
+
+
+    @Override
+    protected void initDatas() {
+        ck_all.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked){
+//                    myAdapter.setItemChecked(mFeededList.size(), true);
+//                    myAdapter.setSelectable(true);
+//                    myAdapter.notifyItemChanged(mFeededList.size());
+//                    myAdapter.notifyDataSetChanged();
+                    for (int i2=0;i2<takeApartThePalletlist.size();i2++){
+                        selectAdapter.setItemChecked(i2, true);
+                        selectAdapter.notifyItemChanged(i2);
+                    }
+
+                }else {
+//                    myAdapter.setItemChecked(mFeededList.size(), false);
+//                    myAdapter.setSelectable(false);
+//                    myAdapter.notifyItemChanged(mFeededList.size());
+//                    myAdapter.notifyDataSetChanged();
+                    for (int i2=0;i2<takeApartThePalletlist.size();i2++){
+                        selectAdapter.setItemChecked(i2, false);
+                        selectAdapter.notifyItemChanged(i2);
+                    }
+                }
+                Log.i("选择","isChecked");
+            }
+        });
+
+
+        btn_commit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getDataid();
+            }
+        });
+
+    }
+    public void getDataid(){
+        ArrayList<TakeApartThePalletBean> selectedItem = selectAdapter.getSelectedItem();
+        ArrayList<JsonStorateBean> list=new ArrayList<>();
+
+        for (int i=0;i<selectedItem.size();i++){
+            TakeApartThePalletBean takeApartThePalletBean = selectedItem.get(i);
+            JsonStorateBean jsonStorateBean=new JsonStorateBean(
+                    takeApartThePalletBean.getPd_id(),
+                    takeApartThePalletBean.getPd_prodcode(),
+                    takeApartThePalletBean.getPd_outqty());
+            list.add(jsonStorateBean);
+        }
+        JSONArray jsonArray = new JSONArray();
+        jsonArray.add(list);
+        Log.i("params===未处理",jsonArray.toString());
+        String substring = jsonArray.toString().substring(0, jsonArray.toString().length() - 1);//去除尾部
+        String substring1 = substring.substring(1, substring.length());//去除首部
+        Log.i("params===处理后",substring1);
+    }
+
+    /**
+     *  数修改量
+     */
+    private void initEditPopupWindow(ArrayList<TakeApartThePalletBean> mList,int i) {
+        View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_edit_pup, 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);
+        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);
+        //确定
+        sure_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (edit_et.getText().toString().trim().isEmpty()){
+                    CommonUtil.toastNoRepeat(mActivity,"请输入数量");
+                    return;
+                }
+                mList.get(i).setPd_outqty(edit_et.getText().toString().trim());
+                selectAdapter.notifyDataSetChanged();
+                closeListPopupWindow();
+            }
+        });
+
+        //取消
+        cancle_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeListPopupWindow();
+            }
+        });
+
+
+    }
+
+    /**
+     *  选择物料资料
+     */
+    private void initRecyclePopupWindow(ArrayList<TakeApartThePalletBean> mList,int i) {
+
+
+
+        View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_recycleview_pup, null);
+        ClearableEditText edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
+        RecyclerView rv_ip_port_data = contView.findViewById(R.id.rv_ip_port_data);
+        TextView sure_tv = (TextView) contView.findViewById(R.id.sure_tv);
+        TextView cancle_tv = (TextView) contView.findViewById(R.id.cancle_tv);
+
+        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);
+        andPortAdapter = new IpAndPortAdapter(delists);
+        rv_ip_port_data.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
+        rv_ip_port_data.setLayoutManager(new LinearLayoutManager(mActivity));
+        andPortAdapter.setmList(delists);
+        rv_ip_port_data.setAdapter(andPortAdapter);
+
+        andPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+
+
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                List<CheckProdcodeBean> ipAndPortBeans = andPortAdapter.getmList();
+                pd_prodcode = ipAndPortBeans.get(position).getPd_prodcode();
+
+                for (int s = 0; s < ipAndPortBeans.size(); s++) {
+                    ipAndPortBeans.get(s).setChecked(false);
+                }
+                ipAndPortBeans.get(position).setChecked(true);
+                andPortAdapter.notifyDataSetChanged();
+            }
+        });
+        //确定
+        sure_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (pd_prodcode.isEmpty()){
+                    CommonUtil.toastNoRepeat(mActivity,"请选择规格");
+                    return;
+                }
+                mList.get(i).setPd_prodcode(pd_prodcode);
+                selectAdapter.notifyDataSetChanged();
+                closeListPopupWindow();
+            }
+        });
+
+        //取消
+        cancle_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeListPopupWindow();
+            }
+        });
+    }
+    private void handleRecycleFeededData(JSONArray dataArray) {
+        delists = new ArrayList<>();
+        CheckProdcodeBean bean;
+        delists.clear();
+        for (Object index : dataArray) {
+            JSONObject data = (JSONObject) index;
+            bean= new CheckProdcodeBean(
+                    data.getString("pd_pdno"),
+                    data.getString("pd_id"),
+                    data.getString("pd_prodcode"),
+                    data.getString("pr_detail"),
+                    data.getString("pr_spec"),
+                    data.getString("pd_outqty"));
+            delists.add(bean);
+        }
+
+    }
+    private void closeListPopupWindow() {
+        if (editPW != null) {
+            editPW.dismiss();
+            editPW = null;
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+
+    }
+    @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) {
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        } else {
+            FunctionActivity.setTitle(getString(R.string.title_materialchange));
+            ((FunctionActivity) getActivity()).setListIconIvVisible(true);
+        }
+    }
+
+    /**
+     * 表格数据适配器
+     */
+    public class SelectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+        private ArrayList<TakeApartThePalletBean> mList = new ArrayList<>();
+
+        private SparseBooleanArray mSelectedPositions = new SparseBooleanArray();
+        private boolean mIsSelectable = false;
+
+
+        public SelectAdapter(ArrayList<TakeApartThePalletBean> list) {
+            if (list == null) {
+                throw new IllegalArgumentException("model Data must not be null");
+            }
+            mList = list;
+        }
+
+        //更新adpter的数据和选择状态
+        public void updateDataSet(ArrayList<TakeApartThePalletBean> list) {
+            this.mList = list;
+            mSelectedPositions = new SparseBooleanArray();
+//            ab.setTitle("已选择" + 0 + "项");
+        }
+
+
+        //获得选中条目的结果
+        public ArrayList<TakeApartThePalletBean> getSelectedItem() {
+            ArrayList<TakeApartThePalletBean> selectList = new ArrayList<>();
+            for (int i = 0; i < mList.size(); i++) {
+                if (isItemChecked(i)) {
+                    selectList.add(mList.get(i));
+                }
+            }
+            return selectList;
+        }
+
+
+        @Override
+        public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.takeapartthepallet_item, viewGroup, false);
+            return new ListItemViewHolder(itemView);
+        }
+
+        //设置给定位置条目的选择状态
+        private void setItemChecked(int position, boolean isChecked) {
+            mSelectedPositions.put(position, isChecked);
+        }
+
+        //根据位置判断条目是否选中
+        private boolean isItemChecked(int position) {
+            return mSelectedPositions.get(position);
+        }
+
+        //根据位置判断条目是否可选
+        private boolean isSelectable() {
+            return mIsSelectable;
+        }
+        //设置给定位置条目的可选与否的状态
+        private void setSelectable(boolean selectable) {
+            mIsSelectable = selectable;
+        }
+
+        //绑定界面，设置监听
+        @Override
+        public void onBindViewHolder(final RecyclerView.ViewHolder holder, @SuppressLint("RecyclerView") final int i) {
+            //设置条目状态
+            ((ListItemViewHolder) holder).tv_pd_pdno.setText(mList.get(i).getPd_pdno());
+            ((ListItemViewHolder) holder).tv_pd_prodcode.setText(mList.get(i).getPd_prodcode());
+            ((ListItemViewHolder) holder).tv_pr_detail.setText(mList.get(i).getPr_detail());
+            ((ListItemViewHolder) holder).tv_pr_spec.setText(mList.get(i).getPr_spec());
+            ((ListItemViewHolder) holder).tv_pd_outqty.setText(mList.get(i).getPd_outqty());
+            ((ListItemViewHolder) holder).checkBox.setChecked(isItemChecked(i));
+            ((ListItemViewHolder) holder).tv_pd_outqty.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    initEditPopupWindow(mList,i);
+
+                }
+            });
+            ((ListItemViewHolder) holder).tv_pd_prodcode.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    initRecyclePopupWindow(mList,i);
+
+
+                }
+            });
+            //checkBox的监听
+            ((ListItemViewHolder) holder).checkBox.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (isItemChecked(i)) {
+                        setItemChecked(i, false);
+                    } else {
+                        setItemChecked(i, true);
+                    }
+//                    for (int i2=0;i2<mList.size();i2++){
+//                        setItemChecked(i2, true);
+//                    }
+
+//                    ab.setTitle("已选择" + getSelectedItem().size() + "项");
+                }
+            });
+
+            //条目view的监听
+            ((ListItemViewHolder) holder).itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (isItemChecked(i)) {
+                        setItemChecked(i, false);
+                    } else {
+                        setItemChecked(i, true);
+                    }
+                    notifyItemChanged(i);
+//                    ab.setTitle("已选择" + getSelectedItem().size() + "项");
+                }
+            });
+
+
+        }
+
+        @Override
+        public int getItemCount() {
+            return mList == null ? 0 : mList.size();
+        }
+
+        public class ListItemViewHolder extends RecyclerView.ViewHolder{
+            //ViewHolder
+            CheckBox checkBox;
+            TextView tv_pd_pdno;
+            TextView tv_pd_prodcode;
+            TextView tv_pr_detail;
+            TextView tv_pr_spec;
+            TextView tv_pd_outqty;
+
+            ListItemViewHolder(View view) {
+                super(view);
+                this.tv_pd_pdno = (TextView) view.findViewById(R.id.tv_pd_pdno);
+                this.tv_pd_prodcode = (TextView) view.findViewById(R.id.tv_pd_prodcode);
+                this.tv_pr_detail = (TextView) view.findViewById(R.id.tv_pr_detail);
+                this.tv_pr_spec = (TextView) view.findViewById(R.id.tv_pr_spec);
+                this.tv_pd_outqty = (TextView) view.findViewById(R.id.tv_pd_outqty);
+                this.checkBox = (CheckBox) view.findViewById(R.id.select_checkbox);
+
+            }
+        }
+    }
+
+
+    /**
+     *选择
+     */
+    private class IpAndPortAdapter extends BaseQuickAdapter<CheckProdcodeBean, BaseViewHolder> {
+        private List<CheckProdcodeBean> mmmmList;
+
+        public List<CheckProdcodeBean> getmList() {
+            return mmmmList;
+        }
+
+        public void setmList(List<CheckProdcodeBean> mList) {
+            this.mmmmList = mList;
+        }
+        public CheckProdcodeBean getBeanByPositon(int position){
+            return mmmmList.get(position);
+        }
+
+        private IpAndPortAdapter(@Nullable List<CheckProdcodeBean> data) {
+            super(R.layout.fuzzy_ipandport_item, data);
+            this.mmmmList = data;
+        }
+        @Override
+        protected void convert(BaseViewHolder helper, CheckProdcodeBean item) {
+            helper.setText(R.id.macode_ip__Tv,item.getPd_prodcode()+"-"+item.getPd_outqty()+"-"+item.getPr_spec());
+            LinearLayout line_true = helper.itemView.findViewById(R.id.line_true);
+            if (item.getChecked()) {
+                line_true.setSelected(true);
+            } else {
+                line_true.setSelected(false);
+            }
+        }
+    }
+
+
+
+
+
+
+
+}

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

@@ -276,6 +276,7 @@ public class GloableParams {
     public static String ADDRESS_INVENTORYBINDING;
     public static String ADDRESS_INVENTORYBINDING2;
     public static String ADDRESS_ADDRESSTAIL_RESOLUTION;
+    public static String ADDRESS_ADDRESSTAIL_GETPRODIODETAILT;
 
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
@@ -618,6 +619,9 @@ public class GloableParams {
     private static String ADDRESSTAIL_POST_OUTBOUNDLIST="/scm/reserve/postProdInOut.action";
 
 
+    private static String ADDRESSTAIL_POST_GETPRODIODETAILT="/api/pda/outMaterial/getProdiodetail.action";
+
+
     /**
      * 完工品入库
      */
@@ -1237,5 +1241,8 @@ public class GloableParams {
 
         GloableParams.ADDRESS_ADDRESSTAIL_RESOLUTION= uriHead + GloableParams.ADDRESSTAIL_RESOLUTION;
 
+
+        GloableParams.ADDRESS_ADDRESSTAIL_GETPRODIODETAILT= uriHead + GloableParams.ADDRESSTAIL_POST_GETPRODIODETAILT;
+
     }
 }

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_materialchage.xml

@@ -0,0 +1,6 @@
+<?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">
+
+</LinearLayout>

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

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_height="match_parent">
+    <View
+        android:background="@color/black"
+        android:layout_width="match_parent"
+        android:layout_height="1dp">
+    </View>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <CheckBox
+            android:layout_gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/ck_all"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <TextView
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:text="序号"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <TextView
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="料号"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <TextView
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="名称"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <TextView
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="规格"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <TextView
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="数量"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+    </LinearLayout>
+
+    <View
+        android:background="@color/black"
+        android:layout_width="match_parent"
+        android:layout_height="1dp">
+    </View>
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/ra_data"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@color/white">
+    </android.support.v7.widget.RecyclerView>
+    <Button
+        android:id="@+id/btn_commit"
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_button"
+        android:layout_gravity="center"
+        android:layout_marginTop="50dp"
+        android:text="保存"
+        android:textColor="@color/white"
+        android:layout_marginBottom="50dp">
+    </Button>
+
+</LinearLayout>

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_edit_pup.xml

@@ -28,7 +28,7 @@
             android:layout_weight="1"
             android:background="@color/white"
             android:gravity="center_vertical"
-            android:hint="数量"
+            android:hint="请输入数量"
             android:padding="5dp"
             android:textSize="14sp" />
 

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

@@ -0,0 +1,92 @@
+<?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.uas_mes_zb_p.view.ClearableEditText
+            android:visibility="gone"
+            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:visibility="gone"
+            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.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/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" />
+
+        <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" />
+    </LinearLayout>
+
+
+
+
+
+
+</RelativeLayout>

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

@@ -13,7 +13,26 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:background="@color/transparent"
-        android:text="拆批"
+        android:text="拆批(无库存)"
         android:textSize="@dimen/app_text_size_body_2" />
+    <Button
+        android:id="@+id/take_apart_the_pallet"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/transparent"
+        android:text="物料变更"
+        android:textSize="@dimen/app_text_size_body_2" />
+    <Button
+        android:id="@+id/pop_materialchange"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/transparent"
+        android:text="拆批(有库存)"
+        android:textSize="@dimen/app_text_size_body_2" />
+
 
 </LinearLayout>

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

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@color/white">
+    <View
+        android:background="@color/black"
+        android:layout_width="match_parent"
+        android:layout_height="1dp">
+    </View>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <CheckBox
+            android:layout_gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/select_checkbox"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <TextView
+            android:id="@+id/tv_pd_pdno"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:text="12"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <TextView
+            android:id="@+id/tv_pd_prodcode"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="345678"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <TextView
+            android:id="@+id/tv_pr_detail"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="345678"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <TextView
+            android:id="@+id/tv_pr_spec"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="345678"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <TextView
+            android:id="@+id/tv_pd_outqty"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="345678"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+    </LinearLayout>
+
+    <View
+        android:background="@color/black"
+        android:layout_width="match_parent"
+        android:layout_height="1dp">
+    </View>
+</LinearLayout>

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

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

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

@@ -428,6 +428,8 @@
     <string name="title_storage_rechargetwo">收料单列表</string>
     <string name="title_storage_rechargeadd">新增收料单</string>
     <string name="title_outbound_rechargeadd">新增出库单</string>
+    <string name="title_takeapartthepallet">拆分(有库存)</string>
+    <string name="title_materialchange">物料变更</string>
     <string name="outboundlist">出库单</string>
     <string-array name="material_collect_menu">
         <item>已采集列表</item>