新增收料单列表和新增页面

app/src/main/java/com/uas/uas_mes_standard/bean/MessageEvents.java

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

app/src/main/java/com/uas/uas_mes_standard/bean/StoragerechargeAddCommitBean.java

@@ -0,0 +1,134 @@
+package com.uas.uas_mes_standard.bean;
+
+/**
+ * Created by cjh on 2022-10-10
+ */
+public class StoragerechargeAddCommitBean {
+    private String VAD_DETNO;
+    private String VAD_PUCODE;
+    private String VAD_PUDETNO;
+    private String VAD_PRODCODE;
+    private String VAD_QTY;
+    private String PR_DETAIL;
+    private String VA_CODE;
+    private String VA_VENDCODE;
+    private String VA_VENDNAME;
+    private String VA_STATUSCODE;
+    private String VA_ID;
+    private String VA_SENDCODE;
+
+    public StoragerechargeAddCommitBean(){
+
+    }
+
+    public StoragerechargeAddCommitBean(String VAD_DETNO, String VAD_PUCODE, String VAD_PUDETNO, String VAD_PRODCODE, String VAD_QTY, String PR_DETAIL, String VA_CODE, String VA_VENDCODE, String VA_VENDNAME, String VA_STATUSCODE, String VA_ID, String VA_SENDCODE) {
+        this.VAD_DETNO = VAD_DETNO;
+        this.VAD_PUCODE = VAD_PUCODE;
+        this.VAD_PUDETNO = VAD_PUDETNO;
+        this.VAD_PRODCODE = VAD_PRODCODE;
+        this.VAD_QTY = VAD_QTY;
+        this.PR_DETAIL = PR_DETAIL;
+        this.VA_CODE = VA_CODE;
+        this.VA_VENDCODE = VA_VENDCODE;
+        this.VA_VENDNAME = VA_VENDNAME;
+        this.VA_STATUSCODE = VA_STATUSCODE;
+        this.VA_ID = VA_ID;
+        this.VA_SENDCODE=VA_SENDCODE;
+    }
+
+    public String getVA_SENDCODE() {
+        return VA_SENDCODE;
+    }
+
+    public void setVA_SENDCODE(String VA_SENDCODE) {
+        this.VA_SENDCODE = VA_SENDCODE;
+    }
+
+    public String getVAD_DETNO() {
+        return VAD_DETNO;
+    }
+
+    public void setVAD_DETNO(String VAD_DETNO) {
+        this.VAD_DETNO = VAD_DETNO;
+    }
+
+    public String getVAD_PUCODE() {
+        return VAD_PUCODE;
+    }
+
+    public void setVAD_PUCODE(String VAD_PUCODE) {
+        this.VAD_PUCODE = VAD_PUCODE;
+    }
+
+    public String getVAD_PUDETNO() {
+        return VAD_PUDETNO;
+    }
+
+    public void setVAD_PUDETNO(String VAD_PUDETNO) {
+        this.VAD_PUDETNO = VAD_PUDETNO;
+    }
+
+    public String getVAD_PRODCODE() {
+        return VAD_PRODCODE;
+    }
+
+    public void setVAD_PRODCODE(String VAD_PRODCODE) {
+        this.VAD_PRODCODE = VAD_PRODCODE;
+    }
+
+    public String getVAD_QTY() {
+        return VAD_QTY;
+    }
+
+    public void setVAD_QTY(String VAD_QTY) {
+        this.VAD_QTY = VAD_QTY;
+    }
+
+    public String getPR_DETAIL() {
+        return PR_DETAIL;
+    }
+
+    public void setPR_DETAIL(String PR_DETAIL) {
+        this.PR_DETAIL = PR_DETAIL;
+    }
+
+    public String getVA_CODE() {
+        return VA_CODE;
+    }
+
+    public void setVA_CODE(String VA_CODE) {
+        this.VA_CODE = VA_CODE;
+    }
+
+    public String getVA_VENDCODE() {
+        return VA_VENDCODE;
+    }
+
+    public void setVA_VENDCODE(String VA_VENDCODE) {
+        this.VA_VENDCODE = VA_VENDCODE;
+    }
+
+    public String getVA_VENDNAME() {
+        return VA_VENDNAME;
+    }
+
+    public void setVA_VENDNAME(String VA_VENDNAME) {
+        this.VA_VENDNAME = VA_VENDNAME;
+    }
+
+    public String getVA_STATUSCODE() {
+        return VA_STATUSCODE;
+    }
+
+    public void setVA_STATUSCODE(String VA_STATUSCODE) {
+        this.VA_STATUSCODE = VA_STATUSCODE;
+    }
+
+    public String getVA_ID() {
+        return VA_ID;
+    }
+
+    public void setVA_ID(String VA_ID) {
+        this.VA_ID = VA_ID;
+    }
+}

app/src/main/java/com/uas/uas_mes_standard/bean/StoragerechargeTwoBean.java

@@ -0,0 +1,92 @@
+package com.uas.uas_mes_standard.bean;
+
+/**
+ * Created by jsxiaoshui on 2022-10-09
+ */
+public class StoragerechargeTwoBean {
+    private String VA_CODE;
+    private String VA_ID;
+    private String VA_CLASS;
+    private String VA_STATUS;
+    private String VA_VENDNAME;
+    private String VA_VENDCODE;
+    private String VA_SENDCODE;
+    private String RN;
+    public StoragerechargeTwoBean(){
+
+    }
+    public StoragerechargeTwoBean(String VA_CODE, String VA_ID, String VA_CLASS, String VA_STATUS, String VA_VENDNAME, String VA_VENDCODE, String VA_SENDCODE, String RN) {
+        this.VA_CODE = VA_CODE;
+        this.VA_ID = VA_ID;
+        this.VA_CLASS = VA_CLASS;
+        this.VA_STATUS = VA_STATUS;
+        this.VA_VENDNAME = VA_VENDNAME;
+        this.VA_VENDCODE = VA_VENDCODE;
+        this.VA_SENDCODE = VA_SENDCODE;
+        this.RN = RN;
+    }
+
+    public String getVA_CODE() {
+        return VA_CODE;
+    }
+
+    public void setVA_CODE(String VA_CODE) {
+        this.VA_CODE = VA_CODE;
+    }
+
+    public String getVA_ID() {
+        return VA_ID;
+    }
+
+    public void setVA_ID(String VA_ID) {
+        this.VA_ID = VA_ID;
+    }
+
+    public String getVA_CLASS() {
+        return VA_CLASS;
+    }
+
+    public void setVA_CLASS(String VA_CLASS) {
+        this.VA_CLASS = VA_CLASS;
+    }
+
+    public String getVA_STATUS() {
+        return VA_STATUS;
+    }
+
+    public void setVA_STATUS(String VA_STATUS) {
+        this.VA_STATUS = VA_STATUS;
+    }
+
+    public String getVA_VENDNAME() {
+        return VA_VENDNAME;
+    }
+
+    public void setVA_VENDNAME(String VA_VENDNAME) {
+        this.VA_VENDNAME = VA_VENDNAME;
+    }
+
+    public String getVA_VENDCODE() {
+        return VA_VENDCODE;
+    }
+
+    public void setVA_VENDCODE(String VA_VENDCODE) {
+        this.VA_VENDCODE = VA_VENDCODE;
+    }
+
+    public String getVA_SENDCODE() {
+        return VA_SENDCODE;
+    }
+
+    public void setVA_SENDCODE(String VA_SENDCODE) {
+        this.VA_SENDCODE = VA_SENDCODE;
+    }
+
+    public String getRN() {
+        return RN;
+    }
+
+    public void setRN(String RN) {
+        this.RN = RN;
+    }
+}

app/src/main/java/com/uas/uas_mes_standard/fragment/StorageInFragment.java

@@ -11,7 +11,6 @@ import com.uas.uas_mes_standard.R;
 import com.uas.uas_mes_standard.activity.FunctionActivity;
 import com.uas.uas_mes_standard.global.GloableParams;
 import com.uas.uas_mes_standard.tools.DataSourceManager;
-import com.uas.uas_mes_standard.util.CommonUtil;
 import com.uas.uas_mes_standard.util.FragmentUtils;
 
 import java.util.List;
@@ -102,9 +101,8 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
 //                        //条码信息采集
 //                        mFragment = new BarcodeInfoCollectFragment();
 //                        break;
-                    case GloableParams.LIBRARY_COLLECTION:
-//                        mFragment = new BarcodeInfoCollectFragment();
-                        CommonUtil.toastNoRepeat(mActivity, "正在开发中");
+                    case GloableParams.MENU_STORAGE_RECHARGE_LIST:
+                        mFragment = new StoragerechargeTwo_fragment();
                         break;
                     default:
                         break;

app/src/main/java/com/uas/uas_mes_standard/fragment/StoragerechargeAdd_Fragment.java

@@ -0,0 +1,620 @@
+package com.uas.uas_mes_standard.fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+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.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+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.uas.uas_mes_standard.R;
+import com.uas.uas_mes_standard.activity.FunctionActivity;
+import com.uas.uas_mes_standard.bean.MessageEvents;
+import com.uas.uas_mes_standard.bean.StoragerechargeAddCommitBean;
+import com.uas.uas_mes_standard.global.GloableParams;
+import com.uas.uas_mes_standard.tools.SharedPreUtil;
+import com.uas.uas_mes_standard.util.CameraUtil;
+import com.uas.uas_mes_standard.util.CommonUtil;
+import com.uas.uas_mes_standard.util.Constants;
+import com.uas.uas_mes_standard.util.FastjsonUtil;
+import com.uas.uas_mes_standard.util.HttpCallback;
+import com.uas.uas_mes_standard.util.HttpParams;
+import com.uas.uas_mes_standard.util.StringUtil;
+import com.uas.uas_mes_standard.util.VolleyRequest;
+import com.uas.uas_mes_standard.view.ClearableEditText;
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by jsxiaoshui on 2022-10-09
+ */
+public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColumnItemClickListener<String>, View.OnClickListener {
+
+    private ClearableEditText storage_recharge_collect_ets;
+    private ImageView storage_recharge_scan_ivs;
+    private TextView tv_supplier_code;
+    private TextView tv_supplier_name;
+    private ClearableEditText tv_delivery_code;
+    private SmartTable mSmartTable;
+    private Button jlt_storage_in_barcode_save_btn;
+    private TextView tv_documents_code;
+    private static final int SCAN_BARCODE_CODE = 111;
+    private int mFocusId;
+    private Column<String> va_detnoColumn,va_pucodeCoulmn,va_pudetnoColumn,va_prodcodeColumn,va_qtyColumn,va_detailColumn;
+    private TableData<StoragerechargeAddCommitBean> mTableData;
+    private List<StoragerechargeAddCommitBean> mFilterStorageInBeans;
+    private String va_ids;
+    private CheckBox add_checkbos;
+    private Button jlt_storage_in_generate_detailed_btn;
+    private Button jlt_storage_in_audit_btn;
+    private InputMethodManager imm;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_storagerechargeadd;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle(getString(R.string.title_storage_rechargeadd));
+        storage_recharge_collect_ets = mActivity.findViewById(R.id.storage_recharge_collect_ets);
+        storage_recharge_scan_ivs = mActivity.findViewById(R.id.storage_recharge_scan_ivs);
+
+        tv_documents_code = mActivity.findViewById(R.id.tv_documents_code);
+        tv_supplier_code = mActivity.findViewById(R.id.tv_supplier_code);
+        tv_supplier_name = mActivity.findViewById(R.id.tv_supplier_name);
+        tv_delivery_code = mActivity.findViewById(R.id.tv_delivery_code);
+        mSmartTable = mActivity.findViewById(R.id.jlt_storage_in_filter_list_sts);
+        jlt_storage_in_barcode_save_btn = mActivity.findViewById(R.id.jlt_storage_in_barcode_save_btn);
+        add_checkbos = mActivity.findViewById(R.id.add_checkbos);
+        jlt_storage_in_generate_detailed_btn = mActivity.findViewById(R.id.jlt_storage_in_generate_detailed_btn);
+        jlt_storage_in_audit_btn = mActivity.findViewById(R.id.jlt_storage_in_audit_btn);
+        imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
+
+    }
+
+    @Override
+    protected void initEvents() {
+        SharedPreUtil.removeString(mActivity, Constants.STORAGEERECHADD);
+        String string_va_id = SharedPreUtil.getString(mActivity, Constants.STORAGEERECHADD, null);
+        if (StringUtil.isEmpty(string_va_id)){
+            jlt_storage_in_generate_detailed_btn.setEnabled(false);
+        }else {
+            jlt_storage_in_generate_detailed_btn.setEnabled(true);
+        }
+        storage_recharge_scan_ivs.setOnClickListener(this);
+        jlt_storage_in_barcode_save_btn.setOnClickListener(this);
+        jlt_storage_in_generate_detailed_btn.setOnClickListener(this);
+        jlt_storage_in_audit_btn.setOnClickListener(this);
+        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)) {
+                    String data = storage_recharge_collect_ets.getText().toString().trim();
+                    getDatalistCodes(data);
+                    return true;
+                }
+                return false;
+            }
+        });
+        mFilterStorageInBeans = new ArrayList<>();
+        va_detnoColumn = new Column<String>("序号", "VAD_DETNO");
+        va_detnoColumn.setFixed(true);
+        va_pucodeCoulmn = new Column<String>("采购单号", "VAD_PUCODE");
+        va_pudetnoColumn = new Column<String>("采购序号", "VAD_PUDETNO");
+        va_prodcodeColumn = new Column<String>("料号", "VAD_PRODCODE");
+        va_qtyColumn = new Column<String>("数量", "VAD_QTY");
+        va_detailColumn = new Column<String>("名称", "PR_DETAIL");
+
+        va_detnoColumn.setOnColumnItemClickListener(this);
+        va_pucodeCoulmn.setOnColumnItemClickListener(this);
+        va_pudetnoColumn.setOnColumnItemClickListener(this);
+        va_prodcodeColumn.setOnColumnItemClickListener(this);
+        va_qtyColumn.setOnColumnItemClickListener(this);
+        va_detailColumn.setOnColumnItemClickListener(this);
+
+
+
+    }
+
+    @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;
+                    }
+                });
+
+
+        Bundle bundle = getArguments();
+        if (bundle != null) {
+            va_ids = bundle.getString("va_id");
+            String va_vendcode = bundle.getString("va_vendcode");
+            String va_vendname = bundle.getString("va_vendname");
+            String va_sendcode = bundle.getString("va_sendcode");
+            String va_codes = bundle.getString("va_code");
+            String va_status = bundle.getString("va_status");
+
+            if (va_status.equals("在录入")){
+                jlt_storage_in_generate_detailed_btn.setEnabled(true);
+                storage_recharge_collect_ets.setFocusable(true);
+                tv_delivery_code.setEnabled(true);
+                jlt_storage_in_barcode_save_btn.setEnabled(true);
+                jlt_storage_in_audit_btn.setEnabled(true);
+                jlt_storage_in_generate_detailed_btn.setEnabled(true);
+            }else if (va_status.equals("已审核")){
+                jlt_storage_in_generate_detailed_btn.setEnabled(false);
+                storage_recharge_collect_ets.setFocusable(false);
+                storage_recharge_collect_ets.setEnabled(false);
+                tv_delivery_code.setEnabled(false);
+            }else if (va_status.equals("已提交")){
+                jlt_storage_in_generate_detailed_btn.setEnabled(false);
+                storage_recharge_collect_ets.setFocusable(false);
+                storage_recharge_collect_ets.setEnabled(false);
+                tv_delivery_code.setEnabled(false);
+                jlt_storage_in_audit_btn.setEnabled(true);
+                jlt_storage_in_barcode_save_btn.setEnabled(false);
+            }
+            tv_supplier_code.setText(va_vendcode);
+            tv_supplier_name.setText(va_vendname);
+            tv_delivery_code.setText(va_sendcode);
+            tv_documents_code.setText(va_codes);
+            getDataCommitList(va_ids);
+        }
+
+
+    }
+
+    /**
+     * 请求条码
+     * @param data
+     */
+    private void getDatalistCodes(String data) {
+        progressDialog.show();
+        String ifcancel;
+        if (add_checkbos.isChecked()==true){
+            ifcancel="-1";
+        }else {
+            ifcancel="0";
+        }
+        String string_va_id = SharedPreUtil.getString(mActivity, Constants.STORAGEERECHADD, null);
+        if (!StringUtil.isEmpty(va_ids)){
+            string_va_id=va_ids;
+        }
+
+        String tv_delivery_codetext = this.tv_delivery_code.getText().toString().trim();
+        String finalString_va_id = string_va_id;
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_ADD)
+                .method(Request.Method.GET)
+                .tag(TAG + "getindatalist")
+                .flag(0)
+                .addParam("data", data)
+                .addParam("va_id", string_va_id)
+                .addParam("ifcancel",ifcancel)
+                .addParam("va_sendcode", tv_delivery_codetext)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                storage_recharge_collect_ets.selectAll();
+                storage_recharge_collect_ets.requestFocus();
+
+                String result = o.toString();
+                JSONObject resultObject = JSON.parseObject(result);
+                JSONObject dataObject = resultObject.getJSONObject("data");
+                if (dataObject != null) {
+                    String va_id = FastjsonUtil.getText(dataObject, "va_id");
+                    if (StringUtil.isEmpty(finalString_va_id)) {
+                        SharedPreUtil.saveString(mActivity, Constants.STORAGEERECHADD, va_id);
+                    }
+                    if (va_id.isEmpty()){
+                        jlt_storage_in_generate_detailed_btn.setEnabled(false);
+                    }else {
+                        jlt_storage_in_generate_detailed_btn.setEnabled(true);
+                    }
+                    if (add_checkbos.isChecked()==true){
+                        CommonUtil.toastNoRepeat(mActivity,"取消成功");
+                    }else {
+                        CommonUtil.toastNoRepeat(mActivity,"采集成功");
+                    }
+
+                    EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
+                    getDataCommitList(va_id);
+
+
+                }
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+                EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
+                storage_recharge_collect_ets.selectAll();
+                storage_recharge_collect_ets.requestFocus();
+
+            }
+
+        });
+        imm.showSoftInput(storage_recharge_collect_ets, InputMethodManager.RESULT_HIDDEN);
+    }
+
+    private void commitDataCodes(){//提交
+        storage_recharge_collect_ets.setText("");
+        tv_supplier_code.requestFocus();
+        storage_recharge_collect_ets.clearFocus();
+        getDatalistCodes("");
+        //tv_supplier_code
+        if (tv_delivery_code.getText().toString().trim().isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity,"请填写送货单号");
+            return;
+        }
+        progressDialog.show();
+        String string_va_id = SharedPreUtil.getString(mActivity, Constants.STORAGEERECHADD, null);
+        if (!StringUtil.isEmpty(va_ids)){
+            string_va_id=va_ids;
+        }
+        String finalString_va_id = string_va_id;
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT)
+                .method(Request.Method.GET)
+                .tag(TAG + "getindatalist")
+                .flag(0)
+                .addParam("id",string_va_id)
+                .addParam("caller","VerifyApply")
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                getDataCommitList(finalString_va_id);
+                EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
+                CommonUtil.toastNoRepeat(mActivity,"提交成功");
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+                getDataCommitList(finalString_va_id);
+                storage_recharge_collect_ets.setText("");
+                tv_supplier_code.requestFocus();
+                storage_recharge_collect_ets.clearFocus();
+                EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
+            }
+        });
+    }
+
+    //列表明细数据
+    private void getDataCommitList(String va_id){
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_LIST)
+                .method(Request.Method.GET)
+                .tag(TAG + "datalist")
+                .flag(0)
+                .addParam("va_id",va_id)
+                .build(), new HttpCallback() {
+
+            private String va_sendcode;
+            private String va_vendname;
+            private String va_vendcode;
+            private String va_code;
+            private String va_statuscode;
+
+            @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("data");
+                    List<StoragerechargeAddCommitBean> 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) {
+                                StoragerechargeAddCommitBean jltStorageInBean = new StoragerechargeAddCommitBean();
+                                jltStorageInBean.setVAD_DETNO(FastjsonUtil.getText(dataObject, "VAD_DETNO"));
+                                jltStorageInBean.setVAD_PUCODE(FastjsonUtil.getText(dataObject, "VAD_PUCODE"));
+                                jltStorageInBean.setVAD_PUDETNO(FastjsonUtil.getText(dataObject, "VAD_PUDETNO"));
+                                jltStorageInBean.setVAD_PRODCODE(FastjsonUtil.getText(dataObject, "VAD_PRODCODE"));
+                                jltStorageInBean.setVAD_QTY(FastjsonUtil.getText(dataObject, "VAD_QTY"));
+                                jltStorageInBean.setPR_DETAIL(FastjsonUtil.getText(dataObject, "PR_DETAIL"));
+                                jltStorageInBean.setVA_STATUSCODE(FastjsonUtil.getText(dataObject, "VA_STATUSCODE"));
+
+                                jltStorageInBean.setVA_CODE(FastjsonUtil.getText(dataObject, "VA_CODE"));
+                                jltStorageInBean.setVA_VENDCODE(FastjsonUtil.getText(dataObject, "VA_VENDCODE"));
+                                jltStorageInBean.setVA_VENDNAME(FastjsonUtil.getText(dataObject, "VA_VENDNAME"));
+
+                                jltStorageInBean.setVA_SENDCODE(FastjsonUtil.getText(dataObject, "VA_SENDCODE"));
+                                jltStorageInBean.setVA_ID(FastjsonUtil.getText(dataObject, "VA_ID"));
+                                list.add(jltStorageInBean);
+                                va_statuscode = jltStorageInBean.getVA_STATUSCODE();
+                                va_code = jltStorageInBean.getVA_CODE();
+                                va_vendcode = jltStorageInBean.getVA_VENDCODE();
+                                va_vendname = jltStorageInBean.getVA_VENDNAME();
+                                va_sendcode = jltStorageInBean.getVA_SENDCODE();
+
+                            }
+                        }
+                        tv_documents_code.setText(va_code);
+                        tv_supplier_code.setText(va_vendcode);
+                        tv_supplier_name.setText(va_vendname);
+                        tv_delivery_code.setText(va_sendcode);
+//                        ENTERING 在录入
+//                        COMMITED 已提交
+//                        AUDITED 已审核
+
+                        if (va_statuscode.equals("ENTERING")){
+                            jlt_storage_in_generate_detailed_btn.setEnabled(true);
+                            storage_recharge_collect_ets.setFocusable(true);
+                            tv_delivery_code.setEnabled(true);
+                            jlt_storage_in_barcode_save_btn.setEnabled(true);
+                            jlt_storage_in_audit_btn.setEnabled(true);
+                            jlt_storage_in_generate_detailed_btn.setEnabled(true);
+                        }else if (va_statuscode.equals("COMMITED")){
+                            jlt_storage_in_generate_detailed_btn.setEnabled(false);
+                            storage_recharge_collect_ets.setFocusable(false);
+                            storage_recharge_collect_ets.setEnabled(false);
+                            tv_delivery_code.setEnabled(false);
+                            jlt_storage_in_audit_btn.setEnabled(true);
+                            jlt_storage_in_barcode_save_btn.setEnabled(false);
+                        }else if (va_statuscode.equals("AUDITED")){
+                            jlt_storage_in_generate_detailed_btn.setEnabled(false);
+                            storage_recharge_collect_ets.setFocusable(false);
+                            storage_recharge_collect_ets.setEnabled(false);
+                            tv_delivery_code.setEnabled(false);
+                            jlt_storage_in_barcode_save_btn.setEnabled(false);
+                            jlt_storage_in_audit_btn.setEnabled(false);
+
+                        }
+                    }
+//                    mFilterStorageInBeans = list;
+
+                    mFilterStorageInBeans = list;//PI_INOUTNO
+                    setFilterTableData(mFilterStorageInBeans);
+                    EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
+
+                    progressDialog.dismiss();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    progressDialog.dismiss();
+                }
+            }
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                setFilterTableData(new ArrayList<>());
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+                setFilterTableData(mFilterStorageInBeans);
+                EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
+            }
+        });
+    }
+
+    private void generate_detailedData(){//生成明细
+        progressDialog.show();
+        String string_va_ids = SharedPreUtil.getString(mActivity, Constants.STORAGEERECHADD, null);
+        if (!StringUtil.isEmpty(va_ids)){
+            string_va_ids=va_ids;
+        }
+        String finalString_va_ids = string_va_ids;
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_DETAIL)
+                .method(Request.Method.GET)
+                .tag(TAG + "datalist")
+                .flag(0)
+                .addParam("va_id",string_va_ids)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                getDataCommitList(finalString_va_ids);
+
+            }
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
+
+    private void generate_auditData(){//审核
+
+        if (tv_delivery_code.getText().toString().trim().isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity,"请填写送货单号");
+            return;
+        }
+        progressDialog.show();
+        storage_recharge_collect_ets.setText("");
+        tv_supplier_code.requestFocus();
+        storage_recharge_collect_ets.clearFocus();
+        String string_va_id = SharedPreUtil.getString(mActivity, Constants.STORAGEERECHADD, null);
+        if (!StringUtil.isEmpty(va_ids)){
+            string_va_id=va_ids;
+        }
+        String finalString_va_id = string_va_id;
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_AUDIT)
+                .method(Request.Method.GET)
+                .tag(TAG + "getindatalist")
+                .flag(0)
+                .addParam("id",string_va_id)
+                .addParam("caller","VerifyApply")
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                getDataCommitList(finalString_va_id);
+                EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
+                CommonUtil.toastNoRepeat(mActivity,"审核成功");
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                getDataCommitList(finalString_va_id);
+                EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
+
+
+    private void setFilterTableData(List<StoragerechargeAddCommitBean> filterTableData) {
+        mTableData = new TableData<StoragerechargeAddCommitBean>("列表", filterTableData,
+                va_detnoColumn,va_pucodeCoulmn,va_pudetnoColumn,va_prodcodeColumn,va_qtyColumn,va_detailColumn);
+        mSmartTable.setTableData(mTableData);
+//        mSmartTable.requestLayout();
+        mSmartTable.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mSmartTable.postInvalidate();
+            }
+        }, 100);
+
+    }
+
+
+
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.storage_recharge_scan_ivs:
+                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.jlt_storage_in_generate_detailed_btn://生成明细
+                generate_detailedData();
+                break;
+            case R.id.jlt_storage_in_barcode_save_btn://提交
+                commitDataCodes();
+                break;
+            case R.id.jlt_storage_in_audit_btn://审核
+                generate_auditData();
+                break;
+
+            }
+        }
+
+        @Override
+        public void onClick (Column < String > column, String value, String s,int position){
+
+        }
+    @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_ets.setText(result);
+                    storage_recharge_collect_ets.setSelection(result.length());
+
+                    getDatalistCodes(result);
+                }
+            }
+        }
+    }
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        CommonUtil.closeKeybord(storage_recharge_collect_ets, mActivity);
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.title_storage_rechargeadd));
+        SharedPreUtil.removeString(mActivity,Constants.STORAGEERECHADD);
+    }
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (hidden) {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        } else {
+            FunctionActivity.setTitle(getString(R.string.title_storage_rechargeadd));
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        SharedPreUtil.removeString(mActivity,Constants.STORAGEERECHADD);
+    }
+}

app/src/main/java/com/uas/uas_mes_standard/fragment/StoragerechargeTwo_fragment.java

@@ -0,0 +1,463 @@
+package com.uas.uas_mes_standard.fragment;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v4.app.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.uas_mes_standard.R;
+import com.uas.uas_mes_standard.activity.FunctionActivity;
+import com.uas.uas_mes_standard.bean.MessageEvents;
+import com.uas.uas_mes_standard.bean.StoragerechargeTwoBean;
+import com.uas.uas_mes_standard.global.GloableParams;
+import com.uas.uas_mes_standard.util.CameraUtil;
+import com.uas.uas_mes_standard.util.CommonUtil;
+import com.uas.uas_mes_standard.util.Constants;
+import com.uas.uas_mes_standard.util.FastjsonUtil;
+import com.uas.uas_mes_standard.util.FragmentUtils;
+import com.uas.uas_mes_standard.util.HttpCallback;
+import com.uas.uas_mes_standard.util.HttpParams;
+import com.uas.uas_mes_standard.util.VolleyRequest;
+import com.uas.uas_mes_standard.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.List;
+
+/**
+ * Created by jsxiaoshui on 2022-10-09
+ */
+public class StoragerechargeTwo_fragment 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,va_sendcodeColumn;
+    private TableData<StoragerechargeTwoBean> mTableData;
+    private int mPageIndex = 1, mPageSize = 20;
+    private List<StoragerechargeTwoBean> mFilterStorageInBeans;
+    private ImageView mScanImageView;
+    private Button mMenuButton;
+    private static final int SCAN_BARCODE_CODE = 111;
+    private int mFocusId;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.storagerechargetwo_fragment;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle(getString(R.string.title_storage_rechargetwo));
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        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 = 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>("单据类型", "VA_CLASS");
+        va_classColumn.setFixed(true);
+        va_codeColumn = new Column<String>("单据编号", "VA_CODE");
+        va_statusColumn = new Column<String>("状态", "VA_STATUS");
+        va_vendnameColumn = new Column<String>("供应商名称", "VA_VENDNAME");
+        va_vendcodeColumn = new Column<String>("供应商编号", "VA_VENDCODE");
+        va_sendcodeColumn = new Column<String>("送货单号", "VA_SENDCODE");
+
+        va_classColumn.setOnColumnItemClickListener(this);
+        va_codeColumn.setOnColumnItemClickListener(this);
+        va_statusColumn.setOnColumnItemClickListener(this);
+        va_vendnameColumn.setOnColumnItemClickListener(this);
+        va_vendcodeColumn.setOnColumnItemClickListener(this);
+        va_sendcodeColumn.setOnColumnItemClickListener(this);
+        mScanImageView.setOnClickListener(this);
+        mMenuButton.setOnClickListener(this);
+
+        mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(RefreshLayout refreshLayout) {
+                mPageIndex = 1;
+                getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
+            }
+        });
+
+        mRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
+            @Override
+            public void onLoadMore(RefreshLayout refreshLayout) {
+                mPageIndex++;
+                getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
+            }
+        });
+
+
+    }
+
+    private void getDatalistCodes(String va_code){
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO)
+                .method(Request.Method.GET)
+                .tag(TAG + "getindatalist")
+                .flag(0)
+                .addParam("va_code",va_code)
+                .addParam("page",mPageIndex+"")
+                .addParam("pageSize",mPageSize+"")
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                try {
+                    if (mPageIndex == 1) {
+                        mFilterStorageInBeans.clear();
+                    }
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray dataArray = resultObject.getJSONArray("data");
+                    List<StoragerechargeTwoBean> list=new ArrayList<>();
+                    if (dataArray != null && dataArray.size() > 0) {
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject dataObject = dataArray.getJSONObject(i);
+                            if (dataObject != null) {
+                                StoragerechargeTwoBean jltStorageInBean = new StoragerechargeTwoBean();
+                                jltStorageInBean.setVA_CODE(FastjsonUtil.getText(dataObject, "VA_CODE"));
+                                jltStorageInBean.setVA_ID(FastjsonUtil.getText(dataObject, "VA_ID"));
+                                jltStorageInBean.setVA_CLASS(FastjsonUtil.getText(dataObject, "VA_CLASS"));
+                                jltStorageInBean.setVA_STATUS(FastjsonUtil.getText(dataObject, "VA_STATUS"));
+                                jltStorageInBean.setVA_VENDNAME(FastjsonUtil.getText(dataObject, "VA_VENDNAME"));
+                                jltStorageInBean.setVA_VENDCODE(FastjsonUtil.getText(dataObject, "VA_VENDCODE"));
+                                jltStorageInBean.setVA_SENDCODE(FastjsonUtil.getText(dataObject, "VA_SENDCODE"));
+                                jltStorageInBean.setRN(FastjsonUtil.getText(dataObject, "RN"));
+                                list.add(jltStorageInBean);
+                            }
+                        }
+                    }
+                    if (mPageIndex == 1) {
+                        mFilterStorageInBeans = list;//PI_INOUTNO
+                        setFilterTableData(mFilterStorageInBeans);
+                    }else if (list.size() > 0) {
+                        mFilterStorageInBeans.addAll(list);
+                        mSmartTable.addData(list, true);
+                        new Handler().postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                mSmartTable.postInvalidate();
+                            }
+                        }, 100);
+//                        filterAllSelect();
+                    } else {
+                        mPageIndex--;
+                    }
+                    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);
+            }
+        });
+    }
+
+
+    private void setFilterTableData(List<StoragerechargeTwoBean> filterTableData) {
+        mTableData = new TableData<StoragerechargeTwoBean>("收料单列表", filterTableData,
+                va_classColumn,va_codeColumn,va_statusColumn,va_vendnameColumn,va_vendcodeColumn,va_sendcodeColumn);
+        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_storage_two_2, null);
+
+        Button doneButton = (Button) view.findViewById(R.id.pop_storage_recharge_menu_1);
+        Button todoButton = (Button) view.findViewById(R.id.pop_storage_recharge_menu_2);
+        Button storageButton = (Button) view.findViewById(R.id.pop_storage_recharge_menu_3);
+        Button storageButtonadd = (Button) view.findViewById(R.id.pop_storage_recharge_menu_4);
+        mFragment = new StorageRechargeListFragment();
+        doneButton.setVisibility(View.GONE);
+        todoButton.setVisibility(View.GONE);
+        storageButton.setVisibility(View.GONE);
+
+        doneButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeMenuPopupWindow();
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.FLAG.FLAG_RECHARGE_CALLER, "AcceptNotify!Have");
+                mFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(StoragerechargeTwo_fragment.this, mFragment);
+            }
+        });
+
+
+        todoButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeMenuPopupWindow();
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.FLAG.FLAG_RECHARGE_CALLER, "AcceptNotify!Need");
+                mFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(StoragerechargeTwo_fragment.this, mFragment);
+            }
+        });
+        storageButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeMenuPopupWindow();
+                mFragment = new StorageRechargeFragment();
+                if (mFragment != null) {
+                    FragmentUtils.switchFragment(StoragerechargeTwo_fragment.this, mFragment);
+                }
+            }
+        });
+        storageButtonadd.setOnClickListener(new View.OnClickListener() {//新增
+            @Override
+            public void onClick(View v) {
+                closeMenuPopupWindow();
+                mFragment = new StoragerechargeAdd_Fragment();
+                if (mFragment != null) {
+                    FragmentUtils.switchFragment(StoragerechargeTwo_fragment.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(MessageEvents 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);
+        } else {
+            FunctionActivity.setTitle(getString(R.string.title_storage_rechargetwo));
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        }
+    }
+
+    @Override
+    public void onClick(Column<String> column, String value, String s, int position) {
+
+        String va_id = mFilterStorageInBeans.get(position).getVA_ID();
+        String va_vendcode = mFilterStorageInBeans.get(position).getVA_VENDCODE();
+        String va_vendname = mFilterStorageInBeans.get(position).getVA_VENDNAME();
+        String va_sendcode = mFilterStorageInBeans.get(position).getVA_SENDCODE();
+        String vacodes = mFilterStorageInBeans.get(position).getVA_CODE();
+        String va_status = mFilterStorageInBeans.get(position).getVA_STATUS();
+        StoragerechargeAdd_Fragment jltStorageInBarcodeFragment = new StoragerechargeAdd_Fragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("va_id", va_id);
+        bundle.putString("va_vendcode", va_vendcode);
+        bundle.putString("va_vendname", va_vendname);
+        bundle.putString("va_sendcode", va_sendcode);
+        bundle.putString("va_code", vacodes);
+        bundle.putString("va_status", va_status);
+
+        jltStorageInBarcodeFragment.setArguments(bundle);
+        FragmentUtils.switchFragment(StoragerechargeTwo_fragment.this, jltStorageInBarcodeFragment);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        CommonUtil.closeKeybord(storage_recharge_collect_et, mActivity);
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.title_storage_rechargetwo));
+    }
+
+
+    @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/uas_mes_standard/global/GloableParams.java

@@ -254,6 +254,21 @@ public class GloableParams {
     public static String ADDRESS_PDAIO_GET_lOGINDELETE;
     public static String ADDRESS_PUTMATERIAL_TOADOPTPROMPT;
     public static String ADDRESS_DOCUMENTLIBRARY_CODE;
+
+
+    public static String ADDRESS_DOCUMENTLIBRARY_CODETWO;
+    public static String ADDRESS_DOCUMENTLIBRARY_CODETWO_ADD;
+    public static String ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT;
+    public static String ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_LIST;
+    public static String ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_DETAIL;
+    public static String ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_AUDIT;
+
+
+
+
+
+
+
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
     //登录页面请求地址
@@ -721,6 +736,23 @@ public class GloableParams {
     //单据入库条码请求
     private static final String ADDRESSTAIL_DOCUMENTLIBRARY_CODE = "/api/pda/inMaterial/getCodeData.action";
 
+
+
+    /**
+     * 新收料单
+     */
+    public static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO = "/api/pda/receiving/getPreInDataList.action";
+
+    public static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_ADD = "/api/pda/inMaterial/saveVerifyApply.action";
+    public static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT="/scm/purchase/submitVerifyApply.action";
+    private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_LIST="/api/pda/inMaterial/getVerifyApply.action";
+    private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_DETAIL="/api/pda/inMaterial/getVerifyApplyDetail.action";
+    private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_AUDIT="/scm/purchase/auditVerifyApply.action";
+
+
+
+
+
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/
     //主界面
@@ -828,8 +860,7 @@ public class GloableParams {
     public static final String MENU_STORAGE_PRODUCT_STORAGE_IN = "完工品入库";
     public static final String MENU_STORAGE_RANDOM_CHECK = "抽查校验";
     public static final String MENU_STORAGE_BARCODE_IN = "入库采集";
-    public static final String LIBRARY_COLLECTION="入库采集1";
-
+    public static final String MENU_STORAGE_RECHARGE_LIST = "收料单列表";
     public static final String[] storageInMenuNames = {
             MENU_STORAGE_RECHARGE,
 //            MENU_STORAGE_INSPECTION,
@@ -838,6 +869,7 @@ public class GloableParams {
 //            MENU_STORAGE_PRODUCT_STORAGE_IN,
 //            MENU_STORAGE_RANDOM_CHECK,
             MENU_STORAGE_BARCODE_IN,
+            MENU_STORAGE_RECHARGE_LIST
 //            MENU_STORAGE_BARCODE_INFO_COLLECT,
 //            LIBRARY_COLLECTION
     };
@@ -850,7 +882,7 @@ public class GloableParams {
 //            R.drawable.ic_storage_random_check,
             R.drawable.ic_storage_barcode_in,
 //            R.drawable.ic_barcode_info_collect,
-//            R.drawable.ic_storage_iqc
+            R.drawable.iv_storager_two
     };
 
     //-->SMT校验
@@ -1149,7 +1181,12 @@ public class GloableParams {
         GloableParams.ADDRESS_PUTMATERIAL_TOADOPTPROMPT = uriHead + GloableParams.ADDRESSTAIL_PDAIO_GET_TOADOPTPROMPT;
 
         GloableParams.ADDRESS_DOCUMENTLIBRARY_CODE= uriHead + GloableParams.ADDRESSTAIL_DOCUMENTLIBRARY_CODE;
-
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_ADD= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_ADD;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_LIST= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_LIST;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_DETAIL= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_DETAIL;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_AUDIT= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_AUDIT;
 
     }
 }

app/src/main/java/com/uas/uas_mes_standard/util/Constants.java

@@ -6,7 +6,10 @@ import android.os.Environment;
  * 常量集合类
  */
 public interface Constants {
-
+    /**
+     * 新增收料单列表
+     */
+    String STORAGEERECHADD ="add_codes";
     interface CONSTANT {
         String APP_DIR_NAME = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/data/";
         String PRINT_SHARE_PACKAGE = "com.dynamixsoftware.printershare";

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

@@ -0,0 +1,232 @@
+<?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"
+    android:orientation="vertical"
+    android:background="@color/white">
+    <CheckBox
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_10"
+        android:id="@+id/add_checkbos"
+        android:text="取消采集"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+    </CheckBox>
+    <LinearLayout
+        android:padding="@dimen/sp_16"
+        android:paddingLeft="@dimen/sp_16"
+        android:paddingRight="@dimen/sp_16"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            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:lines="1"-->
+<!--                android:focusableInTouchMode="true"-->
+<!--                android:hint="请采集单号"-->
+<!--                android:imeOptions="actionSend"-->
+<!--                android:textColor="@color/black" />-->
+            <com.uas.uas_mes_standard.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>
+
+    </LinearLayout>
+    <ScrollView
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/white"
+        android:padding="@dimen/textsize_16">
+
+
+        <LinearLayout
+            android:background="@color/white"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:minWidth="60dp"
+                android:text="单据编号      "
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/tv_documents_code"
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:minWidth="60dp"
+                android:text=""
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:background="@color/white"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:minWidth="60dp"
+                android:text="供应商编号"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <EditText
+                android:id="@+id/tv_supplier_code"
+                style="@style/EditTextStyle"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:background="@drawable/bg_line_edittext"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="30dp"
+                android:lines="1"
+                android:editable="false">
+            </EditText>
+
+        </LinearLayout>
+        <LinearLayout
+            android:background="@color/white"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:minWidth="60dp"
+                android:text="供应商名称"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <EditText
+                android:id="@+id/tv_supplier_name"
+                style="@style/EditTextStyle"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:background="@drawable/bg_line_edittext"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="30dp"
+                android:lines="1"
+                android:editable="false">
+            </EditText>
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:background="@color/white"
+            android:id="@+id/jlt_storage_in_barcode_line"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:minWidth="60dp"
+                android:text="送货单号"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <com.uas.uas_mes_standard.view.ClearableEditText
+                android:id="@+id/tv_delivery_code"
+                style="@style/EditTextStyle"
+                android:layout_marginLeft="18dp"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:lines="1"
+                android:layout_height="30dp"
+                android:background="@drawable/bg_line_edittext"
+                android:hint="请输入送货单号" />
+        </LinearLayout>
+        <com.bin.david.form.core.SmartTable
+            android:layout_marginTop="@dimen/textsize_20"
+            android:id="@+id/jlt_storage_in_filter_list_sts"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:layout_marginBottom="@dimen/dp_10"/>
+
+    </LinearLayout>
+    </ScrollView>
+    <LinearLayout
+        android:background="@color/white"
+        android:paddingLeft="@dimen/sp_16"
+        android:paddingRight="@dimen/sp_16"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <Button
+            android:id="@+id/jlt_storage_in_generate_detailed_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:text="生成明细"
+            android:enabled="false"
+            />
+        <Button
+            android:id="@+id/jlt_storage_in_barcode_save_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:text="提交"
+            android:enabled="false"
+            />
+        <Button
+            android:id="@+id/jlt_storage_in_audit_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:text="审核"
+            android:enabled="false"
+            />
+
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,47 @@
+<?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/pop_storage_recharge_menu_1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/transparent"
+        android:text="已转收料"
+        android:textSize="@dimen/app_text_size_body_2" />
+
+    <Button
+        android:id="@+id/pop_storage_recharge_menu_2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/transparent"
+        android:text="未转收料"
+        android:textSize="@dimen/app_text_size_body_2" />
+    <Button
+        android:id="@+id/pop_storage_recharge_menu_3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/transparent"
+        android:text="供应商平台收料"
+        android:textSize="@dimen/app_text_size_body_2" />
+    <Button
+        android:id="@+id/pop_storage_recharge_menu_4"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/transparent"
+        android:text="新增"
+        android:textSize="@dimen/app_text_size_body_2" />
+</LinearLayout>

app/src/main/res/layout/storagerechargetwo_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.uas_mes_standard.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/values/strings.xml

@@ -424,7 +424,8 @@
     <string name="title_storage_inspection">送检</string>
     <string name="title_storage_iqc">IQC入库</string>
     <string name="title_storage_recharge">收料</string>
-
+    <string name="title_storage_rechargetwo">收料单列表</string>
+    <string name="title_storage_rechargeadd">新增收料单</string>
     <string-array name="material_collect_menu">
         <item>已采集列表</item>
         <item>未采集明细</item>

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" }
     }
 }