新增拆批(有库存接口)

出库单物料变更界面优化修改，详情物料变更界面逻辑修改
测试

app/build.gradle

@@ -41,11 +41,11 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "UAS_uas_mes_zn_p_RELEASE_${releaseInfo}.apk"
+                    fileName = "uas_mes_zn_p_RELEASE_${releaseTime()}_${releaseInfo}.apk"
 
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
-                    fileName = "UAS_uas_mes_zn_p_DEBUG_${debugInfo}.apk"
+                    fileName = "${releaseTime()}_uas_mes_zn_p_DEBUG_${debugInfo}.apk"
                 }
                 outputFileName = fileName
             }
@@ -57,7 +57,9 @@ android {
         sourceCompatibility 1.8
     }
 }
-
+def releaseTime() {
+    return new Date().format("yyyyMMdd-HHmm", TimeZone.getTimeZone("GMT+08:00"))
+}
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'

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

@@ -0,0 +1,40 @@
+package com.uas.uas_mes_zb_p.bean;
+
+/**
+ * Created by cjh-sail on 2023-02-21
+ */
+public class AddAndDeleteCodeBean {
+    private String va_code;
+    private String va_delete;
+    private String pi_id;
+
+    public AddAndDeleteCodeBean(String va_code, String va_delete) {
+        this.va_code = va_code;
+        this.va_delete = va_delete;
+    }
+    public AddAndDeleteCodeBean(){}
+
+    public String getPi_id() {
+        return pi_id;
+    }
+
+    public void setPi_id(String pi_id) {
+        this.pi_id = pi_id;
+    }
+
+    public String getVa_code() {
+        return va_code;
+    }
+
+    public void setVa_code(String va_code) {
+        this.va_code = va_code;
+    }
+
+    public String getVa_delete() {
+        return va_delete;
+    }
+
+    public void setVa_delete(String va_delete) {
+        this.va_delete = va_delete;
+    }
+}

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

@@ -7,11 +7,31 @@ public class JsonStorateBean {
     private String pd_id;
     private String pd_prodcode;
     private String pd_outqty;
+    private String pr_spec;
+    private String pr_detail;
 
-    public JsonStorateBean(String pd_id, String pd_prodcode, String pd_outqty) {
+    public JsonStorateBean(String pd_id, String pd_prodcode, String pd_outqty,String pr_spec,String pr_detail) {
         this.pd_id = pd_id;
         this.pd_prodcode = pd_prodcode;
         this.pd_outqty = pd_outqty;
+        this.pr_spec = pr_spec;
+        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 getPr_detail() {
+        return pr_detail;
+    }
+
+    public void setPr_detail(String pr_detail) {
+        this.pr_detail = pr_detail;
     }
 
     public String getPd_id() {

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

@@ -0,0 +1,58 @@
+package com.uas.uas_mes_zb_p.bean;
+
+/**
+ * Created by cjh-sail on 2023-02-02
+ */
+public class JsonStorateBeanChuan {
+    private String pd_id;
+    private String pd_prodcode;
+    private String pd_outqty;
+    private String pr_spec;
+    private String pr_detail;
+
+    public JsonStorateBeanChuan(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 getPr_spec() {
+        return pr_spec;
+    }
+
+    public void setPr_spec(String pr_spec) {
+        this.pr_spec = pr_spec;
+    }
+
+    public String getPr_detail() {
+        return pr_detail;
+    }
+
+    public void setPr_detail(String pr_detail) {
+        this.pr_detail = pr_detail;
+    }
+
+    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/TakeApartThePalletBean.java

@@ -10,14 +10,23 @@ public class TakeApartThePalletBean {
     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) {
+    private String pd_inoutno;
+    public TakeApartThePalletBean(String pd_pdno, String pd_id, String pd_prodcode, String pr_detail, String pr_spec, String pd_outqty,String pd_inoutno) {
         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;
+        this.pd_inoutno=pd_inoutno;
+    }
+
+    public String getPd_inoutno() {
+        return pd_inoutno;
+    }
+
+    public void setPd_inoutno(String pd_inoutno) {
+        this.pd_inoutno = pd_inoutno;
     }
 
     public String getPd_pdno() {
@@ -50,8 +59,9 @@ public class TakeApartThePalletBean {
         return pr_detail;
     }
 
-    public void setPr_detail(String pr_detail) {
+    public String setPr_detail(String pr_detail) {
         this.pr_detail = pr_detail;
+        return pr_spec;
     }
 
     public String getPr_spec() {

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

@@ -1,15 +1,77 @@
 package com.uas.uas_mes_zb_p.fragment;
 
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
+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.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+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.format.bg.BaseCellBackgroundFormat;
+import com.bin.david.form.data.style.FontStyle;
+import com.bin.david.form.data.table.TableData;
+import com.bin.david.form.listener.OnColumnItemClickListener;
 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.AddAndDeleteCodeBean;
+import com.uas.uas_mes_zb_p.global.GloableParams;
+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.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.VolleyRequest;
+import com.uas.uas_mes_zb_p.view.ClearableEditText;
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+import java.util.ArrayList;
 
 /**
  * Created by cjh-sail on 2023-02-15
- * 拆分(有库存)
+ * 出库单列表物料变更
  */
-public class MaterialChangeFragment extends BaseFragment{
+public class MaterialChangeFragment extends BaseFragment  implements OnColumnItemClickListener<String>{
+
+    private SmartTable mSmartTable;
+    private ClearableEditText storage_recharge_collect_ets;
+    private ImageView storage_recharge_scan_ivs;
+    private static final int SCAN_BARCODE_CODE = 222;
+    private int mFocusId;
+    private Column<String> va_codeColumn,deleteColumn;
+    private TableData<AddAndDeleteCodeBean> mTableData;
+    private Button btn_check_va_code;
+    private String va_code;
+    private ArrayList<AddAndDeleteCodeBean> arrayListlist;
+    private Fragment mFragment;
+    private RecyclerView ra_data;
+    private SelectAdapter selectAdapter;
+    private ArrayList<AddAndDeleteCodeBean> takeApartThePalletlist;
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_materialchage;
@@ -17,20 +79,212 @@ public class MaterialChangeFragment extends BaseFragment{
 
     @Override
     protected void initViews() {
-        FunctionActivity.setTitle(getString(R.string.title_takeapartthepallet));
+        FunctionActivity.setTitle(getString(R.string.outboundlist));
         ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        mSmartTable = root.findViewById(R.id.mater_st);
+        storage_recharge_collect_ets = root.findViewById(R.id.storage_recharge_collect_ets);
+        storage_recharge_scan_ivs = root.findViewById(R.id.storage_recharge_scan_ivs);
+        btn_check_va_code = root.findViewById(R.id.btn_check_va_code);
+        ra_data = root.findViewById(R.id.ra_data);
     }
 
     @Override
     protected void initEvents() {
+        storage_recharge_scan_ivs.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                    } else {
+                        CommonUtil.toastNoRepeat(mActivity, "请选择您要操作的输入框");
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+            }
+        });
+        arrayListlist = new ArrayList<>();
+        storage_recharge_collect_ets.requestFocus();
+        storage_recharge_collect_ets.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)) {
+                    VerificationDatalistCodes(storage_recharge_collect_ets.getText().toString().trim());
 
+                    return true;
+                }
+                return false;
+            }
+        });
     }
 
     @Override
     protected void initDatas() {
+        WindowManager wm = mActivity.getWindowManager();
+        int screenWith = wm.getDefaultDisplay().getWidth();
+        mSmartTable.getConfig().setMinTableWidth(screenWith)
+                .setShowXSequence(false)
+                .setShowYSequence(false)
+                .setShowTableTitle(false)
+                .setFixedTitle(true)
+                .setVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .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;
+                    }
+                });
+
+        va_codeColumn = new Column<String>("单号", "va_code");
+        deleteColumn = new Column<String>("操作", "va_delete");
+        deleteColumn.setFixed(true);
+        deleteColumn.setOnColumnItemClickListener(this);
+
+//        deleteColumn.setOnColumnItemClickListener(new OnColumnItemClickListener<String>() {
+//            @Override
+//            public void onClick(Column<String> column, String value, String s, int position) {
+//
+//
+//            }
+//        });
+        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);
+        btn_check_va_code.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getDatalistCodes();
+            }
+        });
+
+    }
+    private void setAdapter(ArrayList<AddAndDeleteCodeBean> mList) {
+        selectAdapter = new SelectAdapter(mList);
+        ra_data.setAdapter(selectAdapter);
+
+    }
+    public void addDataCode(String va_code,String pi_id){
+        AddAndDeleteCodeBean addAndDeleteCodeBean=new AddAndDeleteCodeBean();
+        addAndDeleteCodeBean.setVa_code(va_code);
+        addAndDeleteCodeBean.setPi_id(pi_id);
+        addAndDeleteCodeBean.setVa_delete("×");
+        takeApartThePalletlist.add(addAndDeleteCodeBean);
+        setAdapter(takeApartThePalletlist);
+//        setFilterTableData(mFilterStorageInBeans);
+        storage_recharge_collect_ets.setText("");
+        storage_recharge_collect_ets.setSelection(storage_recharge_collect_ets.getText().toString().length());
+    }
+
+    private void setFilterTableData(ArrayList<AddAndDeleteCodeBean> filterTableData) {
+        arrayListlist.clear();
+        arrayListlist.addAll(filterTableData);
+        try {
+            Log.i("size====",filterTableData.size()+"");
+            mTableData = new TableData<AddAndDeleteCodeBean>("出库单列表", arrayListlist,
+                    va_codeColumn,deleteColumn);
+
+//            new Handler().postDelayed(new Runnable() {
+//                @Override
+//                public void run() {
+//                    mSmartTable.postInvalidate();
+//                }
+//            }, 100);
+            mSmartTable.setTableData(mTableData);
+            new Thread(){
+                @Override
+                public void run() {
+                    //需要在子线程中处理的逻辑
+//                    mSmartTable.postInvalidate();
+                    mSmartTable.invalidate();
+                }
+            }.start();
+        }catch (IndexOutOfBoundsException e){
+            e.printStackTrace();
+            Log.e("1Exception===",e.toString());
+        }
+
 
     }
 
+
+
+
+
+    private void getDatalistCodes(){
+        String sum ="";
+        if (takeApartThePalletlist.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请采集条码");
+            return;
+        }
+        for (int i=0;i<takeApartThePalletlist.size();i++){
+            sum+=takeApartThePalletlist.get(i).getPi_id()+"|";
+        }
+        String substring = sum.substring(0, sum.length() - 1);//去除尾部
+
+        mFragment=new TakeApartThePalletFragment();
+        if (mFragment != null) {
+            Bundle bundle = new Bundle();
+            bundle.putString("pi_id", substring);
+            mFragment.setArguments(bundle);
+            FragmentUtils.switchFragment(MaterialChangeFragment.this, mFragment);
+        }
+    }
+    private void VerificationDatalistCodes(String pi_inoutno){
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_ADDRESSTAIL_VERIFICATION)
+                .method(Request.Method.GET)
+                .tag(TAG + "datalist")
+                .flag(0)
+                .addParam("pi_inoutno",pi_inoutno)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                String result = o.toString();
+
+                JSONObject resultObject = JSON.parseObject(result);
+                JSONObject dataObject = resultObject.getJSONObject("data");
+                String lotno = FastjsonUtil.getText(dataObject, "pi_id");
+                if (!lotno.isEmpty()){
+                    addDataCode(pi_inoutno,lotno);
+                }
+
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
+
+
+
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         return false;
@@ -46,9 +300,155 @@ public class MaterialChangeFragment extends BaseFragment{
         if (hidden) {
             ((FunctionActivity) getActivity()).setListIconIvVisible(false);
         } else {
-            FunctionActivity.setTitle(getString(R.string.title_takeapartthepallet));
+            FunctionActivity.setTitle(getString(R.string.outboundlist));
             ((FunctionActivity) getActivity()).setListIconIvVisible(true);
         }
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.storage_recharge_collect_ets) {
+                    VerificationDatalistCodes(result);
+                }
+            }
+        }
+    }
+
+
+
+    @Override
+    public void onClick(Column<String> column, String value, String s, int position) {
+        try {
+            takeApartThePalletlist.remove(position);
+            for (int i=0;i<takeApartThePalletlist.size();i++){
+                String va_code = takeApartThePalletlist.get(i).getVa_code();
+                Log.i("va_code===",va_code);
+            }
+            setFilterTableData(takeApartThePalletlist);
+        }catch (IndexOutOfBoundsException e){
+            e.printStackTrace();
+        }
+    }
+
+
+
+
+    public class SelectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+        private ArrayList<AddAndDeleteCodeBean> mList = new ArrayList<>();
+
+        private SparseBooleanArray mSelectedPositions = new SparseBooleanArray();
+        private boolean mIsSelectable = false;
+
+
+        public SelectAdapter(ArrayList<AddAndDeleteCodeBean> list) {
+            if (list == null) {
+                throw new IllegalArgumentException("model Data must not be null");
+            }
+            mList = list;
+        }
+
+        //更新adpter的数据和选择状态
+        public void updateDataSet(ArrayList<AddAndDeleteCodeBean> list) {
+            this.mList = list;
+            mSelectedPositions = new SparseBooleanArray();
+//            ab.setTitle("已选择" + 0 + "项");
+        }
+
+
+        //获得选中条目的结果
+        public ArrayList<AddAndDeleteCodeBean> getSelectedItem() {
+            ArrayList<AddAndDeleteCodeBean> 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.materialchange_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_va_code.setText(mList.get(i).getVa_code());
+            (( ListItemViewHolder) holder).tv_va_delete.setText(mList.get(i).getVa_delete());
+            (( ListItemViewHolder) holder).tv_va_delete.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    takeApartThePalletlist.remove(i);
+                    setAdapter(takeApartThePalletlist);
+                }
+            });
+
+        }
+
+        @Override
+        public int getItemCount() {
+            return mList == null ? 0 : mList.size();
+        }
+
+        public class ListItemViewHolder extends RecyclerView.ViewHolder{
+            //ViewHolder
+            TextView tv_va_code;
+            TextView tv_va_delete;
+
+
+            ListItemViewHolder(View view) {
+                super(view);
+                this.tv_va_code = (TextView) view.findViewById(R.id.tv_va_code);
+                this.tv_va_delete = (TextView) view.findViewById(R.id.tv_va_delete);
+
+            }
+        }
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
 }

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

@@ -218,7 +218,6 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
                                 jltStorageInBean.setPI_INVOSTATUSCODE(FastjsonUtil.getText(dataObject, "PI_INVOSTATUSCODE"));
                                 jltStorageInBean.setPI_INVOSTATUSCODE(FastjsonUtil.getText(dataObject, "PI_INVOSTATUSCODE"));
                                 jltStorageInBean.setPI_INVOSTATUS(FastjsonUtil.getText(dataObject, "PI_INVOSTATUS"));
-
                                 list.add(jltStorageInBean);
                             }
                         }
@@ -289,6 +288,7 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
         stockTaskBtn = (Button) view.findViewById(R.id.pop_material_out_menu_1);
         stockAlreadyBtn = (Button) view.findViewById(R.id.pop_material_out_menu_2);
         pop_material_out_resolution = (Button) view.findViewById(R.id.pop_material_out_resolution);
+        Button take_apart_the_pallet = view.findViewById(R.id.take_apart_the_pallet);
         pop_material_out_resolution.setVisibility(View.GONE);
         stockTaskBtn.setVisibility(View.VISIBLE);
         stockAlreadyBtn.setVisibility(View.VISIBLE);
@@ -325,6 +325,16 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
                 }
             }
         });
+        take_apart_the_pallet.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeMenuPopupWindow();
+                mFragment=new MaterialChangeFragment();
+                if (mFragment != null) {
+                    FragmentUtils.switchFragment(OutboundLis_Two_fragment.this, mFragment);
+                }
+            }
+        });
 
 
         mMenuPopupWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);

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

@@ -916,13 +916,13 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
     public void onMessageEvent(MessageDetalBean event) {
         progressDialog.dismiss();
 //        getDataadCommitList();
-        new CountDownTimer(1000, 1000) {
+        new CountDownTimer(500, 500) {
 
             public void onTick(long millisUntilFinished) {
                 getDataCommitList();
             }
             public void onFinish() {
-
+                getDataCommitList();
             }
 
         }.start();
@@ -1041,7 +1041,6 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
 
 
 
-        MaterialChangeFragment MaterialChange_fragment=new MaterialChangeFragment();
         pop_materialchange.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -8,8 +8,6 @@ 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.text.Editable;
-import android.text.TextWatcher;
 import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.view.Display;
@@ -37,6 +35,7 @@ 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.CheckPdprodCodeBean;
 import com.uas.uas_mes_zb_p.bean.JsonStorateBean;
+import com.uas.uas_mes_zb_p.bean.JsonStorateBeanChuan;
 import com.uas.uas_mes_zb_p.bean.MessageDetalBean;
 import com.uas.uas_mes_zb_p.bean.TakeApartThePalletBean;
 import com.uas.uas_mes_zb_p.global.GloableParams;
@@ -57,7 +56,7 @@ import razerdp.basepopup.BasePopupWindow;
 
 /**
  * Created by cjh-sail on 2023-02-15
- * 拆分（无库存）
+ * 物料变更
  */
 public class TakeApartThePalletFragment extends BaseFragment{
 
@@ -74,6 +73,11 @@ public class TakeApartThePalletFragment extends BaseFragment{
     private Button btn_check_pd_prodcode;
     private RecyclerView rv_ip_port_data;
     private TextView sure_tv;
+    private ClearableEditText edit_et;
+    private ClearableEditText edit_gg;
+    private ClearableEditText edit_mj;
+    private String pr_spec;
+    private String pr_detail;
 
     @Override
     protected int getLayout() {
@@ -216,7 +220,8 @@ public class TakeApartThePalletFragment extends BaseFragment{
                     data.getString("PD_PRODCODE"),
                     data.getString("PR_DETAIL"),
                     data.getString("PR_SPEC"),
-                    data.getString("PD_OUTQTY"));
+                    data.getString("PD_OUTQTY"),
+                    data.getString("PD_INOUTNO"));
             takeApartThePalletlist.add(bean);
         }
         setAdapter(takeApartThePalletlist);
@@ -243,7 +248,9 @@ public class TakeApartThePalletFragment extends BaseFragment{
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 List<CheckPdprodCodeBean> ipAndPortBeans = andPortAdapter.getmList();
                 pd_prodcode = ipAndPortBeans.get(position).getPR_CODE();
-                getDataid2(pd_prodcode);
+                pr_spec = ipAndPortBeans.get(position).getPR_SPEC();
+                pr_detail = ipAndPortBeans.get(position).getPR_DETAIL();
+                getDataid2(pd_prodcode,pr_spec,pr_detail);
                 closeListPopupWindow();
 //                for (int s = 0; s < ipAndPortBeans.size(); s++) {
 //                    ipAndPortBeans.get(s).setChecked(false);
@@ -303,14 +310,15 @@ public class TakeApartThePalletFragment extends BaseFragment{
     //提交
     public void saveData(){
         ArrayList<TakeApartThePalletBean> selectedItem = selectAdapter.getSelectedItem();
-        ArrayList<JsonStorateBean> list=new ArrayList<>();
+        ArrayList<JsonStorateBeanChuan> list=new ArrayList<>();
 
         for (int i=0;i<selectedItem.size();i++){
             TakeApartThePalletBean takeApartThePalletBean = selectedItem.get(i);
-            JsonStorateBean jsonStorateBean=new JsonStorateBean(
+            JsonStorateBeanChuan jsonStorateBean=new JsonStorateBeanChuan(
                     takeApartThePalletBean.getPd_id(),
                     takeApartThePalletBean.getPd_prodcode(),
-                    takeApartThePalletBean.getPd_outqty());
+                    takeApartThePalletBean.getPd_outqty()
+                    );
             list.add(jsonStorateBean);
         }
         if (list.isEmpty()){
@@ -334,6 +342,8 @@ public class TakeApartThePalletFragment extends BaseFragment{
                 progressDialog.dismiss();
 //                JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(), "items");
                 CommonUtil.toastNoRepeat(mActivity,"变更成功");
+                getNewNameData();
+
             }
 
             @Override
@@ -345,14 +355,16 @@ public class TakeApartThePalletFragment extends BaseFragment{
         });
     }
     //多选修改参数pd_prodcode
-    public void getDataid2(String pd_prodcode){
+    public void getDataid2(String pd_prodcode,String pr_spec,String pr_detail){
         ArrayList<TakeApartThePalletBean> selectedItem = selectAdapter.getSelectedItem();
         for (int i=0;i<selectedItem.size();i++){
             TakeApartThePalletBean takeApartThePalletBean = selectedItem.get(i);
             JsonStorateBean jsonStorateBean=new JsonStorateBean(
                     takeApartThePalletBean.getPd_id(),
                     takeApartThePalletBean.setPd_prodcode(pd_prodcode),
-                    takeApartThePalletBean.getPd_outqty());
+                    takeApartThePalletBean.getPd_outqty(),
+                    takeApartThePalletBean.setPr_spec(pr_spec),
+                    takeApartThePalletBean.setPr_detail(pr_detail));
         }
         selectAdapter.notifyDataSetChanged();
 
@@ -392,6 +404,8 @@ public class TakeApartThePalletFragment extends BaseFragment{
                     return;
                 }
                 mList.get(i).setPd_outqty(edit_et.getText().toString().trim());
+                selectAdapter.setItemChecked(i, true);
+                selectAdapter.notifyItemChanged(i);
                 selectAdapter.notifyDataSetChanged();
                 closeListPopupWindow();
             }
@@ -413,11 +427,17 @@ public class TakeApartThePalletFragment extends BaseFragment{
      */
     private void initRecyclePopupWindow() {
         View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_recycleview_pup, null);
-        ClearableEditText edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
+        edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
         rv_ip_port_data = contView.findViewById(R.id.rv_ip_port_data);
         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);
+        edit_gg = contView.findViewById(R.id.edit_gg);
+        ImageView search_gg = contView.findViewById(R.id.search_gg);
+
+        edit_mj = contView.findViewById(R.id.edit_mj);
+        ImageView search_mj = contView.findViewById(R.id.search_mj);
+
         Display display = mActivity.getWindowManager().getDefaultDisplay();
         int height = display.getHeight();
         editPW = new PopupWindow(contView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
@@ -450,7 +470,11 @@ public class TakeApartThePalletFragment extends BaseFragment{
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 List<CheckPdprodCodeBean> ipAndPortBeans = andPortAdapter.getmList();
                 pd_prodcode = ipAndPortBeans.get(position).getPR_CODE();
-                getDataid2(pd_prodcode);
+                //物料规格
+                pr_spec = ipAndPortBeans.get(position).getPR_SPEC();
+                //名称
+                pr_detail = ipAndPortBeans.get(position).getPR_DETAIL();
+                getDataid2(pd_prodcode,pr_spec,pr_detail);
                 closeListPopupWindow();
                   //单选
 //                for (int s = 0; s < ipAndPortBeans.size(); s++) {
@@ -462,37 +486,37 @@ public class TakeApartThePalletFragment extends BaseFragment{
         });
 
 
-        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 (s.length() >= 0) {
-                    String mSearchStr = s.toString().trim();
-                    getCheck_pd_prodcode(mSearchStr);
-
-                } else {
-
-                }
-                andPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-                    @Override
-                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                        List<CheckPdprodCodeBean> ipAndPortBeans = andPortAdapter.getmList();
-                        pd_prodcode = ipAndPortBeans.get(position).getPR_CODE();
-                        getDataid2(pd_prodcode);
-                        closeListPopupWindow();
-//                for (int s = 0; s < ipAndPortBeans.size(); s++) {
-//                    ipAndPortBeans.get(s).setChecked(false);
+//        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 (s.length() >= 0) {
+//                    String mSearchStr = s.toString().trim();
+//                    getCheck_pd_prodcode(mSearchStr);
+//
+//                } else {
+//
 //                }
-//                ipAndPortBeans.get(position).setChecked(true);
-//                andPortAdapter.notifyDataSetChanged();
-                    }
-                });
-            }
-
-        });
+//                andPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+//                    @Override
+//                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+//                        List<CheckPdprodCodeBean> ipAndPortBeans = andPortAdapter.getmList();
+//                        pd_prodcode = ipAndPortBeans.get(position).getPR_CODE();
+//                        getDataid2(pd_prodcode);
+//                        closeListPopupWindow();
+////                for (int s = 0; s < ipAndPortBeans.size(); s++) {
+////                    ipAndPortBeans.get(s).setChecked(false);
+////                }
+////                ipAndPortBeans.get(position).setChecked(true);
+////                andPortAdapter.notifyDataSetChanged();
+//                    }
+//                });
+//            }
+//
+//        });
 
 
 
@@ -502,25 +526,59 @@ public class TakeApartThePalletFragment extends BaseFragment{
                 if (actionId == EditorInfo.IME_ACTION_DONE
                         || actionId == EditorInfo.IME_ACTION_SEND
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String data = edit_et.getText().toString().trim();
-                    getCheck_pd_prodcode(data);
+                    getCheck_pd_prodcode();
                     return true;
                 }
                 return false;
             }
         });
+        search_im.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getCheck_pd_prodcode();
+            }
+        });
 
+        edit_gg.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)) {
+                    getCheck_pd_prodcode();
+                    return true;
+                }
+                return false;
+            }
+        });
 
+        edit_mj.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)) {
+                    getCheck_pd_prodcode();
+                    return true;
+                }
+                return false;
+            }
+        });
 
 
-
-        search_im.setOnClickListener(new View.OnClickListener() {
+        search_gg.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getCheck_pd_prodcode();
+            }
+        });
+        search_mj.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String data = edit_et.getText().toString().trim();
-                getCheck_pd_prodcode(data);
+                getCheck_pd_prodcode();
             }
         });
+
         sure_tv.setVisibility(View.GONE);
         //确定
         sure_tv.setOnClickListener(new View.OnClickListener() {
@@ -536,7 +594,7 @@ public class TakeApartThePalletFragment extends BaseFragment{
                     return;
                 }
 //                mList.get(i).setPd_prodcode(pd_prodcode);
-                getDataid2(pd_prodcode);
+                getDataid2(pd_prodcode,pr_spec,pr_spec);
                 closeListPopupWindow();
             }
         });
@@ -551,8 +609,8 @@ public class TakeApartThePalletFragment extends BaseFragment{
     }
 
 
-    public void getCheck_pd_prodcode(String pr_code){
-        if (pr_code.isEmpty()){
+    public void getCheck_pd_prodcode(){
+        if (edit_et.getText().toString().trim().isEmpty()&&edit_gg.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请输入要搜索的物料资源");
             return;
         }
@@ -561,7 +619,9 @@ public class TakeApartThePalletFragment extends BaseFragment{
                 .method(Request.Method.GET)
                 .tag(TAG + "datalist")
                 .flag(0)
-                .addParam("pr_code", pr_code)
+                .addParam("pr_spec1", edit_et.getText().toString().trim())
+                .addParam("pr_spec2", edit_gg.getText().toString().trim())
+                .addParam("pr_spec3", edit_mj.getText().toString().trim())
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -708,7 +768,7 @@ public class TakeApartThePalletFragment extends BaseFragment{
         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_pd_prodcode.setText(mList.get(i).getPd_inoutno());
             ((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());

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

@@ -155,7 +155,7 @@ public class WHCheckPackageFragment extends BaseFragment implements View.OnClick
         LogUtil.e("msg", "ssss" + ip.uriArray.get(0).ip);
         LogUtil.e("msg", "ssss" + ip.uriArray.get(0).port);
         String url = GloableParams.ADDRESS_CHECKPACKAGE + "?outboxCode=" + outboxcode;
-        stringRequest = new StringRequest(Request.Method.GET, url, new Response.Listener<String>() {
+        stringRequest = new StringRequest(Request.Method.POST, url, new Response.Listener<String>() {
             @Override
             public void onResponse(String s) {
                 LogUtil.e("msg", "ssss" + s);

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

@@ -280,6 +280,9 @@ public class GloableParams {
     public static String ADDRESS_ADDRESSTAIL_GETPRODIODETAILT;
     public static String ADDRESS_ADDRESSTAIL_SAVE;
     public static String ADDRESS_ADDRESSTAIL_CHECK;
+    public static String ADDRESS_ADDRESSTAIL_VERIFICATION;
+
+
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
     //登录页面请求地址
@@ -598,7 +601,6 @@ public class GloableParams {
     private static String ADDRESSTAIL_OUT_MATERIAL_SPECIAL_OUT_BREAK = "/api/pda/outMaterial/specialOutBreaking.action";
 
     //出库单列表
-
     private static String ADDRESSTAIL_OUTBOUNDLIST = "/api/pda/receiving/getOutDataList.action";
 
 //    新增出库单
@@ -628,6 +630,8 @@ public class GloableParams {
     //物料变更数据列表
     private static String ADDRESSTAIL_POST_CHECK="/api/pda/outMaterial/fuzzySearchPrcode.action";
 
+    //验证条码是否可用
+    private static String ADDRESSTAIL_VERIFICATION="/api/pda/outMaterial/checkProdinout.action";
 
     /**
      * 完工品入库
@@ -1255,6 +1259,7 @@ public class GloableParams {
         GloableParams.ADDRESS_ADDRESSTAIL_GETPRODIODETAILT= uriHead + GloableParams.ADDRESSTAIL_POST_GETPRODIODETAILT;
         GloableParams.ADDRESS_ADDRESSTAIL_SAVE= uriHead + GloableParams.ADDRESSTAIL_POST_SAVE;
         GloableParams.ADDRESS_ADDRESSTAIL_CHECK= uriHead + GloableParams.ADDRESSTAIL_POST_CHECK;
+        GloableParams.ADDRESS_ADDRESSTAIL_VERIFICATION= uriHead + GloableParams.ADDRESSTAIL_VERIFICATION;
 
 
 

app/src/main/java/com/uas/uas_mes_zb_p/tools/VolleyUtil.java

@@ -284,7 +284,7 @@ public class VolleyUtil {
             pUrl = pUrl + "?barcode=" + encode;
             Log.e(TAGURL, pUrl);
 
-            stringRequest = new StringRequest(Request.Method.GET, pUrl, stringListener, errorListener) {
+            stringRequest = new StringRequest(Request.Method.POST, pUrl, stringListener, errorListener) {
                 @Override
                 public Map<String, String> getHeaders() throws AuthFailureError {
                     return setCookies();
@@ -337,9 +337,10 @@ public class VolleyUtil {
         getVolleyUtil();
         context = pContext;
         requestType = pRequestType;
-        pUrl = pUrl + "?pr_code=" + pProcode + "&wh_code=" + pWhcode + "&location=" + pWhcode;
+        String encode = URLEncoder.encode(pProcode);
+        pUrl = pUrl + "?pr_code=" + encode + "&wh_code=" + pWhcode + "&location=" + pWhcode;
         Log.e("VOLLEYURL", pUrl);
-        stringRequest = new StringRequest(Request.Method.GET, pUrl, stringListener, errorListener) {
+        stringRequest = new StringRequest(Request.Method.POST, pUrl, stringListener, errorListener) {
             @Override
             public Map<String, String> getHeaders() throws AuthFailureError {
                 return setCookies();

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

@@ -1,6 +1,115 @@
 <?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:background="@color/white"
     android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_gravity="center"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/dp_10"
+        android:background="@drawable/bg_line_edittext">
+        <com.uas.uas_mes_zb_p.view.ClearableEditText
+            android:id="@+id/storage_recharge_collect_ets"
+            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" />
+
+        <ImageView
+            android:id="@+id/storage_recharge_scan_ivs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginRight="10dp"
+            android:clickable="false"
+            android:src="@drawable/ic_edittext_scan" />
+
+    </LinearLayout>
+
+
+    <com.bin.david.form.core.SmartTable
+        android:visibility="gone"
+        android:layout_marginTop="@dimen/textsize_20"
+        android:layout_marginBottom="@dimen/textsize_20"
+        android:id="@+id/mater_st"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        />
+    <View
+        android:background="@color/black"
+        android:layout_width="match_parent"
+        android:layout_height="1dp">
+    </View>
+    <LinearLayout
+        android:background="@color/white"
+
+        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>
+        <TextView
+            android:id="@+id/tv_va_code"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="4"
+            android:text="单号"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <TextView
+            android:id="@+id/tv_va_delete"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            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_check_va_code"
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_button"
+        android:layout_gravity="center"
+        android:text="物料变更"
+        android:textColor="@color/white"
+        android:layout_marginBottom="50dp">
+    </Button>
+
+
 
 </LinearLayout>

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

@@ -51,7 +51,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="料号"/>
+            android:text="单据编号"/>
         <View
             android:background="@color/black"
             android:layout_width="1dp"

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

@@ -20,17 +20,25 @@
         android:layout_height="36dp"
         android:background="@color/white"
         android:orientation="horizontal">
+        <TextView
+            android:text="厚度"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+        </TextView>
 
         <com.uas.uas_mes_zb_p.view.ClearableEditText
             android:id="@+id/edit_et"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="16dp"
+            android:layout_marginLeft="8dp"
             android:layout_marginRight="16dp"
             android:layout_weight="1"
             android:background="@drawable/bg_line_edittext"
             android:gravity="center_vertical"
-            android:hint="请输入要搜索的物料资源"
+            android:hint="请输入要搜索的物料厚度"
             android:padding="5dp"
             android:textSize="14sp"/>
 
@@ -42,10 +50,85 @@
             android:background="@drawable/bg_button"
             android:src="@drawable/search_48" />
     </LinearLayout>
+    <LinearLayout
+        android:layout_marginTop="@dimen/dp_10"
+        android:id="@+id/line_top_two"
+        android:layout_below="@+id/line_top"
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:background="@color/white"
+        android:orientation="horizontal">
+        <TextView
+            android:text="面积"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+        </TextView>
+
+        <com.uas.uas_mes_zb_p.view.ClearableEditText
+            android:id="@+id/edit_gg"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="8dp"
+            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_gg"
+            android:layout_width="46dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/bg_button"
+            android:src="@drawable/search_48" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_marginTop="@dimen/dp_10"
+        android:id="@+id/line_top_three"
+        android:layout_below="@+id/line_top_two"
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:background="@color/white"
+        android:orientation="horizontal">
+        <TextView
+            android:text="铜厚"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
 
+        </TextView>
+
+        <com.uas.uas_mes_zb_p.view.ClearableEditText
+            android:id="@+id/edit_mj"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="8dp"
+            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_mj"
+            android:layout_width="46dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/bg_button"
+            android:src="@drawable/search_48" />
+    </LinearLayout>
     <LinearLayout
         android:orientation="vertical"
-        android:layout_below="@+id/line_top"
+        android:layout_below="@+id/line_top_three"
         android:layout_centerHorizontal="true"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

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

@@ -0,0 +1,54 @@
+<?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>
+        <TextView
+            android:id="@+id/tv_va_code"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="4"
+            android:text="345678"/>
+        <View
+            android:background="@color/black"
+            android:layout_width="1dp"
+            android:layout_height="match_parent">
+        </View>
+        <TextView
+            android:id="@+id/tv_va_delete"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            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/layout/pop_outboundlist_out_menu.xml

@@ -34,5 +34,14 @@
         android:background="@color/transparent"
         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" />
 
 </LinearLayout>

build.gradle

@@ -3,6 +3,8 @@
 
 buildscript {
     repositories {
+        maven { url "https://jitpack.io" }
+        mavenCentral()
         google()
         jcenter()
         maven {
@@ -23,13 +25,18 @@ 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" }
+        mavenCentral()
         google()
         jcenter()
         maven {
             url 'https://maven.google.com/'
             name 'Google'
         }
-        maven { url "https://jitpack.io" }
     }
 }