备料数据汇总增加物料库存核查，点击物料编号弹出

app/src/main/AndroidManifest.xml

@@ -22,7 +22,7 @@
         android:name="com.uas.uas_mes_standard.application.PdaApplication"
         android:allowBackup="true"
         android:icon="@mipmap/icon"
-        android:label="@string/my_app_name_test"
+        android:label="@string/my_app_name"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="icon,label,theme">

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

@@ -0,0 +1,59 @@
+package com.uas.uas_mes_standard.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.uas_mes_standard.R;
+import com.uas.uas_mes_standard.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/uas_mes_standard/fragment/BarcodeInfoCollectFragment.java

@@ -160,15 +160,6 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
 
             }
         });
-//        mBarcodeEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-//            @Override
-//            public void onFocusChange(View v, boolean hasFocus) {
-//                if (!hasFocus && !TextUtils.isEmpty(mBarcodeEditText.getText().toString().trim())
-//                        && isVisible() && !mIgnoreFocusChange) {
-//                    getBarAcceptCode(mBarcodeEditText.getText().toString().trim());
-//                }
-//            }
-//        });
 
         mBarcodeEditText.addTextChangedListener(new TextWatcher() {
             @Override
@@ -196,52 +187,8 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
         mConfirmButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String barcode = mBarcodeEditText.getText().toString();
-                String lotno = mLotEditText.getText().toString().trim();
-                String date = mDateEditText.getText().toString().trim();
-                String warehouse = mLocationEditText.getText().toString().trim();
-                if (TextUtils.isEmpty(barcode)) {
-                    CommonUtil.toastNoRepeat(mActivity, "请采集条码");
-                    mBarcodeEditText.requestFocus();
-                    return;
-                }
-                if (cellect_check.isChecked()==true&&lotno.isEmpty()){
-                    CommonUtil.toastNoRepeat(mActivity, "请输入LotNo");
-                    return;
-                }
-                if (datecode_check.isChecked()==true&&date.isEmpty()){
-                    CommonUtil.toastNoRepeat(mActivity, "请输入DateCode");
-                    return;
-                }
-                if (location_check.isChecked()==true&&warehouse.isEmpty()){
-                    CommonUtil.toastNoRepeat(mActivity, "请输入仓位");
-                    return;
-                }
-
-                    if(jsonObject!=null){
-                        try {
-                            if (TextUtils.isEmpty(lotno)) {
-                                jsonObject.put("LOTNO","");
-                            }else {
-                                jsonObject.put("LOTNO",lotno);
-                            }
-                            if (TextUtils.isEmpty(date)) {
-                                jsonObject.put("DC","");
-                            }else {
-                                jsonObject.put("DC",date);
-                            }
-
-                            jsonObject.put("LC",warehouse);
-
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-
-                    }
-
-
-                    saveBarAcceptCode(lotno, date, barcode);
 
+                setBindingData();
             }
         });
 
@@ -276,24 +223,71 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
             material_in_collect_old_et.requestFocus();
             return;
         }
-        if (mLotEditTexttrim.isEmpty()){
+        if (cellect_check.isChecked()==true&&mLotEditTexttrim.isEmpty()){
             mLotEditText.requestFocus();
             return;
         }
-        if (mDateEditTexttrim.isEmpty()){
+        if (datecode_check.isChecked()==true&&mDateEditTexttrim.isEmpty()){
             mDateEditText.requestFocus();
             return;
         }
 
-        if (mLocationEditTexttrim.isEmpty()){
+        if (location_check.isChecked()==true&&mLocationEditTexttrim.isEmpty()){
             mLocationEditText.requestFocus();
             return;
         }
+        setBindingData();
+    }
+    //确定
+    public void setBindingData(){
+        String barcode = mBarcodeEditText.getText().toString();
+        String lotno = mLotEditText.getText().toString().trim();
+        String date = mDateEditText.getText().toString().trim();
+        String warehouse = mLocationEditText.getText().toString().trim();
+        if (TextUtils.isEmpty(barcode)) {
+            CommonUtil.toastNoRepeat(mActivity, "请采集条码");
+            mBarcodeEditText.requestFocus();
+            return;
+        }
+        if (cellect_check.isChecked()==true&&lotno.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入LotNo");
+            return;
+        }
+        if (datecode_check.isChecked()==true&&date.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入DateCode");
+            return;
+        }
+        if (location_check.isChecked()==true&&warehouse.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入仓位");
+            return;
+        }
+
+        if(jsonObject!=null){
+            try {
+                if (TextUtils.isEmpty(lotno)) {
+                    jsonObject.put("LOTNO","");
+                }else {
+                    jsonObject.put("LOTNO",lotno);
+                }
+                if (TextUtils.isEmpty(date)) {
+                    jsonObject.put("DC","");
+                }else {
+                    jsonObject.put("DC",date);
+                }
 
+                jsonObject.put("LC",warehouse);
 
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
 
+        }
 
+//        CommonUtil.toastNoRepeat(mActivity, "确定");
+        saveBarAcceptCode(lotno, date, barcode);
     }
+
+
     //料号回车
     public void collectischeckData(){
         String mBarcodeEditTexttrim = mBarcodeEditText.getText().toString().trim();//条码号

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

@@ -1,7 +1,11 @@
 package com.uas.uas_mes_standard.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.uas_mes_standard.R;
 import com.uas.uas_mes_standard.bean.StockTaskMultipleBean;
 import com.uas.uas_mes_standard.global.GloableParams;
+import com.uas.uas_mes_standard.tools.SharedPreUtil;
 import com.uas.uas_mes_standard.util.CommonUtil;
 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.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;
@@ -75,6 +83,10 @@ public class StockDataSummaryFragment extends BaseFragment {
                 return CommonUtil.doubleFormat(aDouble);
             }
         });
+
+
+
+
     }
 
     @Override
@@ -95,6 +107,9 @@ public class StockDataSummaryFragment extends BaseFragment {
         setTableData(mStockTaskMultipleBeans);
 
         getDataList();
+//        mTypeColumn.setOnColumnItemClickListener(this);
+        mProdcodeColumn.setOnColumnItemClickListener(this);
+//        mOutqtyColumn.setOnColumnItemClickListener(this);
     }
 
     private void setTableData(List<StockTaskMultipleBean> filterTableData) {
@@ -166,4 +181,38 @@ public class StockDataSummaryFragment extends BaseFragment {
     public boolean onFragmentBackPressed() {
         return false;
     }
+
+
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    @Override
+    public void onClick(Column<String> column, String value, String s, 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/uas_mes_standard/view/TakePhotoPopWin.java

@@ -0,0 +1,128 @@
+package com.uas.uas_mes_standard.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.uas_mes_standard.R;
+import com.uas.uas_mes_standard.adapter.PopWinWHCheckMakeMaterialListAdapter;
+import com.uas.uas_mes_standard.bean.WHMakeMaterialProduct;
+import com.uas.uas_mes_standard.global.GloableParams;
+import com.uas.uas_mes_standard.tools.DataSourceManager;
+import com.uas.uas_mes_standard.tools.SharedPreUtil;
+import com.uas.uas_mes_standard.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/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

@@ -196,6 +196,8 @@
     <!--物料库存核查-->
     <string name="title_makematerial_whmm">物料库存核查</string>
     <string name="text_fragment_whcheck_pr_detail">名称</string>
+    <string name="text_fragment_whcheck_pd_prodcode">物料编号</string>
+
     <string name="text_fragment_whcheck_pr_spec">规格</string>
     <string name="text_table_whcheck_detail_bar_code">条码</string>
     <string name="text_table_whcheck_detail_bar_remain">数量</string>

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

@@ -508,6 +508,13 @@
         <item name="android:layout_marginRight">@dimen/space_right_inner</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>
+
     <style name="Table_li_right" parent="CardContentTextStyle">
         <item name="android:gravity">left|center</item>
         <item name="android:paddingLeft">@dimen/space_left_8</item>
@@ -783,8 +790,10 @@
         <item name="android:textColor">@color/black</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>
 
 
 

build.gradle

@@ -43,8 +43,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 12,
-            versionName      : "v1.2"
+            versionCode      : 13,
+            versionName      : "v1.3"
     ]
 
     depsVersion = [