新增领用转移列表界面，更改领用转移页面逻辑，增加提交、审核按钮逻辑

app/src/main/java/com/uas/equipment/activity/FunctionActivity.java

@@ -17,7 +17,7 @@ import com.uas.equipment.fragment.BaseFragment;
 import com.uas.equipment.fragment.BreakdownRepairFragment;
 import com.uas.equipment.fragment.DeliveryForRepairFragment;
 import com.uas.equipment.fragment.IndexSettingFragment;
-import com.uas.equipment.fragment.RequisitionTransferFragment;
+import com.uas.equipment.fragment.MaintenanceManagementListFragment;
 import com.uas.equipment.fragment.StorageInFragment;
 import com.uas.equipment.fragment.StorageRechargeListFragment;
 import com.uas.equipment.global.GloableParams;
@@ -157,7 +157,7 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                     mFragment = new DeliveryForRepairFragment();
                     break;
                 case GloableParams.TEXT_REQUISITION_TRANSFER://领用转移
-                    mFragment = new RequisitionTransferFragment();
+                    mFragment = new MaintenanceManagementListFragment();
                     break;
 
                 case GloableParams.GRIDNAME_SETTING://设置

app/src/main/java/com/uas/equipment/bean/MessageOutboundEvents.java

@@ -0,0 +1,7 @@
+package com.uas.equipment.bean;
+
+public class MessageOutboundEvents {
+    public MessageOutboundEvents(String s) {
+
+    }
+}

app/src/main/java/com/uas/equipment/bean/OutboundListBean.java

@@ -0,0 +1,70 @@
+package com.uas.equipment.bean;
+
+/**
+ * Created by cjh-sail on 2023-03-07
+ */
+public class OutboundListBean {
+    private String DC_CODE;
+    private String DC_INDATE;
+    private String DC_STATUS;
+    private String DC_DEVCODE;
+    private String DC_DEVNAME;
+    private String DC_LINECODE;
+    private String DC_ID;
+
+    public String getDC_ID() {
+        return DC_ID;
+    }
+
+    public void setDC_ID(String DC_ID) {
+        this.DC_ID = DC_ID;
+    }
+
+    public String getDC_CODE() {
+        return DC_CODE;
+    }
+
+    public void setDC_CODE(String DC_CODE) {
+        this.DC_CODE = DC_CODE;
+    }
+
+    public String getDC_INDATE() {
+        return DC_INDATE;
+    }
+
+    public void setDC_INDATE(String DC_INDATE) {
+        this.DC_INDATE = DC_INDATE;
+    }
+
+    public String getDC_STATUS() {
+        return DC_STATUS;
+    }
+
+    public void setDC_STATUS(String DC_STATUS) {
+        this.DC_STATUS = DC_STATUS;
+    }
+
+    public String getDC_DEVCODE() {
+        return DC_DEVCODE;
+    }
+
+    public void setDC_DEVCODE(String DC_DEVCODE) {
+        this.DC_DEVCODE = DC_DEVCODE;
+    }
+
+    public String getDC_DEVNAME() {
+        return DC_DEVNAME;
+    }
+
+    public void setDC_DEVNAME(String DC_DEVNAME) {
+        this.DC_DEVNAME = DC_DEVNAME;
+    }
+
+    public String getDC_LINECODE() {
+        return DC_LINECODE;
+    }
+
+    public void setDC_LINECODE(String DC_LINECODE) {
+        this.DC_LINECODE = DC_LINECODE;
+    }
+}

app/src/main/java/com/uas/equipment/fragment/DeliveryForRepairFragment.java

@@ -149,8 +149,11 @@ public class DeliveryForRepairFragment extends BaseFragment{
     @Override
     protected void initDatas() {
         Bundle arguments = getArguments();
-        de_code = arguments.getString("de_code");
-        String de_name = arguments.getString("de_name");
+        if (arguments != null) {
+            de_code = arguments.getString("de_code");
+            String de_name = arguments.getString("de_name");
+        }
+
         if (!StringUtil.isEmpty(de_code)){
             getNewNameData();
         }

app/src/main/java/com/uas/equipment/fragment/MaintenanceManagementListFragment.java

@@ -0,0 +1,411 @@
+package com.uas.equipment.fragment;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.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.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
+import com.uas.equipment.R;
+import com.uas.equipment.activity.FunctionActivity;
+import com.uas.equipment.bean.MessageOutboundEvents;
+import com.uas.equipment.bean.OutboundListBean;
+import com.uas.equipment.global.GloableParams;
+import com.uas.equipment.tools.SharedPreUtil;
+import com.uas.equipment.util.CameraUtil;
+import com.uas.equipment.util.CommonUtil;
+import com.uas.equipment.util.Constants;
+import com.uas.equipment.util.FastjsonUtil;
+import com.uas.equipment.util.FragmentUtils;
+import com.uas.equipment.util.HttpCallback;
+import com.uas.equipment.util.HttpParams;
+import com.uas.equipment.util.VolleyRequest;
+import com.uas.equipment.view.ClearableEditText;
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Created by cjh on 2022-10-15
+ */
+public class MaintenanceManagementListFragment extends BaseFragment implements OnColumnItemClickListener<String>, View.OnClickListener {
+
+    private ClearableEditText storage_recharge_collect_et;
+    private PopupWindow mMenuPopupWindow;
+    private Fragment mFragment;
+    private RefreshLayout mRefreshLayout;
+    private SmartTable mSmartTable;
+    private Column<String> va_classColumn,va_codeColumn,va_statusColumn,va_vendnameColumn,va_vendcodeColumn;
+    private TableData<OutboundListBean> mTableData;
+    private int mPageIndex = 1, mPageSize = 20;
+    private List<OutboundListBean> mFilterStorageInBeans;
+    private ImageView mScanImageView;
+    private Button mMenuButton;
+    private static final int SCAN_BARCODE_CODE = 111;
+    private int mFocusId;
+    private Button bt_add;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.maintenance_managementlsit_fragment;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle(getString(R.string.main_list));
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        storage_recharge_collect_et = mActivity.findViewById(R.id.storage_recharge_collect_et);
+        mRefreshLayout = mActivity.findViewById(R.id.pda_wms_in_filter_list_srl);
+        mSmartTable = mActivity.findViewById(R.id.jlt_storage_in_filter_list_st);
+        mScanImageView = (ImageView) mActivity.findViewById(R.id.storage_recharge_scan_iv);
+        mMenuButton = (Button) mActivity.findViewById(R.id.btn_actionbar_more);
+
+
+    }
+
+    @Override
+    protected void initEvents() {
+        storage_recharge_collect_et.requestFocus();
+        storage_recharge_collect_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String va_code = storage_recharge_collect_et.getText().toString().trim();
+                    getDatalistCodes(va_code);
+                    return true;
+                }
+                return false;
+            }
+        });
+        mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
+
+        initPopupWindow();
+        getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
+    }
+
+    @Override
+    protected void initDatas() {
+        if (!EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().register(this);
+        }
+        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_classColumn = new Column<String>("单据编号", "DC_CODE");
+        va_classColumn.setFixed(true);
+        va_codeColumn = new Column<String>("日期", "DC_INDATE");
+        va_statusColumn = new Column<String>("状态", "DC_STATUS");
+        va_vendnameColumn = new Column<String>("设备编号", "DC_DEVCODE");
+        va_vendcodeColumn = new Column<String>("名称", "DC_DEVNAME");
+        va_vendcodeColumn = new Column<String>("线别", "DC_LINECODE");
+
+        va_classColumn.setOnColumnItemClickListener(this);
+        va_codeColumn.setOnColumnItemClickListener(this);
+        va_statusColumn.setOnColumnItemClickListener(this);
+        va_vendnameColumn.setOnColumnItemClickListener(this);
+        va_vendcodeColumn.setOnColumnItemClickListener(this);
+        mScanImageView.setOnClickListener(this);
+        mMenuButton.setOnClickListener(this);
+
+        mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(RefreshLayout refreshLayout) {
+                mPageIndex = 1;
+                getDatalistCodes("");
+            }
+        });
+
+        mRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
+            @Override
+            public void onLoadMore(RefreshLayout refreshLayout) {
+                mPageIndex++;
+                getDatalistCodes("");
+            }
+        });
+
+//        ceshiData();
+    }
+    private void getDatalistCodes(String pi_inoutno){
+        String em_name = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMNAME, null);
+        String em_code = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMCODE, null);
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ASTATIONTHE_SELECT_FUZZSERACHLINELIST)
+                .method(Request.Method.GET)
+                .tag(TAG + "getindatalist")
+                .flag(0)
+                .addParam("em_code",em_code)
+                .addParam("em_name",em_name)
+                .addParam("code",pi_inoutno)
+                .addParam("caller","DeviceChange!Use")
+                .addParam("page",mPageIndex+"")
+                .addParam("pageSize",mPageSize+"")
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                try {
+                    mFilterStorageInBeans.clear();
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray dataArray = resultObject.getJSONArray("items");
+                    List<OutboundListBean> list=new ArrayList<>();
+                    list.clear();
+                    if (dataArray != null && dataArray.size() > 0) {
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject dataObject = dataArray.getJSONObject(i);
+                            if (dataObject != null) {
+                                OutboundListBean jltStorageInBean = new OutboundListBean();
+                                jltStorageInBean.setDC_ID(FastjsonUtil.getText(dataObject, "DC_ID"));
+                                jltStorageInBean.setDC_CODE(FastjsonUtil.getText(dataObject, "DC_CODE"));
+                                jltStorageInBean.setDC_DEVCODE(FastjsonUtil.getText(dataObject, "DC_DEVCODE"));
+                                jltStorageInBean.setDC_DEVNAME(FastjsonUtil.getText(dataObject, "DC_DEVNAME"));
+                                jltStorageInBean.setDC_INDATE(FastjsonUtil.getText(dataObject, "DC_INDATE"));
+                                jltStorageInBean.setDC_LINECODE(FastjsonUtil.getText(dataObject, "DC_LINECODE"));
+                                jltStorageInBean.setDC_STATUS(FastjsonUtil.getText(dataObject, "DC_STATUS"));;
+                                list.add(jltStorageInBean);
+                            }
+                        }
+                    }
+                    mFilterStorageInBeans = list;//PI_INOUTNO
+                    setFilterTableData(mFilterStorageInBeans);
+                    progressDialog.dismiss();
+                    mRefreshLayout.finishRefresh(0);
+                    mRefreshLayout.finishLoadMore(0);
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    progressDialog.dismiss();
+                    mRefreshLayout.finishRefresh(0);
+                    mRefreshLayout.finishLoadMore(0);
+                }
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                mRefreshLayout.finishRefresh(0);
+                mRefreshLayout.finishLoadMore(0);
+                if (mPageIndex > 1) {
+                    mPageIndex--;
+                } else {
+                    setFilterTableData(new ArrayList<>());
+                }
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+
+                setFilterTableData(mFilterStorageInBeans);
+                progressDialog.dismiss();
+            }
+        });
+    }
+
+
+    private void setFilterTableData(List<OutboundListBean> filterTableData) {
+        mTableData = new TableData<OutboundListBean>("收料单列表", filterTableData,
+                va_classColumn,va_codeColumn,va_statusColumn,va_vendnameColumn,va_vendcodeColumn);
+        mSmartTable.setTableData(mTableData);
+//        mSmartTable.requestLayout();
+        mSmartTable.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mSmartTable.postInvalidate();
+            }
+        }, 100);
+
+    }
+    private void initPopupWindow() {
+        View view = View.inflate(getActivity(), R.layout.pop_outboundlist_out_menu, null);
+        bt_add = (Button) view.findViewById(R.id.bt_add);
+        mFragment = new RequisitionTransferFragment();
+
+        bt_add.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeMenuPopupWindow();
+                FragmentUtils.switchFragment(MaintenanceManagementListFragment.this, mFragment);
+            }
+        });
+
+
+
+        mMenuPopupWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        mMenuPopupWindow.setBackgroundDrawable(new BitmapDrawable());
+        mMenuPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeMenuPopupWindow();
+            }
+        });
+    }
+    private void closeMenuPopupWindow() {
+        if (mMenuPopupWindow != null) {
+            mMenuPopupWindow.dismiss();
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+    }
+//    @Subscribe
+//    public void onMessageEvent(MessageOutboundEvents event) {
+//        getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
+//    }
+
+
+
+    @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()).setMoreBtnVisible(false);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        } else {
+            FunctionActivity.setTitle(getString(R.string.main_list));
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        }
+    }
+
+    @Override
+    public void onClick(Column<String> column, String value, String s, int position) {
+        String dc_code = mFilterStorageInBeans.get(position).getDC_CODE();
+        String dc_id = mFilterStorageInBeans.get(position).getDC_ID();
+        String dc_devcode = mFilterStorageInBeans.get(position).getDC_DEVCODE();
+        String dc_status = mFilterStorageInBeans.get(position).getDC_STATUS();
+        RequisitionTransferFragment outboundListAdd_fragment = new RequisitionTransferFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("dc_code", dc_code);
+        bundle.putString("dc_id", dc_id);
+        bundle.putString("dc_devcode", dc_devcode);
+        bundle.putString("dc_status", dc_status);
+        outboundListAdd_fragment.setArguments(bundle);
+        FragmentUtils.switchFragment(MaintenanceManagementListFragment.this, outboundListAdd_fragment);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        CommonUtil.closeKeybord(storage_recharge_collect_et, mActivity);
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.main_list));
+    }
+
+    @Subscribe
+    public void onMessageEvent(MessageOutboundEvents event) {
+        getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
+    }
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.storage_recharge_scan_iv:
+                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));
+                }
+                break;
+            case R.id.btn_actionbar_more:
+                CommonUtil.setBackgroundAlpha(getActivity(), 0.5f);
+                mMenuPopupWindow.showAsDropDown(mMenuButton);
+                break;
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+
+        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_et) {
+                    storage_recharge_collect_et.setText(result);
+                    storage_recharge_collect_et.setSelection(result.length());
+
+                    getDatalistCodes(result);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        // 注销
+        EventBus.getDefault().unregister(this);
+    }
+}

app/src/main/java/com/uas/equipment/fragment/RequisitionTransferFragment.java

@@ -9,8 +9,6 @@ import android.support.annotation.Nullable;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -35,6 +33,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.uas.equipment.R;
 import com.uas.equipment.activity.FunctionActivity;
+import com.uas.equipment.bean.MessageOutboundEvents;
 import com.uas.equipment.bean.RequisitionTransferBean;
 import com.uas.equipment.camera.CaptureActivity;
 import com.uas.equipment.camera.CodeUtils;
@@ -46,11 +45,12 @@ import com.uas.equipment.util.Constants;
 import com.uas.equipment.util.FastjsonUtil;
 import com.uas.equipment.util.HttpCallback;
 import com.uas.equipment.util.HttpParams;
-import com.uas.equipment.util.LogUtil;
 import com.uas.equipment.util.StringUtil;
 import com.uas.equipment.util.VollyRequest;
 import com.uas.equipment.view.ClearableEditText;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -100,6 +100,13 @@ public class RequisitionTransferFragment extends BaseFragment{
     private String ws_workshop;
     private String ws_linecode;
     private String ws_linename;
+    private String dc_code;
+    private String dc_id;
+    private Button btn_commit;
+    private Button btn_audit;
+    private TextView tv_de_code;
+    private String dc_devcode;
+    private String dc_status;
 
     @Override
     protected int getLayout() {
@@ -134,6 +141,9 @@ public class RequisitionTransferFragment extends BaseFragment{
         tv_dc_emcode = root.findViewById(R.id.tv_dc_emcode);
         tv_dc_emname = root.findViewById(R.id.tv_dc_emname);
 
+        btn_commit = root.findViewById(R.id.btn_commit);
+        btn_audit = root.findViewById(R.id.btn_audit);
+        tv_de_code = root.findViewById(R.id.tv_de_code);
     }
 
     @Override
@@ -148,7 +158,7 @@ public class RequisitionTransferFragment extends BaseFragment{
 
         //设置下拉列表的风格
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);//风格一
-        //adapter.setDropDownViewResource(android.R.layout.simple_dropdown_item_1line); 风格二
+//        adapter.setDropDownViewResource(android.R.layout.simple_dropdown_item_1line); //风格二
         //将adapter 添加到spinner中
         spinner.setAdapter(adapter);
         //添加事件Spinner事件监听
@@ -201,15 +211,41 @@ public class RequisitionTransferFragment extends BaseFragment{
                 getNewReceiveData();
             }
         });
+        btn_commit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getNewCommitData();
+            }
+        });
+        btn_audit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getNewAuditData();
+            }
+        });
+
+
+
 
     }
 
     @Override
     protected void initDatas() {
-        Bundle arguments = getArguments();
-        de_code = arguments.getString("de_code");
-        String de_name = arguments.getString("de_name");
-
+        Bundle bundle = getArguments();
+        if (bundle != null) {
+            de_code = bundle.getString("de_code");
+            dc_code = bundle.getString("dc_code");
+            dc_id = bundle.getString("dc_id");
+            dc_devcode = bundle.getString("dc_devcode");
+            dc_status = bundle.getString("dc_status");
+        }
+        if (!StringUtil.isEmpty(dc_code)){
+            getNewNameData();
+            tv_apply_forcode.setText(dc_code);
+        }
+        if (!StringUtil.isEmpty(dc_devcode)){
+            tv_de_code.setText(dc_devcode);
+        }
         String em_name = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMNAME, null);
         String em_code = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMCODE, null);
         if (!StringUtil.isEmpty(em_name)){
@@ -220,6 +256,25 @@ public class RequisitionTransferFragment extends BaseFragment{
         }
 
 
+        if (!StringUtil.isEmpty(dc_status)){
+            if (dc_status.equals("在录入")){
+                btn_audit.setEnabled(false);
+            }else if (dc_status.equals("已提交")){
+                btn_receive.setEnabled(false);
+                btn_commit.setEnabled(false);
+            }else if (dc_status.equals("已审核")){
+                btn_receive.setEnabled(false);
+                btn_commit.setEnabled(false);
+                btn_audit.setEnabled(false);
+            }
+        }else {
+            btn_commit.setEnabled(false);
+            btn_audit.setEnabled(false);
+        }
+
+
+
+
     }
 
     public void getNewData(String input){
@@ -242,7 +297,10 @@ public class RequisitionTransferFragment extends BaseFragment{
                 String de_currentcentername = FastjsonUtil.getText(dataObject, "DE_CURRENTCENTERNAME");
                 String de_workshop = FastjsonUtil.getText(dataObject, "DE_WORKSHOP");
                 String de_currentlinecode = FastjsonUtil.getText(dataObject, "DE_CURRENTLINECODE");
-                de_code = FastjsonUtil.getText(dataObject, "DE_CODE");
+                de_code = FastjsonUtil.getText(dataObject, "DE_BACODE");
+                tv_de_code.setText(de_code);
+
+
                 tv_de_name.setText(de_name);
                 tv_de_managecode.setText(de_managecode);
                 tv_de_manageman.setText(de_manageman);
@@ -260,12 +318,17 @@ public class RequisitionTransferFragment extends BaseFragment{
             }
         });
     }
-    //提交保存
+    //领用
     public void getNewReceiveData(){
+        if (tv_dc_linecode.getText().toString().trim().isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "线别不可为空");
+            return;
+        }
         progressDialog.show();
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
+        object_1.put("dc_code", tv_apply_forcode.getText().toString());
         object_1.put("dc_devname", tv_de_name.getText().toString());
         object_1.put("dc_kind", maintenanceType);
         object_1.put("dc_linecode", tv_dc_linecode.getText().toString().trim());
@@ -283,10 +346,46 @@ public class RequisitionTransferFragment extends BaseFragment{
                 .url(GloableParams.ASTATIONTHE_COMMIT_MAINITEM)
                 .method(Request.Method.GET)
                 .addParam("caller", "DeviceChange!Use")
-                .addParam("de_code",de_code)
+                .addParam("de_code",tv_de_code.getText().toString())
                 .addParam("formStore",jsonArray.toString())
                 .build(), new HttpCallback() {
             @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                tv_prompt.setVisibility(View.VISIBLE);
+                tv_prompt.setTextColor(Color.GREEN);
+                tv_prompt.setText("领用成功");
+//                String result = o.toString();
+//                JSONObject resultObject = JSON.parseObject(result);
+//                JSONObject dataObject = resultObject.getJSONObject("items");
+//                String dc_code = FastjsonUtil.getText(dataObject, "dc_code");
+//                tv_apply_forcode.setText(dc_code);
+                getNewNameData();
+                EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                tv_prompt.setVisibility(View.VISIBLE);
+                tv_prompt.setTextColor(Color.RED);
+                tv_prompt.setText(failStr);
+//                CommonUtil.toastNoRepeat(mActivity, failStr);
+
+            }
+        });
+    }
+    //提交
+    public void getNewCommitData(){
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ASTATIONTHE_SELECT_COMMIT)
+                .method(Request.Method.GET)
+                .addParam("caller", "DeviceChange!Use")
+                .addParam("id",dc_id)
+                .build(), new HttpCallback() {
+            @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 tv_prompt.setVisibility(View.VISIBLE);
@@ -295,8 +394,43 @@ public class RequisitionTransferFragment extends BaseFragment{
                 String result = o.toString();
                 JSONObject resultObject = JSON.parseObject(result);
                 JSONObject dataObject = resultObject.getJSONObject("items");
-                String dc_code = FastjsonUtil.getText(dataObject, "dc_code");
-                tv_apply_forcode.setText(dc_code);
+//                String dc_code = FastjsonUtil.getText(dataObject, "dc_code");
+                EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
+                getNewNameData();
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                tv_prompt.setVisibility(View.VISIBLE);
+                tv_prompt.setTextColor(Color.RED);
+                tv_prompt.setText(failStr);
+//                CommonUtil.toastNoRepeat(mActivity, failStr);
+
+            }
+        });
+    }
+    //审核
+    public void getNewAuditData(){
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ASTATIONTHE_SELECT_AUDIT)
+                .method(Request.Method.GET)
+                .addParam("caller", "DeviceChange!Use")
+                .addParam("id",dc_id)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                tv_prompt.setVisibility(View.VISIBLE);
+                tv_prompt.setTextColor(Color.GREEN);
+                tv_prompt.setText("审核成功");
+                String result = o.toString();
+                JSONObject resultObject = JSON.parseObject(result);
+                JSONObject dataObject = resultObject.getJSONObject("items");
+//                String dc_code = FastjsonUtil.getText(dataObject, "dc_code");
+                EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
+                getNewNameData();
 
             }
 
@@ -326,7 +460,7 @@ public class RequisitionTransferFragment extends BaseFragment{
         rv_ip_port_data.setLayoutManager(new LinearLayoutManager(mActivity));
         andPortAdapter.setmList(delists);
         rv_ip_port_data.setAdapter(andPortAdapter);
-        getdeBugData(edit_et.getText().toString().trim());
+//        getdeBugData(edit_et.getText().toString().trim());
 
 
 
@@ -363,61 +497,28 @@ public class RequisitionTransferFragment extends BaseFragment{
             }
         });
 
-
-        edit_et.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+        edit_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) { }
-            @Override
-            public void afterTextChanged(Editable s) {
-                if (delists.isEmpty()){
-                    getdeBugData(edit_et.getText().toString().trim());
-                }
-                if (s.length() >= 0) {
-                    String mSearchStr = s.toString().trim();
-                    LogUtil.i("mSearchStr",mSearchStr);
-                    List<RequisitionTransferBean> thisList = new ArrayList<>();
-                    for(int i=0;i<delists.size();i++){
-                        if(delists.get(i).getWS_CENTERCODE().contains(mSearchStr) || delists.get(i).getWS_CENTERNAME().contains(mSearchStr)
-                                ||delists.get(i).getWS_LINECODE().contains(mSearchStr)){
-                            thisList.add(delists.get(i));
-                        }
-                        if(i == delists.size() -1){
-                            andPortAdapter = new IpAndPortAdapters(thisList);
-                            rv_ip_port_data.setAdapter(andPortAdapter);
-                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
-                        }
-                    }
-                    andPortAdapter.notifyDataSetChanged();
-
-                } else {
-
-                    andPortAdapter = new IpAndPortAdapters(delists);
-                    rv_ip_port_data.setAdapter(andPortAdapter);
-
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String va_code = edit_et.getText().toString().trim();
+                    getdeBugData(va_code);
+                    return true;
                 }
-                andPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-                    @Override
-                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                        List<RequisitionTransferBean> ipAndPortBeans = andPortAdapter.getmList();
-                        ws_centercode = ipAndPortBeans.get(position).getWS_CENTERCODE();
-                        ws_centername = ipAndPortBeans.get(position).getWS_CENTERNAME();
-                        ws_workshop = ipAndPortBeans.get(position).getWS_WORKSHOP();
-                        ws_linecode = ipAndPortBeans.get(position).getWS_LINECODE();
-                        ws_linename = ipAndPortBeans.get(position).getWS_LINENAME();
-
-                        for (int i = 0; i < ipAndPortBeans.size(); i++) {
-                            ipAndPortBeans.get(i).setChecked(false);
-                        }
-                        ipAndPortBeans.get(position).setChecked(true);
-                        andPortAdapter.notifyDataSetChanged();
-                    }
-                });
+                return false;
             }
+        });
 
+        search_im.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getdeBugData(edit_et.getText().toString().trim());
+            }
         });
 
+
         //确定
         sure_tv.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -454,6 +555,97 @@ public class RequisitionTransferFragment extends BaseFragment{
         }
 
     }
+    //获取数据
+    public void getNewNameData(){
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ASTATIONTHE_COMMIT_DELIVERYFORREPAIR)
+                .method(Request.Method.GET)
+                .addParam("caller", "DeviceChange!Use")
+                .addParam("de_code", tv_de_code.getText().toString())//设备编号
+                .addParam("dc_code", dc_code)
+                .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("items");
+                String dc_linecode = FastjsonUtil.getText(dataObject, "dc_linecode");
+                String dc_oldemcode = FastjsonUtil.getText(dataObject, "dc_oldemcode");
+                String de_currentlinecode = FastjsonUtil.getText(dataObject, "de_currentlinecode");
+                String dc_oldemname = FastjsonUtil.getText(dataObject, "dc_oldemname");
+                String dc_centercode = FastjsonUtil.getText(dataObject, "dc_centercode");
+                String dc_centername = FastjsonUtil.getText(dataObject, "dc_centername");
+                String dc_devname = FastjsonUtil.getText(dataObject, "dc_devname");
+                String dc_emcode = FastjsonUtil.getText(dataObject, "dc_emcode");
+                String de_workshop = FastjsonUtil.getText(dataObject, "de_workshop");
+                String dc_kind = FastjsonUtil.getText(dataObject, "dc_kind");
+                String dc_workshop = FastjsonUtil.getText(dataObject, "dc_workshop");
+                String de_currentcentercode = FastjsonUtil.getText(dataObject, "de_currentcentercode");
+                String de_currentcentername = FastjsonUtil.getText(dataObject, "de_currentcentername");
+                String dc_reason = FastjsonUtil.getText(dataObject, "dc_reason");
+                String dc_status = FastjsonUtil.getText(dataObject, "dc_status");
+                String dc_code = FastjsonUtil.getText(dataObject, "dc_code");
+                if (!StringUtil.isEmpty(dc_status)){
+                    if (dc_status.equals("在录入")){
+                        btn_audit.setEnabled(false);
+                    }else if (dc_status.equals("已提交")){
+                        btn_receive.setEnabled(false);
+                        btn_commit.setEnabled(false);
+                    }else if (dc_status.equals("已审核")){
+                        btn_receive.setEnabled(false);
+                        btn_commit.setEnabled(false);
+                        btn_audit.setEnabled(false);
+                    }
+                }
+                tv_de_currentcentercode.setText(de_currentcentercode);
+                tv_de_currentcentername.setText(de_currentcentername);
+                tv_dc_workshop.setText(dc_workshop);
+                tv_dc_linecode.setText(dc_linecode);
+                tv_de_managecode.setText(dc_oldemcode);
+                tv_de_currentlinecode.setText(de_currentlinecode);
+                tv_de_manageman.setText(dc_oldemname);
+                tv_dc_centercode.setText(dc_centercode);
+                tv_dc_centername.setText(dc_centername);
+                tv_de_name.setText(dc_devname);
+                tv_dc_emcode.setText(dc_emcode);
+                tv_de_workshop.setText(de_workshop);
+                index_dc_reason.setText(dc_reason);
+                tv_apply_forcode.setText(dc_code);
+                if (dc_kind!=null){
+                    if (dc_kind.equals("领用")){
+                        m = new String[]{"领用","转移"};
+                    }else if (dc_kind.equals("转移")){
+                        m = new String[]{"转移","领用"};
+                    }else {
+                        m = new String[]{dc_kind};
+                    }
+                }
+                //将可选内容与ArrayAdapter连接起来
+                adapter = new ArrayAdapter<String>(mActivity,android.R.layout.simple_spinner_item,m);
+
+                //设置下拉列表的风格
+                adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);//风格一
+                //将adapter 添加到spinner中
+                spinner.setAdapter(adapter);
+                //添加事件Spinner事件监听
+                spinner.setOnItemSelectedListener(new SpinnerSelectedListener());
+
+
+
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
     private void getdeBugData(String imput) {
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,

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

@@ -326,6 +326,10 @@ public class GloableParams {
     public static String ASTATIONTHE_COMMIT_MAINITEM;
     public static String ASTATIONTHE_COMMIT_DELIVERYFORREPAIR;
     public static String ASTATIONTHE_SELECT_FUZZSERACHLINE;
+    public static String ASTATIONTHE_SELECT_FUZZSERACHLINELIST;
+    public static String ASTATIONTHE_SELECT_COMMIT;
+    public static String ASTATIONTHE_SELECT_AUDIT;
+
 
     /**
      * 新版设备管理
@@ -342,6 +346,12 @@ public class GloableParams {
     public static String ADDRESSTAIL_GET_DELIVERYFORREPAIR="/oa/device/getDevicechange.action";
     //
     public static String ADDRESSTAIL_GET_FUZZSERACHLINE="/oa/device/fuzzSerachLine.action";
+    public static String ADDRESSTAIL_GET_FUZZSERACHLINELIST="/oa/device/getDeviceChangeList.action";
+
+    //领用转移提交
+    public static String ADDRESSTAIL_GET_COMMTI="/oa/device/submitDeviceChange.action";
+    //领用转移提交
+    public static String ADDRESSTAIL_GET_AUDIT="/oa/device/auditDeviceChange.action";
 
     /**
      * 高登
@@ -1457,24 +1467,20 @@ public class GloableParams {
         GloableParams.ADDRESS_COUNTING_CONFIRMSTOCK = uriHead + GloableParams.ADDRESSTAIL_COUNTING_CONFIRMSTOCK;
         GloableParams.ADDRESS_COUNTING_CLEARSTOCKDIFF = uriHead + GloableParams.ADDRESSTAIL_COUNTING_CLEARSTOCKDIFF;
         GloableParams.ADDRESS_BARINFO_PRINTMODEL = uriHead + GloableParams.ADDRESSTAIL_BARINFO_PRINTMODEL;
-
         GloableParams.ASTATIONTHEQURETHEQURE = uriHead + GloableParams.ASTATIONTHEQURE;
-
         GloableParams.ASTATIONTHE_RESOURCEFILE = uriHead + GloableParams.ADDRESSTAIL_RESOURCEFILE;
-
         GloableParams.ASTATIONTHE_GETSOPSOURCE = uriHead + GloableParams.ADDRESSTAIL_GETSOPSOURCE;
         GloableParams.ASTATIONTHE_INDEXES_SOP = uriHead + GloableParams.ADDRESSTAIL_INDEXES_SOP;
-
-
         GloableParams.ASTATIONTHE_SWEEP_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_SWEEP_DATA;
-
         GloableParams.ASTATIONTHE_MAINTAIN_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_MAINTAIN_DATA;
-
         GloableParams.ASTATIONTHE_NAME_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_NAME_DATA;
         GloableParams.ASTATIONTHE_COMMIT_MAINITEM = uriHead + GloableParams.ADDRESSTAIL_GET_COMMTI_MAINITEM;
-
         GloableParams.ASTATIONTHE_COMMIT_DELIVERYFORREPAIR = uriHead + GloableParams.ADDRESSTAIL_GET_DELIVERYFORREPAIR;
         GloableParams.ASTATIONTHE_SELECT_FUZZSERACHLINE = uriHead + GloableParams.ADDRESSTAIL_GET_FUZZSERACHLINE;
+        GloableParams.ASTATIONTHE_SELECT_FUZZSERACHLINELIST = uriHead + GloableParams.ADDRESSTAIL_GET_FUZZSERACHLINELIST;
+
+        GloableParams.ASTATIONTHE_SELECT_COMMIT = uriHead + GloableParams.ADDRESSTAIL_GET_COMMTI;
+        GloableParams.ASTATIONTHE_SELECT_AUDIT = uriHead + GloableParams.ADDRESSTAIL_GET_AUDIT;
 
 
     }

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

@@ -43,6 +43,27 @@
                 android:src="@drawable/ic_edittext_scan" />
         </LinearLayout>
     </LinearLayout>
+    <LinearLayout
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="7dp"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="设备编号："
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black">
+        </TextView>
+        <TextView
+            android:id="@+id/tv_de_code"
+            android:text=""
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:textColor="@color/black">
+        </TextView>
+    </LinearLayout>
     <LinearLayout
         android:layout_marginLeft="15dp"
         android:layout_marginTop="7dp"
@@ -123,7 +144,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="线别："
+            android:text="线        别："
             android:layout_gravity="center"
             android:textColor="@color/black">
         </TextView>
@@ -134,7 +155,6 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/textsize_20"
             android:layout_weight="1"
-            android:layout_marginLeft="35dp"
             android:layout_marginRight="@dimen/dp_10"
             android:textColor="@color/black"
             />
@@ -413,18 +433,50 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
     </TextView>
-
-    <Button
-        android:id="@+id/btn_receive"
-        android:layout_width="150dp"
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/bg_button"
-        android:layout_gravity="center"
-        android:layout_marginTop="50dp"
-        android:layout_marginBottom="@dimen/textsize_20"
-        android:text="领用"
-        android:textColor="@color/white">
-    </Button>
+        android:layout_marginTop="50dp">
+        <Button
+            android:id="@+id/btn_receive"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@drawable/bg_button"
+            android:layout_gravity="center"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:text="保存"
+            android:textColor="@color/white">
+        </Button>
+        <Button
+            android:id="@+id/btn_commit"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@drawable/bg_button"
+            android:layout_gravity="center"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:text="提交"
+            android:textColor="@color/white">
+        </Button>
+        <Button
+            android:id="@+id/btn_audit"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@drawable/bg_button"
+            android:layout_gravity="center"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:text="审核"
+            android:textColor="@color/white">
+        </Button>
+    </LinearLayout>
+
+
 
 
 </LinearLayout>

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

@@ -35,7 +35,6 @@
             android:textSize="14sp"/>
 
         <ImageView
-            android:visibility="gone"
             android:id="@+id/search_im"
             android:layout_width="46dp"
             android:layout_height="match_parent"

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

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/textsize_16"
+        android:background="@drawable/bg_line_edittext">
+
+        <com.uas.equipment.view.ClearableEditText
+            android:id="@+id/storage_recharge_collect_et"
+            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_iv"
+            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.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/pda_wms_in_filter_list_srl"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <com.scwang.smartrefresh.layout.header.ClassicsHeader
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <com.bin.david.form.core.SmartTable
+            android:id="@+id/jlt_storage_in_filter_list_st"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <com.scwang.smartrefresh.layout.footer.ClassicsFooter
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:srlAccentColor="@android:color/darker_gray" />
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,20 @@
+<?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:background="@color/white"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/bt_add"
+        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/values/strings.xml

@@ -377,7 +377,7 @@
     <string name="text_box_num">箱号：</string>
     <string name="box_num_total">箱内总数：</string>
     <string name="whcode_flag">仓库：</string>
-
+    <string name="main_list">领用转移列表</string>
     <string name="str_collect_already">已采集</string>
     <string name="str_collect_not">未采集</string>
     <string name="str_collect_ing">采集中</string>

pda_libs/pulltoreflashlibrary/build/.transforms/42adda378842da18c18e99ad84b55538.bin

@@ -1 +0,0 @@
-o/classes

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Mon Mar 06 17:27:37 CST 2023
+#Wed Mar 08 11:15:34 CST 2023
 D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
 D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
 D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml