修改物料库存核查界面,去除蓝牙筛选,备料数据汇总修改

app/src/main/java/com/uas/pda_smart_com/activity/IndexActivity.java

@@ -183,9 +183,9 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     @Override
     protected void onResume() {
         super.onResume();
-        SharedPreUtil.saveString(this, "printAddress", "");
-        SharedPreUtil.saveInt(this, "printConnect", 0);
-        SharedPreUtil.saveInt(this, "printDpi", 203);
+//        SharedPreUtil.saveString(this, "printAddress", "");
+//        SharedPreUtil.saveInt(this, "printConnect", 0);
+//        SharedPreUtil.saveInt(this, "printDpi", 203);
     }
 
     @Override

app/src/main/java/com/uas/pda_smart_com/adapter/PopWinWHCheckMakeMaterialListAdapter.java

@@ -0,0 +1,59 @@
+package com.uas.pda_smart_com.adapter;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.uas.pda_smart_com.R;
+import com.uas.pda_smart_com.bean.WHMakeMaterialProduct;
+
+import java.util.List;
+
+/**
+ * @note:仓库管理:物料存储详细数据表格ListAdapter
+ */
+public class PopWinWHCheckMakeMaterialListAdapter extends BaseAdapter {
+    List itemList;
+    Context context;
+
+    public PopWinWHCheckMakeMaterialListAdapter(List itemList, Context context) {
+        this.itemList = itemList;
+        this.context = context;
+    }
+
+    @Override
+    public int getCount() {
+        return itemList.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return itemList.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        View view = View.inflate(context, R.layout.popwin_item_list_table, null);
+        TextView tvColumn1 = (TextView) view.findViewById(R.id.tv_table_1);
+        TextView tvColumn2 = (TextView) view.findViewById(R.id.tv_table_2);
+        TextView tvColumn3 = (TextView) view.findViewById(R.id.tv_table_3);
+        TextView tvColumn4 = (TextView) view.findViewById(R.id.tv_table_4);
+        tvColumn4.setVisibility(View.VISIBLE);
+        WHMakeMaterialProduct tmpProduct = (WHMakeMaterialProduct) getItem(position);
+        tvColumn1.setText("" + tmpProduct.getBAR_WHCODE());
+        tvColumn2.setText("" + tmpProduct.getBAR_LOCATION());
+        tvColumn3.setText("" + tmpProduct.getREMAIN());
+        tvColumn4.setText("" + tmpProduct.getMADEDATE());
+        int[] colors = {Color.WHITE, Color.rgb(219, 238, 244)};
+        view.setBackgroundColor(colors[position % 2]);
+        return view;
+    }
+}

app/src/main/java/com/uas/pda_smart_com/adapter/WHCheckMakeMaterialListAdapter.java

@@ -45,10 +45,12 @@ public class WHCheckMakeMaterialListAdapter extends BaseAdapter {
         TextView tvColumn1 = (TextView) view.findViewById(R.id.tv_table_1);
         TextView tvColumn2 = (TextView) view.findViewById(R.id.tv_table_2);
         TextView tvColumn3 = (TextView) view.findViewById(R.id.tv_table_3);
+        TextView tvColumn4 = (TextView) view.findViewById(R.id.tv_table_4);
         WHMakeMaterialProduct tmpProduct = (WHMakeMaterialProduct) getItem(position);
         tvColumn1.setText("" + tmpProduct.getBAR_WHCODE());
         tvColumn2.setText("" + tmpProduct.getBAR_LOCATION());
-        tvColumn3.setText("" + tmpProduct.getBAR_REMAIN());
+        tvColumn3.setText("" + tmpProduct.getREMAIN());
+        tvColumn4.setText("" + tmpProduct.getMADEDATE());
         int[] colors = {Color.WHITE, Color.rgb(219, 238, 244)};
         view.setBackgroundColor(colors[position % 2]);
         return view;

app/src/main/java/com/uas/pda_smart_com/bean/WHMakeMaterialProduct.java

@@ -10,6 +10,24 @@ public class WHMakeMaterialProduct {
     private String PR_SPEC;
     private String BAR_LOCATION;
     private String BAR_WHCODE;
+    private String REMAIN;
+    private String MADEDATE;
+
+    public String getREMAIN() {
+        return REMAIN;
+    }
+
+    public void setREMAIN(String REMAIN) {
+        this.REMAIN = REMAIN;
+    }
+
+    public String getMADEDATE() {
+        return MADEDATE;
+    }
+
+    public void setMADEDATE(String MADEDATE) {
+        this.MADEDATE = MADEDATE;
+    }
 
     public int getBAR_REMAIN() {
         return BAR_REMAIN;

app/src/main/java/com/uas/pda_smart_com/fragment/NewWHCheckBarcodeFragment.java

@@ -0,0 +1,324 @@
+package com.uas.pda_smart_com.fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TableLayout;
+import android.widget.TextView;
+
+import com.uas.pda_smart_com.R;
+import com.uas.pda_smart_com.activity.FunctionActivity;
+import com.uas.pda_smart_com.global.GloableParams;
+import com.uas.pda_smart_com.tools.VolleyUtil;
+import com.uas.pda_smart_com.util.CameraUtil;
+import com.uas.pda_smart_com.util.CommonUtil;
+import com.uas.pda_smart_com.view.ClearableEditText;
+import com.uas.pda_smart_com.view.ConfirmDialog;
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * @note:条码信息核查页面
+ */
+public class NewWHCheckBarcodeFragment extends BaseFragment implements View.OnClickListener, VolleyUtil.VolleyFinishListener {
+    private static final int SCAN_BARCODE_CODE = 402;
+    ClearableEditText etCollect;
+    TableLayout tlMsg;
+    TextView tvBarcode, tvBarProcode,tv_type_value,tvPrDetail, tvPrSpec, tvVeShortname, tvBarWhcode, tvBarRemain, tvBarLocation, tvStatus;
+    private TextView btnSearch;
+    private ImageView mScanImageView;
+    private int mFocusId;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_whcheck_barcode_new;
+    }
+
+    @Override
+    protected void initViews() {
+        ((FunctionActivity) mActivity).setScanIvVisible(true);
+        etCollect = (ClearableEditText) root.findViewById(R.id.et_collect);
+        tlMsg = (TableLayout) root.findViewById(R.id.tl_msg);
+        tvBarcode = (TextView) root.findViewById(R.id.tv_bar_code);
+        tvBarProcode = (TextView) root.findViewById(R.id.tv_bar_procode);
+        tv_type_value=root.findViewById(R.id.tv_type_value);
+        tvPrDetail = (TextView) root.findViewById(R.id.tv_pr_detail);
+        tvPrSpec = (TextView) root.findViewById(R.id.tv_pr_spec);
+        tvVeShortname = (TextView) root.findViewById(R.id.tv_pr_ve_shortname);
+        tvBarWhcode = (TextView) root.findViewById(R.id.tv_bar_whcode);
+        tvBarRemain = (TextView) root.findViewById(R.id.tv_bar_remain);
+        tvBarLocation = (TextView) root.findViewById(R.id.tv_bar_location);
+        tvStatus = root.findViewById(R.id.tv_bar_status);
+        btnSearch = (TextView) root.findViewById(R.id.btn_collect);
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(R.string.title_barcode_whmm);
+        mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
+
+    }
+
+    @Override
+    protected void initEvents() {
+        VolleyUtil.getVolleyUtil().setOnVolleyFinishListener(this);
+
+        //监听
+        btnSearch.setOnClickListener(this);
+        etCollect.setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                //回车事件
+                if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
+                    disposeOnclickEnter();
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        mScanImageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void initDatas() {
+        etCollect.setHint(R.string.hint_whcheck_bar_code);
+        tlMsg.setVisibility(View.GONE);
+
+        editTextGetFocus(etCollect);
+    }
+
+    @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.et_collect) {
+                    etCollect.setText(result);
+                    etCollect.setSelection(result.length());
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(R.string.title_content_whmm);
+        hideKeyboard(etCollect);
+        VolleyUtil.distoryVolley();
+
+        ((FunctionActivity) mActivity).setScanIvVisible(false);
+        super.onDestroy();
+    }
+
+    @Override
+    public void onPause() {
+        hideKeyboard(etCollect);
+        super.onPause();
+    }
+
+    //按钮点击事件&输入框回车事件
+    private void disposeOnclickEnter() {
+        String strBarcode = etCollect.getText().toString().trim();
+        if (strBarcode == null || strBarcode.equals("")) {
+            etCollect.setWarnIconVisible();
+            return;
+        }
+        //发送请求至服务器
+        showLoadingView();
+        VolleyUtil.getVolleyUtil().requestBarcodeCheck(getActivity(), GloableParams.ADDRESS_WHCHECK_BARCODE, VolleyUtil.METHOD_GET,
+                VolleyUtil.FRAGMETN_WHCHECK_BARCODE, strBarcode);
+    }
+
+    //将服务器返回的null值转换为“ ”
+    private String changeNulltoBlank(JSONObject resultJson, String key) {
+        boolean isNull = resultJson.isNull(key);
+        //如果为null，返回“”
+        if (isNull) {
+            return "";
+        }
+        try {
+            //不为空返回原来的值
+            return "" + resultJson.get(key);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    String TAG = "WHCHECKBARCODE";
+
+    //Volley请求响应成功
+    private void disposeVolleySuccess(String result) {
+        try {
+            tlMsg.setVisibility(View.VISIBLE);
+            JSONObject resultString = new JSONObject(result);
+            JSONObject dataJson = resultString.getJSONObject("data");
+            Log.e(TAG, "1");
+            String strBarcode = changeNulltoBlank(dataJson, "BAR_CODE");
+            String strProduct = changeNulltoBlank(dataJson, "BAR_PRODCODE");
+            String strDetail = changeNulltoBlank(dataJson, "PR_DETAIL");
+            String strSpec = changeNulltoBlank(dataJson, "PR_SPEC");
+            String strShortname = changeNulltoBlank(dataJson, "VE_SHORTNAME");
+            String strWhcode = changeNulltoBlank(dataJson, "BAR_WHCODE");
+            String strRemain = changeNulltoBlank(dataJson, "BAR_REMAIN");
+            String strLocation = changeNulltoBlank(dataJson, "BAR_LOCATION");
+            String strStatus = changeNulltoBlank(dataJson, "BAR_STATUS");
+            String strType=changeNulltoBlank(dataJson,"PR_ORISPECCODE");
+
+            //显示数据
+            tvBarcode.setText(strBarcode);
+            tvBarProcode.setText(strProduct);
+            tv_type_value.setText(strType);
+            tvPrDetail.setText(strDetail);
+            tvPrSpec.setText(strSpec);
+            tvVeShortname.setText(strShortname);
+            tvBarWhcode.setText(strWhcode);
+            tvBarRemain.setText(strRemain);
+            tvBarLocation.setText(strLocation);
+            if(strStatus.equals("1")){
+                tvStatus.setText("在库");
+            }else if(strStatus.equals("2")){
+                tvStatus.setText("出库");
+            }else{
+               tvStatus.setText(strStatus);
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+    //清空显示区域的信息
+    private void clearAllMsg() {
+        etCollect.setText("");
+        tvBarcode.setText("");
+        tvBarProcode.setText("");
+        tv_type_value.setText("");
+        tvPrDetail.setText("");
+        tvPrSpec.setText("");
+        tvVeShortname.setText("");
+        tvBarWhcode.setText("");
+        tvBarRemain.setText("");
+        tvBarLocation.setText("");
+        tvStatus.setText("");
+    }
+
+    //Volley请求响应失败
+    private void disposeVolleyFailed(String result) {
+        tlMsg.setVisibility(View.GONE);
+        final ConfirmDialog dialog = new ConfirmDialog(getActivity());
+        dialog.show(result, ConfirmDialog.NOTICE);
+        new AsyncTask<String, Void, Float>() {
+            @Override
+            protected Float doInBackground(String... params) {
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Float aFloat) {
+                dialog.dismiss();
+            }
+        }.execute();
+    }
+    /*=============================公用方法==============================================*/
+
+    /**
+     * 显示loadingView
+     */
+    private void showLoadingView() {
+        if (!progressDialog.isShowing()) {
+            progressDialog.show();
+        }
+    }
+
+    /**
+     * 隐藏键盘
+     */
+    private void hideKeyboard(EditText editText) {
+        //获取键盘管理对象
+        InputMethodManager inputManager = (InputMethodManager) editText.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputManager.hideSoftInputFromWindow(editText.getWindowToken(), 0);
+    }
+
+    /**
+     * 获取输入框焦点
+     */
+    private void editTextGetFocus(EditText editText) {
+        editText.setFocusable(true);
+        editText.setFocusableInTouchMode(true);
+        editText.setEnabled(true);
+        editText.setClickable(true);
+        editText.requestFocus();
+    }
+
+    @Override
+    public void onClick(View v) {
+        disposeOnclickEnter();
+    }
+
+    //Volley请求完成响应操作
+    @Override
+    public void onVolleyFinish(int isSuccess, Object result) {
+        Log.e(TAG, "onVolleyFinish" + result.toString());
+        clearAllMsg();
+        switch (isSuccess) {
+            case VolleyUtil.SUCCESS_SUCCESS:
+                disposeVolleySuccess(result.toString());
+                break;
+            case VolleyUtil.FAILED_FAILED:
+                disposeVolleyFailed(result.toString());
+                break;
+        }
+        hideKeyboard(etCollect);
+        progressDialog.dismiss();
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) {
+            if (progressDialog != null && progressDialog.isShowing()) {
+//                loadingView.dismiss();
+//                VolleyUtil.distoryVolley();
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+}

app/src/main/java/com/uas/pda_smart_com/fragment/NewWHCheckMakeMaterialFragment.java

@@ -0,0 +1,409 @@
+package com.uas.pda_smart_com.fragment;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.AsyncTask;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.Window;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.google.gson.reflect.TypeToken;
+import com.uas.pda_smart_com.R;
+import com.uas.pda_smart_com.activity.FunctionActivity;
+import com.uas.pda_smart_com.adapter.WHCheckMakeDetailListAdapter;
+import com.uas.pda_smart_com.adapter.WHCheckMakeMaterialListAdapter;
+import com.uas.pda_smart_com.bean.WHMakeMaterialDetail;
+import com.uas.pda_smart_com.bean.WHMakeMaterialProduct;
+import com.uas.pda_smart_com.global.GloableParams;
+import com.uas.pda_smart_com.tools.DataSourceManager;
+import com.uas.pda_smart_com.tools.GsonUtil;
+import com.uas.pda_smart_com.tools.VolleyUtil;
+import com.uas.pda_smart_com.util.CameraUtil;
+import com.uas.pda_smart_com.util.CommonUtil;
+import com.uas.pda_smart_com.view.ClearableEditText;
+import com.uas.pda_smart_com.view.ConfirmDialog;
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.List;
+
+/**
+ * @note:物料库存核查Fragment
+ */
+public class NewWHCheckMakeMaterialFragment extends BaseFragment implements View.OnClickListener, DataSourceManager.NotifyData,
+//        AdapterView.OnItemClickListener,
+        VolleyUtil.VolleyFinishListener {
+    private static final int SCAN_BARCODE_CODE = 301;
+    ClearableEditText etProdcode, etWhcode;
+    TextView tvPrDetail, tvPrSpec;
+    TextView btnSearch;
+    WHCheckMakeMaterialListAdapter adapter;
+    List<WHMakeMaterialProduct> detailItemList;
+    int requestType = -1;
+    private ListView lvDetail;
+    private ImageView mScanImageView;
+    private int mFocusId;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_whcheck_makematerial_new;
+    }
+
+    @Override
+    protected void initViews() {
+        ((FunctionActivity) mActivity).setScanIvVisible(true);
+        detailItemList = DataSourceManager.getDataSourceManager().getMakeMaterialCheckItemList();
+        detailItemList.clear();
+        //接口回调
+        //VolleyUtil.setVolleyHandler(volleyHandler);
+        VolleyUtil.getVolleyUtil().setOnVolleyFinishListener(this);
+        DataSourceManager.getDataSourceManager().setNotifyData(this);
+        //获取组件
+        //->List
+        lvDetail = (ListView) root.findViewById(R.id.lv_detail_whmm);
+        Log.e("tableList", detailItemList.toString());
+        adapter = new WHCheckMakeMaterialListAdapter(detailItemList, getActivity());
+        lvDetail.setAdapter(adapter);
+        //->采集
+        etProdcode = (ClearableEditText) root.findViewById(R.id.et_prodcode_whmm);
+        etWhcode = (ClearableEditText) root.findViewById(R.id.et_whcode_whmm);
+        btnSearch = (TextView) root.findViewById(R.id.btn_search_whmm);
+        //->信息显示
+        tvPrDetail = (TextView) root.findViewById(R.id.tv_pr_detail);
+        tvPrSpec = (TextView) root.findViewById(R.id.tv_pr_spec);
+
+        mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
+    }
+
+    @Override
+    protected void initEvents() {
+        btnSearch.setOnClickListener(this);
+//        lvDetail.setOnItemClickListener(this);
+        etProdcode.setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
+                    disposeOnClickEnter();
+                    etWhcode.requestFocus();
+                    etWhcode.setSelection(etWhcode.getText().toString().length());
+                    return true;
+                }
+                return false;
+            }
+        });
+        etWhcode.setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
+                    disposeOnClickEnter();
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        mScanImageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void initDatas() {
+        editTextGetFocus(etProdcode);
+        //->Actionbar
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(R.string.title_makematerial_whmm);
+
+    }
+
+    @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.et_prodcode_whmm) {
+                    etProdcode.setText(result);
+                    etProdcode.setSelection(result.length());
+                } else if (mFocusId == R.id.et_whcode_whmm) {
+                    etWhcode.setText(result);
+                    etWhcode.setSelection(result.length());
+                }
+            }
+        }
+    }
+
+    //按钮点击事件
+    private void disposeOnClickEnter() {
+        String strProdcode = etProdcode.getText().toString().trim();
+        String strWhcode = etWhcode.getText().toString().trim();
+        if (strProdcode.equals("") || strProdcode == null) {
+            etProdcode.setWarnIconVisible();
+            return;
+        }
+        //请求详细数据
+        showLoadingView();
+        requestType = VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_CHECK;
+        VolleyUtil.getVolleyUtil().requestMakeMaterialCheck(getActivity(), GloableParams.ADDRESS_WH_PRODUCT, VolleyUtil.METHOD_GET,
+                requestType, strProdcode, strWhcode);
+    }
+
+    @Override
+    public void onDestroy() {
+        //清理数据
+        detailItemList.removeAll(detailItemList);
+        hideKeyboard(etProdcode);
+        VolleyUtil.distoryVolley();
+
+        ((FunctionActivity) mActivity).setScanIvVisible(false);
+        super.onDestroy();
+    }
+
+
+    /*=============================明细PopWin页面============================*/
+
+    /**
+     * @注释:明细popwin页面
+     */
+    PopupWindow detailPopwin;
+
+    private void showDetailPopwin(List dataList) {
+        if (dataList == null || dataList.size() == 0) {
+            showNotice("无明细数据");
+            return;
+        }
+        View contentView = View.inflate(getActivity(), R.layout.popwin_whcheck_detail, null);
+        //获取组件
+        //->List
+        ListView lvDetail = (ListView) contentView.findViewById(R.id.lv_detail);
+        WHCheckMakeDetailListAdapter adapter = new WHCheckMakeDetailListAdapter(getActivity(), dataList);
+        lvDetail.setAdapter(adapter);
+        TextView tv = (TextView) contentView.findViewById(R.id.tv_table_3);
+        //PopupWindow
+        detailPopwin = new PopupWindow(contentView, ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.WRAP_CONTENT);
+        detailPopwin.setBackgroundDrawable(new BitmapDrawable());
+        detailPopwin.setFocusable(true);
+        detailPopwin.setOutsideTouchable(true);
+        View parentView = ((Activity) getActivity()).getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        //当pop菜单超出屏幕时，平移位置
+        detailPopwin.showAtLocation(parentView, Gravity.CENTER, 0, 0);
+    }
+
+    /*=============================公用方法===================================*/
+    /**
+     * @注释:显示错误提示
+     */
+    ConfirmDialog noticeDialog;
+
+    private void showNotice(String noticeMsg) {
+        noticeDialog = new ConfirmDialog(getActivity());
+        noticeDialog.show(noticeMsg, ConfirmDialog.NOTICE);
+
+        new AsyncTask<String, Void, Float>() {
+            @Override
+            protected Float doInBackground(String... params) {
+                try {
+                    //notice显示1.5s
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Float aFloat) {
+                noticeDialog.dismiss();
+            }
+        }.execute();
+    }
+
+    /**
+     * 获取输入框焦点
+     */
+    private void editTextGetFocus(EditText editText) {
+        editText.setFocusable(true);
+        editText.setFocusableInTouchMode(true);
+        editText.setEnabled(true);
+        editText.setClickable(true);
+        editText.requestFocus();
+    }
+
+    /**
+     * 显示loadingView
+     */
+    private void showLoadingView() {
+        if (!progressDialog.isShowing()) {
+            progressDialog.show();
+        }
+    }
+
+    //隐藏键盘
+    InputMethodManager inputManager;
+
+    private void hideKeyboard(final EditText view) {
+        inputManager = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        //获取键盘管理对象
+        inputManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+    }
+
+    String TAG = "WHCheck:";
+
+    /*=============================数据源发生变化===================================*/
+    @Override
+    public void NotifyDataChanged(int noticeType) {
+        //修改信息显示区域的信息
+        String strDetail = detailItemList.get(0).getPR_DETAIL();
+        String strSpec = detailItemList.get(0).getPR_SPEC();
+
+        //信息区域显示
+        tvPrDetail.setText("" + strDetail);
+        tvPrSpec.setText("" + strSpec);
+
+        //table数据源修改
+        adapter.notifyDataSetChanged();
+    }
+
+    /*=========================监听事件===================================*/
+//    @Override
+//    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+//        //获取点击行所对应的detail对象
+//        WHMakeMaterialProduct tmpProd = detailItemList.get(position);
+//        String strPrcode = tmpProd.getBAR_PRODCODE().trim();
+//        String strWhcode = tmpProd.getBAR_WHCODE().trim();
+//        String strLocation = tmpProd.getBAR_LOCATION();
+//        String bar_madedate = tmpProd.getBAR_MADEDATE();
+//
+//        if (strLocation == null || strLocation.equals("null") || strLocation.equals("")) {
+//            strLocation = "null";
+//        }
+//        //请求服务器获取明细
+//        JSONObject paramJson = new JSONObject();
+//        try {
+//            paramJson.put("pr_code", strPrcode);
+//            paramJson.put("wh_code", strWhcode);
+//            paramJson.put("bar_location", strLocation);
+//            paramJson.put("bar_madedate", bar_madedate);
+//
+//        } catch (JSONException e) {
+//            e.printStackTrace();
+//        }
+//        Log.e("WHCheck", "!!!" + paramJson.toString());
+//        requestType = VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_DETAIL;
+//        VolleyUtil.getVolleyUtil().requestMakeMaterialDetail(getActivity(), GloableParams.ADDRESS_WH_DETAIL, VolleyUtil.METHOD_GET,
+//                requestType, strPrcode, strWhcode, strLocation);
+//    }
+
+    @Override
+    public void onClick(View v) {
+        disposeOnClickEnter();
+    }
+
+    @Override
+    public void onVolleyFinish(int isSuccess, Object result) {
+        switch (isSuccess) {
+            case VolleyUtil.SUCCESS_SUCCESS:
+                disposeVolleySuccess(result);
+                break;
+            case VolleyUtil.FAILED_FAILED:
+                disposeVolleyFailed(result);
+                break;
+        }
+        progressDialog.dismiss();
+    }
+
+    //Volley失败
+    private void disposeVolleyFailed(Object result) {
+        showNotice(result.toString());
+    }
+
+    //Volley成功
+    private void disposeVolleySuccess(Object result) {
+        String str = (String) result;
+        switch (requestType) {
+            //物料库存核查：Check数据
+            case VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_CHECK:
+                break;
+            //物料库存核查：明细数据
+            case VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_DETAIL:
+                Log.e("WHCHECK:make", "" + result.toString());
+                //显示明细数据弹框
+                //disposeVolleyDetail(result);
+                showDetailPopwin(disposeVolleyDetail(result));
+                break;
+        }
+    }
+
+    //Volley明细数据->list
+    private List disposeVolleyDetail(Object result) {
+        List<WHMakeMaterialDetail> list = null;
+        String strResult = (String) result;
+        try {
+            JSONObject resultJson = new JSONObject(strResult);
+            JSONArray targetJsonArray = resultJson.getJSONArray("target");
+            list = GsonUtil.changeGsonToList(targetJsonArray.toString(),
+                    new TypeToken<List<WHMakeMaterialDetail>>() {
+                    }.getType());
+            Log.e(TAG, "detaillist:" + list.toString());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) {
+            if (progressDialog != null && progressDialog.isShowing()) {
+//                loadingView.dismiss();
+//                VolleyUtil.distoryVolley();
+                return true;
+            }
+            if (detailPopwin != null && detailPopwin.isShowing()) {
+                detailPopwin.dismiss();
+                return true;
+            }
+            if (noticeDialog != null && noticeDialog.isShowing()) {
+                noticeDialog.dismiss();
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

app/src/main/java/com/uas/pda_smart_com/fragment/StockDataSummaryFragment.java

@@ -1,7 +1,11 @@
 package com.uas.pda_smart_com.fragment;
 
+import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.RequiresApi;
+import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.TextView;
@@ -14,14 +18,18 @@ import com.bin.david.form.core.SmartTable;
 import com.bin.david.form.data.column.Column;
 import com.bin.david.form.data.format.IFormat;
 import com.bin.david.form.data.table.TableData;
+import com.bin.david.form.listener.OnColumnItemClickListener;
 import com.uas.pda_smart_com.R;
 import com.uas.pda_smart_com.bean.StockTaskMultipleBean;
 import com.uas.pda_smart_com.global.GloableParams;
+import com.uas.pda_smart_com.tools.SharedPreUtil;
 import com.uas.pda_smart_com.util.CommonUtil;
 import com.uas.pda_smart_com.util.FastjsonUtil;
 import com.uas.pda_smart_com.util.HttpCallback;
 import com.uas.pda_smart_com.util.HttpParams;
+import com.uas.pda_smart_com.util.StringUtil;
 import com.uas.pda_smart_com.util.VolleyRequest;
+import com.uas.pda_smart_com.view.TakePhotoPopWin;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,7 +38,7 @@ import java.util.List;
  * Created by RaoMeng on 2021/4/22
  * Desc: 备料数据汇总
  */
-public class StockDataSummaryFragment extends BaseFragment {
+public class StockDataSummaryFragment extends BaseFragment implements OnColumnItemClickListener<String> {
     private SmartTable mSmartTable;
     private Column<String> mProdcodeColumn, mOutqtyColumn,mTypeColumn;
     private Column<Double> mPdaqtyColumn, mDetailColumn;
@@ -79,6 +87,7 @@ public class StockDataSummaryFragment extends BaseFragment {
 
     @Override
     protected void initEvents() {
+        mProdcodeColumn.setOnColumnItemClickListener(this::onClick);
         mCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -166,4 +175,35 @@ public class StockDataSummaryFragment extends BaseFragment {
     public boolean onFragmentBackPressed() {
         return false;
     }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    @Override
+    public void onClick(Column<String> column, String s, String s2, int position) {
+        String pd_prodcode = mStockTaskMultipleBeans.get(position).getPD_PRODCODE();
+//        CommonUtil.toastNoRepeat(getContext(),pd_prodcode+"");
+        if (StringUtil.isEmpty(pd_prodcode)){
+            CommonUtil.toastNoRepeat(getContext(),"物料编号为空");
+            SharedPreUtil.saveString(getContext(),"pd_prodcode_pop","null");
+            return;
+        }
+
+        SharedPreUtil.saveString(getContext(),"pd_prodcode_pop",pd_prodcode);
+        TakePhotoPopWin takePhotoPopWin = new TakePhotoPopWin(getContext(), onClickListener);
+        //showAtLocation(View parent, int gravity, int x, int y)
+        takePhotoPopWin.showAtLocation(root.findViewById(R.id.stock_data_summary_num_tv), Gravity.CENTER, 0, 0);
+
+    }
+    private View.OnClickListener onClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            switch (v.getId()) {
+//                case R.id.btn_take_photo:
+//                    System.out.println("btn_take_photo");
+//                    break;
+//                case R.id.btn_pick_photo:
+//                    System.out.println("btn_pick_photo");
+//                    break;
+            }
+        }
+    };
 }

app/src/main/java/com/uas/pda_smart_com/fragment/WHCheckContentFragment.java

@@ -60,7 +60,8 @@ public class WHCheckContentFragment extends BaseFragment implements AdapterView.
         switch (selected){
             //物料库存核查
             case GloableParams.LISTNAME_WH_CHECKCONTENT_MAKEMATERIAL:
-                fragment = new WHCheckMakeMaterialFragment();
+//                fragment = new WHCheckMakeMaterialFragment();
+                fragment = new NewWHCheckMakeMaterialFragment();
                 getFragmentManager().beginTransaction().addToBackStack(null)
                         .replace(R.id.container_function_fragment,fragment).commit();
                 break;

app/src/main/java/com/uas/pda_smart_com/util/PrintUtils.java

@@ -69,7 +69,7 @@ public class PrintUtils {
 //                                            .setTextAutLine("0","0",100,fontSize,false,false,printText)
                                             .setX(printX)
                                             .setY(printY + (int) ((0.6 * dpi) / 25.4))
-                                            .setBold(2)
+//                                            .setBold(2)
                                             .setTextFont(textFont)
                                             .setTextSize(fontSize)
                                             .build();

app/src/main/java/com/uas/pda_smart_com/view/TakePhotoPopWin.java

@@ -0,0 +1,128 @@
+package com.uas.pda_smart_com.view;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.uas.pda_smart_com.R;
+import com.uas.pda_smart_com.adapter.PopWinWHCheckMakeMaterialListAdapter;
+import com.uas.pda_smart_com.bean.WHMakeMaterialProduct;
+import com.uas.pda_smart_com.global.GloableParams;
+import com.uas.pda_smart_com.tools.DataSourceManager;
+import com.uas.pda_smart_com.tools.SharedPreUtil;
+import com.uas.pda_smart_com.tools.VolleyUtil;
+
+import java.util.List;
+
+public class TakePhotoPopWin extends PopupWindow implements DataSourceManager.NotifyData,
+        VolleyUtil.VolleyFinishListener{
+
+    private View view;
+    private final ImageView btn_cancel;
+    private final TextView tv_pd_prodcode;
+    int requestType = -1;
+    PopWinWHCheckMakeMaterialListAdapter adapter;
+    List<WHMakeMaterialProduct> detailItemList;
+    private ListView lvDetail;
+    private final TextView tvPrDetail;
+    private final TextView tvPrSpec;
+
+    @SuppressLint("SetJavaScriptEnabled")
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public TakePhotoPopWin(Context mContext, View.OnClickListener itemsOnClick) {
+        this.view = LayoutInflater.from(mContext).inflate(R.layout.take_photo_pop, null);
+        btn_cancel = (ImageView) view.findViewById(R.id.btn_cancel);
+        tv_pd_prodcode = view.findViewById(R.id.tv_pd_prodcode);
+        // 设置外部可点击
+        this.setOutsideTouchable(true);
+        // mMenuView添加OnTouchListener监听判断获取触屏位置如果在选择框外面则销毁弹出框
+        this.view.setOnTouchListener(new View.OnTouchListener() {
+
+            public boolean onTouch(View v, MotionEvent event) {
+
+                int height = view.findViewById(R.id.pop_layout).getTop();
+
+                int y = (int) event.getY();
+                if (event.getAction() == MotionEvent.ACTION_UP) {
+                    if (y < height) {
+                        dismiss();
+                    }
+                }
+                return true;
+            }
+        });
+
+
+        /* 设置弹出窗口特征 */
+        // 设置视图
+        this.setContentView(this.view);
+        // 设置弹出窗体的宽和高
+        this.setHeight(RelativeLayout.LayoutParams.MATCH_PARENT);
+        this.setWidth(RelativeLayout.LayoutParams.MATCH_PARENT);
+
+        // 设置弹出窗体可点击
+        this.setFocusable(true);
+
+        // 实例化一个ColorDrawable颜色为半透明
+        ColorDrawable dw = new ColorDrawable(0xb0000000);
+        // 设置弹出窗体的背景
+        this.setBackgroundDrawable(dw);
+
+        // 设置弹出窗体显示时的动画，从底部向上弹出
+        this.setAnimationStyle(R.style.take_photo_anim);
+        // 取消按钮
+        btn_cancel.setOnClickListener(new View.OnClickListener() {
+
+            public void onClick(View v) {
+                // 销毁弹出框
+                dismiss();
+            }
+        });
+        lvDetail = (ListView) view.findViewById(R.id.lv_detail_whmm);
+        tvPrDetail = (TextView) view.findViewById(R.id.tv_pr_detail);
+        tvPrSpec = (TextView) view.findViewById(R.id.tv_pr_spec);
+        VolleyUtil.getVolleyUtil().setOnVolleyFinishListener(this);
+        DataSourceManager.getDataSourceManager().setNotifyData(this);
+        detailItemList = DataSourceManager.getDataSourceManager().getMakeMaterialCheckItemList();
+        adapter = new PopWinWHCheckMakeMaterialListAdapter(detailItemList, mContext);
+        lvDetail.setAdapter(adapter);
+
+        String pd_prodcode_pop = SharedPreUtil.getString(mContext, "pd_prodcode_pop", null);
+        tv_pd_prodcode.setText(pd_prodcode_pop);
+
+        //请求详细数据
+        requestType = VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_CHECK;
+        VolleyUtil.getVolleyUtil().requestMakeMaterialCheck(mContext, GloableParams.ADDRESS_WH_PRODUCT, VolleyUtil.METHOD_GET,
+                requestType, pd_prodcode_pop, "");
+    }
+
+
+    @Override
+    public void NotifyDataChanged(int noticeType) {
+        //修改信息显示区域的信息
+        String strDetail = detailItemList.get(0).getPR_DETAIL();
+        String strSpec = detailItemList.get(0).getPR_SPEC();
+
+        //信息区域显示
+        tvPrDetail.setText("" + strDetail);
+        tvPrSpec.setText("" + strSpec);
+        //table数据源修改
+        adapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public void onVolleyFinish(int isSuccess, Object result) {
+
+    }
+}
+

app/src/main/res/anim/pop_enter_anim.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <translate
+        android:duration="200"
+        android:fromYDelta="100%p"
+        android:toYDelta="0" />
+    <alpha
+        android:duration="200"
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0" />
+</set>

app/src/main/res/anim/pop_exit_anim.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="200"
+        android:fromYDelta="0"
+        android:toYDelta="50%p" />
+    <alpha
+        android:duration="200"
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0" />
+</set>

app/src/main/res/drawable/sugarbaground.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ffff" />
+    <corners android:topRightRadius="20dp"
+        android:topLeftRadius="20dp"  />
+</shape>

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

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--条码校验-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:background="@color/white"
+    android:layout_centerHorizontal="true"
+    android:gravity="center_horizontal"
+    android:layout_height="match_parent">
+    <!--上部：搜索-->
+    <include layout="@layout/include_search"/>
+    <!--下部：信息展示-->
+    <TableLayout
+        android:id="@+id/tl_msg"
+        android:layout_marginTop="@dimen/space_top_8"
+        android:layout_width="wrap_content"
+        style="@style/CardWhiteStyle_wrapheight">
+        <!--条码号-->
+        <TableRow>
+            <TextView
+                style="@style/Table_li_left"
+                android:text="@string/text_whcheck_bar_code"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:id="@+id/tv_bar_code"
+                style="@style/Table_li_right"
+                android:textColor="@color/text_search"/>
+        </TableRow>
+        <!--料号-->
+        <TableRow>
+            <TextView
+                style="@style/Table_li_left"
+                android:text="@string/text_whcheck_bar_procode"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:id="@+id/tv_bar_procode"
+                style="@style/Table_li_right"
+                android:textColor="@color/text_search"/>
+        </TableRow>
+        <!--型号-->
+        <TableRow>
+            <TextView
+                style="@style/Table_li_left"
+                android:text="型号"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:id="@+id/tv_type_value"
+                style="@style/Table_li_right"
+                android:textColor="@color/text_search"/>
+        </TableRow>
+        <!--名称-->
+        <TableRow>
+            <TextView
+                style="@style/Table_li_left"
+                android:text="@string/text_whcheck_pr_detail"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:id="@+id/tv_pr_detail"
+                style="@style/Table_li_right"
+                android:textColor="@color/text_search"/>
+        </TableRow>
+        <!--规格-->
+        <TableRow>
+            <TextView
+                style="@style/Table_li_left"
+                android:text="@string/text_whcheck_pr_spec"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:id="@+id/tv_pr_spec"
+                style="@style/Table_li_right"
+                android:textColor="@color/text_search"/>
+        </TableRow>
+        <!--供应商-->
+        <TableRow>
+            <TextView
+                style="@style/Table_li_left"
+                android:text="@string/text_whcheck_ve_shortname"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:id="@+id/tv_pr_ve_shortname"
+                style="@style/Table_li_right"
+                android:textColor="@color/text_search"/>
+        </TableRow>
+        <!--仓库-->
+        <TableRow>
+            <TextView
+                style="@style/Table_li_left"
+                android:text="@string/text_whcheck_bar_whcode"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:id="@+id/tv_bar_whcode"
+                style="@style/Table_li_right"
+                android:textColor="@color/text_search"/>
+        </TableRow>
+        <!--数量-->
+        <TableRow>
+            <TextView
+                style="@style/Table_li_left"
+                android:text="@string/text_whcheck_bar_remain"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:id="@+id/tv_bar_remain"
+                style="@style/Table_li_right"
+                android:textColor="@color/text_search"/>
+        </TableRow>
+        <!--储位-->
+        <TableRow>
+            <TextView
+                style="@style/Table_li_left"
+                android:text="@string/text_whcheck_bar_location"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:id="@+id/tv_bar_location"
+                style="@style/Table_li_right"
+                android:textColor="@color/text_search"/>
+        </TableRow>
+        <!--条码状态-->
+        <TableRow>
+            <TextView
+                style="@style/Table_li_left"
+                android:text="条码状态"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:id="@+id/tv_bar_status"
+                style="@style/Table_li_right"
+                android:textColor="@color/text_search"/>
+        </TableRow>
+    </TableLayout>
+</LinearLayout>

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

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--仓库管理：物料库存核查-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <!--搜索-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/space_top_8"
+        android:layout_marginLeft="@dimen/space_left_8"
+        android:layout_marginRight="@dimen/space_right_8">
+        <com.uas.pda_smart_com.view.ClearableEditText
+            android:id="@+id/et_prodcode_whmm"
+            android:hint="物料编号"
+            style="@style/PopWinEditTextStyle"
+            android:layout_weight="2"/>
+        <com.uas.pda_smart_com.view.ClearableEditText
+            android:id="@+id/et_whcode_whmm"
+            android:layout_marginLeft="@dimen/space_left_8"
+            android:layout_marginRight="@dimen/space_right_8"
+            style="@style/PopWinEditTextStyle"
+            android:hint="仓位"
+            android:layout_weight="3"/>
+        <TextView
+            android:id="@+id/btn_search_whmm"
+            style="@style/PopWinButtonStyle"
+            android:layout_weight="4"
+            android:background="@drawable/search_16"/>
+    </LinearLayout>
+    <!--中部-->
+    <TableLayout
+        android:layout_marginTop="@dimen/space_top_8"
+        style="@style/CardWhiteStyle_wrapheight">
+
+        <TableRow>
+            <TextView
+                style="@style/CardContentTextStyle"
+                android:text="@string/text_fragment_whcheck_pr_detail"/>
+            <TextView
+                android:id="@+id/tv_pr_detail"
+                style="@style/CardContentTextStyle"
+                android:textColor="@color/text_search"/>
+        </TableRow>
+        <TableRow>
+            <TextView
+                style="@style/CardContentTextStyle"
+                android:text="@string/text_fragment_whcheck_pr_spec" />
+            <TextView
+                android:id="@+id/tv_pr_spec"
+                style="@style/CardContentTextStyle"
+                android:textColor="@color/text_search" />
+        </TableRow>
+    </TableLayout>
+
+    <LinearLayout
+        style="@style/CardWhiteSytle_fillheight"
+        android:background="@color/white">
+        <include layout="@layout/item_list_table"/>
+        <!--信息列表-->
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true"
+            android:background="@color/transparent">
+            <ListView
+                android:id="@+id/lv_detail_whmm"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/transparent"/>
+        </ScrollView>
+    </LinearLayout>
+</LinearLayout>

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

@@ -42,4 +42,17 @@
         android:layout_width="0.5px"
         android:layout_height="fill_parent"
         android:background="#B8B8B8" />
+    <TextView
+        android:id="@+id/tv_table_4"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="3dp"
+        android:layout_marginLeft="@dimen/space_left_inner"
+        android:layout_marginRight="@dimen/space_right_inner"
+        android:layout_weight="1"
+        android:textStyle="bold"
+        android:gravity="center_vertical"
+        android:textSize="@dimen/space_top_line_15"
+        android:text="DC" />
 </LinearLayout>

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

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?><!--表格ListItem：三列-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/button_normal"
+    android:orientation="horizontal">
+
+    <View
+        android:layout_width="0.5px"
+        android:layout_height="fill_parent"
+        android:background="#B8B8B8" />
+    <!--第一列-->
+    <TextView
+        android:id="@+id/tv_table_1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="3dp"
+        android:layout_marginLeft="@dimen/space_left_inner"
+        android:layout_marginRight="@dimen/space_right_inner"
+        android:layout_weight="1"
+        android:textStyle="bold"
+        android:gravity="center_vertical"
+        android:textSize="@dimen/space_top_line_15"
+        android:text="仓库" />
+
+
+    <View
+        android:layout_width="0.5px"
+        android:layout_height="fill_parent"
+        android:background="#B8B8B8" />
+    <!--第二列-->
+    <TextView
+        android:id="@+id/tv_table_2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="3dp"
+        android:layout_marginLeft="@dimen/space_left_inner"
+        android:layout_marginRight="@dimen/space_right_inner"
+        android:layout_weight="1"
+        android:textStyle="bold"
+        android:gravity="center_vertical"
+        android:textSize="@dimen/space_top_line_15"
+        android:text="储位" />
+
+    <View
+        android:layout_width="0.5px"
+        android:layout_height="fill_parent"
+        android:background="#B8B8B8" />
+    <!--第三列-->
+    <TextView
+        android:id="@+id/tv_table_3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="3dp"
+        android:layout_marginLeft="@dimen/space_left_inner"
+        android:layout_marginRight="@dimen/space_right_inner"
+        android:layout_weight="1"
+        android:textStyle="bold"
+        android:gravity="center_vertical"
+        android:textSize="@dimen/space_top_line_15"
+        android:text="数量" />
+
+    <View
+        android:layout_width="0.5px"
+        android:layout_height="fill_parent"
+        android:background="#B8B8B8" />
+    <TextView
+        android:id="@+id/tv_table_4"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="3dp"
+        android:layout_marginLeft="@dimen/space_left_inner"
+        android:layout_marginRight="@dimen/space_right_inner"
+        android:layout_weight="1"
+        android:textStyle="bold"
+        android:gravity="center_vertical"
+        android:textSize="@dimen/space_top_line_15"
+        android:text="DC" />
+
+
+</LinearLayout>

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

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:gravity="center_horizontal"
+    android:layout_height="wrap_content">
+    <LinearLayout
+        android:layout_marginTop="100dp"
+        android:id="@+id/pop_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/sugarbaground"
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <ImageView
+                android:layout_marginLeft="@dimen/space_top_line_15"
+                android:layout_marginTop="@dimen/space_top_line_15"
+                android:id="@+id/btn_cancel"
+                android:layout_width="21dp"
+                android:layout_height="21dp"
+                android:src="@mipmap/delete_popup">
+            </ImageView>
+            <TextView
+                android:textColor="#ff333333"
+                android:id="@+id/text_title"
+                android:layout_marginTop="@dimen/space_top_line_15"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center"
+                android:textSize="@dimen/textsize_16"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </TextView>
+        </RelativeLayout>
+        <TableLayout
+            android:layout_marginTop="@dimen/space_top_8"
+            style="@style/CardWhiteStyle_wrapheight">
+            <TableRow>
+                <TextView
+                    style="@style/CardContentTextStylepopu"
+                    android:textSize="@dimen/textsize_12"
+                    android:text="@string/text_fragment_whcheck_pd_prodcode"/>
+                <TextView
+                    android:id="@+id/tv_pd_prodcode"
+                    style="@style/CardContentTextStylepopu"
+                    android:textSize="@dimen/textsize_12"
+                    android:textColor="@color/text_search"/>
+            </TableRow>
+            <TableRow>
+                <TextView
+                    style="@style/CardContentTextStylepopu"
+                    android:textSize="@dimen/textsize_12"
+                    android:text="@string/text_fragment_whcheck_pr_detail"/>
+                <TextView
+                    android:id="@+id/tv_pr_detail"
+                    android:textSize="@dimen/textsize_12"
+                    style="@style/CardContentTextStylepopu"
+                    android:textColor="@color/text_search"/>
+            </TableRow>
+            <TableRow>
+                <TextView
+                    style="@style/CardContentTextStylepopu"
+                    android:textSize="@dimen/textsize_12"
+                    android:text="@string/text_fragment_whcheck_pr_spec" />
+                <TextView
+                    android:id="@+id/tv_pr_spec"
+                    style="@style/CardContentTextStylepopu"
+                    android:textSize="@dimen/textsize_12"
+                    android:textColor="@color/text_search" />
+            </TableRow>
+        </TableLayout>
+        <LinearLayout
+            style="@style/CardWhiteSytle_fillheight"
+            android:background="@color/white">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/button_normal"
+                android:orientation="horizontal">
+                <View
+                android:layout_width="0.5px"
+                android:layout_height="fill_parent"
+                android:background="#B8B8B8" />
+                <!--第一列-->
+                <TextView
+                    android:id="@+id/tv_table_1"
+                    style="@style/CardContentTextStyle"
+                    android:layout_weight="1"
+                    android:text="仓库"
+                    android:textSize="@dimen/space_top_line_15"/>
+
+                <View
+                    android:layout_width="0.5px"
+                    android:layout_height="fill_parent"
+                    android:background="#B8B8B8" />
+                <!--第二列-->
+                <TextView
+                    android:id="@+id/tv_table_2"
+                    style="@style/CardContentTextStyle"
+                    android:layout_weight="1"
+                    android:text="储位"
+                    android:textSize="@dimen/space_top_line_15"/>
+
+                <View
+                    android:layout_width="0.5px"
+                    android:layout_height="fill_parent"
+                    android:background="#B8B8B8" />
+                <!--第三列-->
+                <TextView
+                    android:id="@+id/tv_table_3"
+                    style="@style/CardContentTextStyle"
+                    android:layout_weight="1"
+                    android:text="数量"
+                    android:textSize="@dimen/space_top_line_15"/>
+
+                <View
+                    android:layout_width="0.5px"
+                    android:layout_height="fill_parent"
+                    android:background="#B8B8B8" />
+                <TextView
+                    android:id="@+id/tv_table_4"
+                    style="@style/CardContentTextStyle"
+                    android:layout_weight="1"
+                    android:text="DC"
+                    android:textSize="@dimen/space_top_line_15"/>
+
+            </LinearLayout>
+
+
+
+
+            <!--信息列表-->
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true"
+                android:background="@color/transparent">
+                <ListView
+                    android:id="@+id/lv_detail_whmm"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/transparent"/>
+            </ScrollView>
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+
+
+
+</RelativeLayout>

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

@@ -1,12 +1,12 @@
 <resources>
-    <string name="my_app_name">UAS智能终端系统</string>
+    <string name="my_app_name">仓库-UAS智能终端系统</string>
     <string name="my_app_name_test">PDA-仓库通用</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
     <string name="title_activity_connect_server_fragment">ConnectServerFragment</string>
 
     <string name="btn_search">搜索</string>
-
+    <string name="text_fragment_whcheck_pd_prodcode">物料编号</string>
     <!--View empty-->
     <string name="empty_message">暂无记录</string>
     <string name="loading_message">请等待！</string>

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

@@ -782,5 +782,17 @@
         <!--        <item name="android:singleLine">true</item>-->
         <item name="android:imeOptions">flagNoExtractUi</item>
     </style>
+    <style name="take_photo_anim" parent="android:Animation">
+        <item name="android:windowEnterAnimation">@anim/pop_enter_anim</item>
+        <item name="android:windowExitAnimation">@anim/pop_exit_anim</item>
+    </style>
+
 
+
+    <style name="CardContentTextStylepopu" parent="PopWinContentTextStyle"><!--gravity:right-->
+        <item name="android:layout_marginTop">3dp</item>
+        <item name="android:layout_marginBottom">3dp</item>
+        <item name="android:layout_marginLeft">@dimen/space_left_inner</item>
+        <item name="android:layout_marginRight">@dimen/space_right_inner</item>
+    </style>
 </resources>