已采集列表(StorageInCollectListFragment) +备料数据汇总(StockDataSummaryFragment)新增型号字段

app/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.android.application'
 android {
     signingConfigs {
         udapda {
-            keyAlias 'pdakeystone'
+            keyAlias 'pda_smart_com_key'
             keyPassword 'pdakeystone'
             storeFile file('C:\\sigin\\pda_smart_com_keystone.jks')
             storePassword 'pdakeystone'

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

@@ -1,6 +1,8 @@
 package com.uas.pda_smart_com.adapter;
 
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
@@ -18,6 +20,7 @@ public class StorageInCollectAdapter extends BaseQuickAdapter<StockAlreadyItemBe
 
     @Override
     protected void convert(BaseViewHolder helper, StockAlreadyItemBean item) {
+        TextView tv_type_value=helper.getView(R.id.tv_type_value);
         helper.setText(R.id.stock_already_list_barcode, "条码：" + item.getBI_BARCODE());
         helper.setText(R.id.stock_already_list_outqty, CommonUtil.doubleFormat(item.getBI_INQTY()));
         helper.setText(R.id.stock_already_list_prodcode, item.getBI_PRODCODE());
@@ -25,5 +28,9 @@ public class StorageInCollectAdapter extends BaseQuickAdapter<StockAlreadyItemBe
         helper.setText(R.id.stock_already_list_batchcode, item.getBI_BATCHCODE());
         helper.setText(R.id.stock_already_list_location_caption, "采集状态：");
         helper.setText(R.id.stock_already_list_location, item.getBI_PDAGET() == 0 ? "未采集" : "已采集");
+        //新增型号
+        if(!TextUtils.isEmpty(item.getPR_ORISPECCODE())){
+            tv_type_value.setText(item.getPR_ORISPECCODE());
+        }
     }
 }

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

@@ -36,6 +36,16 @@ public class StockAlreadyItemBean {
     private String BI_BATCHCODE;
     private int BI_PDAGET;
 
+    private String PR_ORISPECCODE;
+
+    public String getPR_ORISPECCODE() {
+        return PR_ORISPECCODE;
+    }
+
+    public void setPR_ORISPECCODE(String PR_ORISPECCODE) {
+        this.PR_ORISPECCODE = PR_ORISPECCODE;
+    }
+
     public String getBI_BARCODE() {
         return BI_BARCODE;
     }

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

@@ -14,7 +14,6 @@ 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.google.gson.JsonObject;
 import com.uas.pda_smart_com.R;
 import com.uas.pda_smart_com.bean.StockTaskMultipleBean;
 import com.uas.pda_smart_com.global.GloableParams;
@@ -33,7 +32,7 @@ import java.util.List;
  */
 public class StockDataSummaryFragment extends BaseFragment {
     private SmartTable mSmartTable;
-    private Column<String> mProdcodeColumn, mOutqtyColumn;
+    private Column<String> mProdcodeColumn, mOutqtyColumn,mTypeColumn;
     private Column<Double> mPdaqtyColumn, mDetailColumn;
     private TableData<StockTaskMultipleBean> mTableData;
     private TextView mNumTextView;
@@ -61,6 +60,7 @@ public class StockDataSummaryFragment extends BaseFragment {
         mSmartTable = root.findViewById(R.id.stock_data_summary_st);
 
         CommonUtil.getDefaultTable(mActivity, mSmartTable);
+        mTypeColumn = new Column<String>("  型号  ", "PR_ORISPECCODE");
         mProdcodeColumn = new Column<String>("物料编号", "PD_PRODCODE");
         mOutqtyColumn = new Column<String>("名称", "PR_DETAIL");
         mPdaqtyColumn = new Column<Double>("出库数量", "PD_OUTQTY", new IFormat<Double>() {
@@ -99,7 +99,7 @@ public class StockDataSummaryFragment extends BaseFragment {
 
     private void setTableData(List<StockTaskMultipleBean> filterTableData) {
         mTableData = new TableData<StockTaskMultipleBean>("出库单列表", filterTableData,
-                mOutqtyColumn, mProdcodeColumn, mPdaqtyColumn, mDetailColumn);
+                mOutqtyColumn, mProdcodeColumn, mTypeColumn,mPdaqtyColumn, mDetailColumn);
         mSmartTable.setTableData(mTableData);
         mSmartTable.postDelayed(new Runnable() {
             @Override
@@ -134,6 +134,8 @@ public class StockDataSummaryFragment extends BaseFragment {
                                 stockTaskMultipleBean.setPR_DETAIL(FastjsonUtil.getText(dataObject, "PR_DETAIL"));
                                 stockTaskMultipleBean.setPD_OUTQTY(FastjsonUtil.getDouble(dataObject, "PD_OUTQTY"));
                                 stockTaskMultipleBean.setPD_RESTQTY(FastjsonUtil.getDouble(dataObject, "PD_PDAQTY"));
+                                //新增型号
+                                stockTaskMultipleBean.setPR_ORISPECCODE(FastjsonUtil.getText(dataObject,"PR_ORISPECCODE"));
 
                                 mStockTaskMultipleBeans.add(stockTaskMultipleBean);
                             }

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

@@ -286,7 +286,7 @@ public class StorageInCollectListFragment extends BaseFragment {
                                 collectEntity.setBI_LOCATION(FastjsonUtil.getText(dataObject, "BI_LOCATION"));
                                 collectEntity.setBI_BATCHCODE(FastjsonUtil.getText(dataObject, "BI_BATCHCODE"));
                                 collectEntity.setBI_PDAGET(FastjsonUtil.getInt(dataObject, "BI_PDAGET"));
-
+                                collectEntity.setPR_ORISPECCODE(FastjsonUtil.getText(dataObject,"PR_ORISPECCODE"));
                                 mCollectList.add(collectEntity);
                             }
                         }

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

@@ -75,7 +75,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                         mFragment = new StorageIQCInFragment();
                         break;
                     case GloableParams.MENU_STORAGE_MATERIAL_STORAGE_IN:
-                        //材料入库
+                        //单据入库
                         mFragment = new MaterialStorageFragment();
                         break;
 //                    case GloableParams.MENU_STORAGE_PRODUCT_CHECK:

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

@@ -62,8 +62,19 @@
             android:id="@+id/stock_already_list_detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_weight="0.8"
             tools:text="20" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="型号：" />
+
+        <TextView
+            android:id="@+id/tv_type_value"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            tools:text="A001" />
 
     </LinearLayout>