新创建项目，更改包名配置，修改post请求方式，增加显示

app/src/main/java/com/uas/zdxw_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/zdxw_smart_com/bean/StockTaskMultipleBean.java

@@ -33,8 +33,17 @@ public class StockTaskMultipleBean {
     private int BA_HASBARCODE;
     private double BAR_REMAIN;
     private String DC;
+    private String QTY;
     private List<NOSBean> NOS;
 
+    public void setQTY(String QTY) {
+        this.QTY = QTY;
+    }
+
+    public String getQTY() {
+        return QTY;
+    }
+
     public String getPR_ORISPECCODE() {
         return PR_ORISPECCODE;
     }

app/src/main/java/com/uas/zdxw_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/zdxw_smart_com/fragment/IOCOutMakeMaterialOper.java

@@ -782,7 +782,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         etBarCode.setText(null);
         PdaApplication.mRequestQueue.cancelAll(TAG);
         mCollectTypeRadioGroup.setEnabled(false);
-        jsonRequest = new JsonObjectRequest(Request.Method.GET, url, null, new Response.Listener<JSONObject>() {
+        jsonRequest = new JsonObjectRequest(Request.Method.POST, url, null, new Response.Listener<JSONObject>() {
             @Override
             public void onResponse(JSONObject jsonObject) {
                 progressDialog.dismiss();
@@ -2189,9 +2189,11 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         currentBarcode = etBarCode.getText().toString().trim();
         if (TextUtils.isEmpty(currentBarcode)) {
             CommonUtil.toastNoRepeat(getActivity(), "请输入号码");
-        } else if (!currentBarcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-        } else {
+        }
+//        else if (!currentBarcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+//        }
+        else {
             if (mCollectModel == 1) {
                 if (CommonUtil.isNetWorkConnected(getActivity())) {
                     barcodeEnterEvent(false, true);

app/src/main/java/com/uas/zdxw_smart_com/fragment/MaterialOutRevocationStockFragment.java

@@ -181,9 +181,11 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
         String currentText = mBarcodeEditText.getText().toString().trim();
         if (TextUtils.isEmpty(currentText)) {
             CommonUtil.toastNoRepeat(getActivity(), "请输入号码");
-        } else if (!currentText.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-        } else {
+        }
+//        else if (!currentText.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+//        }
+        else {
             if (CommonUtil.isNetWorkConnected(getActivity())) {
                 revokeStock();
             } else {
@@ -245,7 +247,7 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
 
         PdaApplication.mRequestQueue.cancelAll(TAG + "revoke");
 
-        mJsonRequest = new JsonObjectRequest(Request.Method.GET, url, null,
+        mJsonRequest = new JsonObjectRequest(Request.Method.POST, url, null,
                 new Response.Listener<JSONObject>() {
                     @Override
                     public void onResponse(JSONObject jsonObject) {

app/src/main/java/com/uas/zdxw_smart_com/fragment/ModifyBarcodeQuantityFragment.java

@@ -135,9 +135,11 @@ public class ModifyBarcodeQuantityFragment extends BaseFragment {
                     CommonUtil.toastNoRepeat(mActivity, "请输入条码数量");
                 } else if (!quantity.matches(Constants.REGEX.IS_FLOAT)) {
                     CommonUtil.toastNoRepeat(mActivity, "请输入正确的条码数量");
-                } else if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
-                } else {
+                }
+//                else if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
+//                }
+                else {
                     progressDialog.show();
                     PdaApplication.mRequestQueue.cancelAll(TAG + "update");
 
@@ -239,13 +241,13 @@ public class ModifyBarcodeQuantityFragment extends BaseFragment {
     private void getBarcodeData() {
         String barcode = mBarcodeEditText.getText().toString().trim();
         if (!TextUtils.isEmpty(barcode)) {
-            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
-                mResultTextView.setVisibility(View.VISIBLE);
-                mResultTextView.setText(getString(R.string.barcode_cannot_contain_special));
-                mBarcodeEditText.setText(null);
-                mBarcodeEditText.requestFocus();
-            } else {
+//            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
+//                mResultTextView.setVisibility(View.VISIBLE);
+//                mResultTextView.setText(getString(R.string.barcode_cannot_contain_special));
+//                mBarcodeEditText.setText(null);
+//                mBarcodeEditText.requestFocus();
+//            } else {
                 mIgnoreFocusChange = true;
                 progressDialog.show();
                 String url = null;
@@ -260,7 +262,7 @@ public class ModifyBarcodeQuantityFragment extends BaseFragment {
                 }
                 PdaApplication.mRequestQueue.cancelAll(TAG + "barcodedata");
 
-                mStringRequest = new StringRequest(Request.Method.GET, url,
+                mStringRequest = new StringRequest(Request.Method.POST, url,
                         new Response.Listener<String>() {
                             @Override
                             public void onResponse(String s) {
@@ -305,7 +307,7 @@ public class ModifyBarcodeQuantityFragment extends BaseFragment {
                 mStringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
                 mStringRequest.setTag(TAG + "barcodedata");
                 PdaApplication.mRequestQueue.add(mStringRequest);
-            }
+//            }
         }
     }
 

app/src/main/java/com/uas/zdxw_smart_com/fragment/ModifyQuantityOutFragment.java

@@ -243,13 +243,14 @@ public class ModifyQuantityOutFragment extends BaseFragment {
     private void getBarcodeData() {
         String barcode = mBarcodeEditText.getText().toString().trim();
         if (!TextUtils.isEmpty(barcode)) {
-            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
-                mResultTextView.setVisibility(View.VISIBLE);
-                mResultTextView.setText(getString(R.string.barcode_cannot_contain_special));
-                mBarcodeEditText.setText(null);
-                mBarcodeEditText.requestFocus();
-            } else {
+//            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
+//                mResultTextView.setVisibility(View.VISIBLE);
+//                mResultTextView.setText(getString(R.string.barcode_cannot_contain_special));
+//                mBarcodeEditText.setText(null);
+//                mBarcodeEditText.requestFocus();
+//            }
+//            else {
                 mIgnoreFocusChange = true;
                 progressDialog.show();
                 String url = null;
@@ -304,7 +305,7 @@ public class ModifyQuantityOutFragment extends BaseFragment {
                 mStringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
                 mStringRequest.setTag(TAG + "barcodedata");
                 PdaApplication.mRequestQueue.add(mStringRequest);
-            }
+//            }
         }
     }
 

app/src/main/java/com/uas/zdxw_smart_com/fragment/SpecialMaterialOutFragment.java

@@ -818,9 +818,9 @@ public class SpecialMaterialOutFragment extends BaseFragment {
     private void getBarcodeData() {
         String barcode = mBarcodeEditText.getText().toString().trim();
         if (!TextUtils.isEmpty(barcode)) {
-            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
-            } else {
+//            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
+//            } else {
                 progressDialog.show();
                 String url = "";
                 try {
@@ -872,7 +872,7 @@ public class SpecialMaterialOutFragment extends BaseFragment {
                 mStringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
                 mStringRequest.setTag(TAG + "barcodedata");
                 PdaApplication.mRequestQueue.add(mStringRequest);
-            }
+//            }
         }
     }
 

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

@@ -32,7 +32,7 @@ import java.util.List;
  */
 public class StockDataSummaryFragment extends BaseFragment {
     private SmartTable mSmartTable;
-    private Column<String> mProdcodeColumn, mOutqtyColumn,mTypeColumn;
+    private Column<String> mProdcodeColumn, mOutqtyColumn,mQTYeColumn ,mTypeColumn;
     private Column<Double> mPdaqtyColumn, mDetailColumn;
     private TableData<StockTaskMultipleBean> mTableData;
     private TextView mNumTextView;
@@ -60,6 +60,7 @@ public class StockDataSummaryFragment extends BaseFragment {
         mSmartTable = root.findViewById(R.id.stock_data_summary_st);
 
         CommonUtil.getDefaultTable(mActivity, mSmartTable);
+        mQTYeColumn = new Column<String>("  库存  ", "QTY");
         mTypeColumn = new Column<String>("  型号  ", "PR_ORISPECCODE");
         mProdcodeColumn = new Column<String>("物料编号", "PD_PRODCODE");
         mOutqtyColumn = new Column<String>("名称", "PR_DETAIL");
@@ -99,7 +100,7 @@ public class StockDataSummaryFragment extends BaseFragment {
 
     private void setTableData(List<StockTaskMultipleBean> filterTableData) {
         mTableData = new TableData<StockTaskMultipleBean>("出库单列表", filterTableData,
-                mOutqtyColumn, mProdcodeColumn, mTypeColumn,mPdaqtyColumn, mDetailColumn);
+                mOutqtyColumn, mProdcodeColumn, mQTYeColumn,mPdaqtyColumn, mDetailColumn,mTypeColumn);
         mSmartTable.setTableData(mTableData);
         mSmartTable.postDelayed(new Runnable() {
             @Override
@@ -136,6 +137,8 @@ public class StockDataSummaryFragment extends BaseFragment {
                                 stockTaskMultipleBean.setPD_RESTQTY(FastjsonUtil.getDouble(dataObject, "PD_PDAQTY"));
                                 //新增型号
                                 stockTaskMultipleBean.setPR_ORISPECCODE(FastjsonUtil.getText(dataObject,"PR_ORISPECCODE"));
+                                //库存
+                                stockTaskMultipleBean.setQTY(FastjsonUtil.getText(dataObject,"QTY"));
 
                                 mStockTaskMultipleBeans.add(stockTaskMultipleBean);
                             }

app/src/main/java/com/uas/zdxw_smart_com/fragment/WHCheckBarcodeFragment.java

@@ -152,7 +152,7 @@ public class WHCheckBarcodeFragment extends BaseFragment implements View.OnClick
         }
         //发送请求至服务器
         showLoadingView();
-        VolleyUtil.getVolleyUtil().requestBarcodeCheck(getActivity(), GloableParams.ADDRESS_WHCHECK_BARCODE, VolleyUtil.METHOD_GET,
+        VolleyUtil.getVolleyUtil().requestBarcodeCheck(getActivity(), GloableParams.ADDRESS_WHCHECK_BARCODE, VolleyUtil.METHOD_POST,
                 VolleyUtil.FRAGMETN_WHCHECK_BARCODE, strBarcode);
     }
 

app/src/main/java/com/uas/zdxw_smart_com/fragment/WHCheckMakeMaterialFragment.java

@@ -161,7 +161,7 @@ public class WHCheckMakeMaterialFragment extends BaseFragment implements View.On
         //请求详细数据
         showLoadingView();
         requestType = VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_CHECK;
-        VolleyUtil.getVolleyUtil().requestMakeMaterialCheck(getActivity(), GloableParams.ADDRESS_WH_PRODUCT, VolleyUtil.METHOD_GET,
+        VolleyUtil.getVolleyUtil().requestMakeMaterialCheck(getActivity(), GloableParams.ADDRESS_WH_PRODUCT, VolleyUtil.METHOD_POST,
                 requestType, strProdcode, strWhcode);
     }
 

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

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

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

@@ -33,6 +33,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -278,17 +279,19 @@ public class VolleyUtil {
         getVolleyUtil();
         context = pContext;
         requestType = pRequestType;
-        if (method == METHOD_GET) {
-            pUrl = pUrl + "?barcode=" + pBarcode;
-            Log.e(TAGURL, pUrl);
-            stringRequest = new StringRequest(Request.Method.GET, pUrl, stringListener, errorListener) {
+
+        try {
+            pUrl = pUrl + "?barcode=" + URLEncoder.encode(pBarcode, "utf-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        Log.e(TAGURL, pUrl);
+            stringRequest = new StringRequest(Request.Method.POST, pUrl, stringListener, errorListener) {
                 @Override
                 public Map<String, String> getHeaders() throws AuthFailureError {
                     return setCookies();
                 }
             };
-        } else {
-        }
         stringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
         PdaApplication.mRequestQueue.add(stringRequest);
     }
@@ -334,9 +337,13 @@ public class VolleyUtil {
         getVolleyUtil();
         context = pContext;
         requestType = pRequestType;
-        pUrl = pUrl + "?pr_code=" + pProcode + "&wh_code=" + pWhcode + "&location=" + pWhcode;
+        try {
+            pUrl = pUrl + "?pr_code=" + URLEncoder.encode(pProcode, "utf-8") + "&wh_code=" + pWhcode + "&location=" + pWhcode;
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
         Log.e("VOLLEYURL", pUrl);
-        stringRequest = new StringRequest(Request.Method.GET, pUrl, stringListener, errorListener) {
+        stringRequest = new StringRequest(Request.Method.POST, pUrl, stringListener, errorListener) {
             @Override
             public Map<String, String> getHeaders() throws AuthFailureError {
                 return setCookies();

app/src/main/java/com/uas/zdxw_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/res/layout/fragment_whcheck_barcode.xml

@@ -8,121 +8,149 @@
     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
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <TableLayout
+                android:id="@+id/tl_msg"
+                android:layout_marginTop="@dimen/space_top_8"
                 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>
+                style="@style/CardWhiteStyle_wrapheight">
+                <!--条码号-->
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        style="@style/Table_li_left"
+                        android:layout_marginLeft="@dimen/textsize_20"
+                        android:text="@string/text_whcheck_bar_code"
+                        android:layout_marginStart="@dimen/textsize_20" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:id="@+id/tv_bar_code"
+                        style="@style/Table_li_right"
+                        android:layout_marginLeft="5.5dp"
+                        android:singleLine="false"
+                        android:textColor="@color/text_search"
+                        android:layout_marginStart="5.5dp" />
+                </LinearLayout>
+                <!--料号-->
+                <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>
+                <!--规格-->
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        style="@style/Table_li_left"
+                        android:layout_marginLeft="35dp"
+                        android:text="@string/text_whcheck_pr_spec"
+                        android:layout_marginStart="35dp" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:id="@+id/tv_pr_spec"
+                        style="@style/Table_li_right"
+                        android:layout_marginLeft="8dp"
+                        android:textColor="@color/text_search"
+                        android:singleLine="false"
+                        android:layout_marginStart="8dp" />
+                </LinearLayout>
+                <!--供应商-->
+                <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>
+    </ScrollView>
+
+
+    <!--下部：信息展示-->
+
 </LinearLayout>

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

@@ -43,15 +43,23 @@
                 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
+        android:layout_marginLeft="@dimen/dp_10"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            style="@style/CardContentTextStyle"
+            android:layout_width="wrap_content"
+            android:text="@string/text_fragment_whcheck_pr_spec" />
+        <TextView
+            android:id="@+id/tv_pr_spec"
+            style="@style/CardContentTextStyle"
+            android:textColor="@color/text_search" />
+    </LinearLayout>
 
     <LinearLayout
         style="@style/CardWhiteSytle_fillheight"

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

@@ -42,4 +42,10 @@
         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" />
 </LinearLayout>

build.gradle

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