增加料车绑定线别

app/build.gradle

@@ -27,6 +27,8 @@ android {
     buildTypes {
         release {
             minifyEnabled false
+            //使用ProGuard进行代码混淆
+            //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

app/src/main/java/com/uas/jc_wms/fragment/BarcodeInCollectFragment.java

@@ -501,12 +501,12 @@ public class BarcodeInCollectFragment extends BaseFragment {
         @Override
         public void onBindViewHolder(final @NonNull RecyclerView.ViewHolder holder, @SuppressLint("RecyclerView") int i) {
             //设置条目状态
-            ((ListItemViewHolder) holder).tv_liaocode.setText("条码号：" + mList.get(i).getBAN_BARCODE());
-            ((ListItemViewHolder) holder).tv_wuliaobianhao.setText("物料编号：" + mList.get(i).getBAN_PRODCODE());
-            ((ListItemViewHolder) holder).tv_liaotetall.setText("物料名称：" + mList.get(i).getPR_DETAIL());
-            ((ListItemViewHolder) holder).tv_liaospec.setText("物料规格：" + mList.get(i).getPR_SPEC());
-            ((ListItemViewHolder) holder).tv_liaospec3.setText("数量：" + mList.get(i).getBAN_QTY());
-            ((ListItemViewHolder) holder).tv_liaospec3.setText("项目：" + mList.get(i).getMA_PROJECT());
+            ((ListItemViewHolder) holder).tv_data1.setText(String.valueOf(mList.get(i).getBAN_BARCODE()));
+            ((ListItemViewHolder) holder).tv_data2.setText(String.valueOf(mList.get(i).getBAN_PRODCODE()));
+            ((ListItemViewHolder) holder).tv_data3.setText(String.valueOf(mList.get(i).getPR_DETAIL()));
+            ((ListItemViewHolder) holder).tv_data4.setText(String.valueOf(mList.get(i).getPR_SPEC()));
+            ((ListItemViewHolder) holder).tv_data5.setText(String.valueOf(mList.get(i).getBAN_QTY()));
+            ((ListItemViewHolder) holder).tv_data6.setText(String.valueOf(mList.get(i).getMA_PROJECT()));
 
             ((ListItemViewHolder) holder).checkBox.setChecked(mList.get(i).isChecked());
 
@@ -585,21 +585,23 @@ public class BarcodeInCollectFragment extends BaseFragment {
         public class ListItemViewHolder extends RecyclerView.ViewHolder {
             //ViewHolder
             CheckBox checkBox;
-            TextView tv_liaocode;
-            TextView tv_wuliaobianhao;
-            TextView tv_liaotetall;
-            TextView tv_liaospec;
-            TextView tv_liaospec3;
+            TextView tv_data1;
+            TextView tv_data2;
+            TextView tv_data3;
+            TextView tv_data4;
+            TextView tv_data5;
+            TextView tv_data6;
             LinearLayout ll_layout;
 
             ListItemViewHolder(View view) {
                 super(view);
-                this.tv_liaocode = (TextView) view.findViewById(R.id.tv_liaocode);
-                this.tv_wuliaobianhao = (TextView) view.findViewById(R.id.tv_wuliaobianhao);
-                this.tv_liaotetall = (TextView) view.findViewById(R.id.tv_liaotetall);
-                this.tv_liaospec = (TextView) view.findViewById(R.id.tv_liaospec);
+                this.tv_data1 = (TextView) view.findViewById(R.id.tv_data1);
+                this.tv_data2 = (TextView) view.findViewById(R.id.tv_data2);
+                this.tv_data3 = (TextView) view.findViewById(R.id.tv_data3);
+                this.tv_data4 = (TextView) view.findViewById(R.id.tv_data4);
                 this.checkBox = (CheckBox) view.findViewById(R.id.select_checkbox);
-                this.tv_liaospec3 = (TextView) view.findViewById(R.id.tv_liaospec3);
+                this.tv_data5 = (TextView) view.findViewById(R.id.tv_data5);
+                this.tv_data6 = (TextView) view.findViewById(R.id.tv_data6);
                 this.ll_layout = (LinearLayout) view.findViewById(R.id.ll_layout);
             }
         }

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

@@ -74,22 +74,22 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                         //IQC入库
                         mFragment = new StorageIQCInFragment();
                         break;
-                    case GloableParams.MENU_STORAGE_MATERIAL_STORAGE_IN:
-                        //单据入库
-                        mFragment = new MaterialStorageFragment();
-                        break;
+//                    case GloableParams.MENU_STORAGE_MATERIAL_STORAGE_IN:
+//                        //单据入库
+//                        mFragment = new MaterialStorageFragment();
+//                        break;
 //                    case GloableParams.MENU_STORAGE_PRODUCT_CHECK:
 //                        //成品检验
 //                        mFragment = new ProductCheckFragment();
 //                        break;
-                    case GloableParams.MENU_STORAGE_PRODUCT_STORAGE_IN:
-                        //完工品入库
-                        mFragment = new FinishedGoodsStorageFragment();
-                        break;
-                    case GloableParams.MENU_STORAGE_RANDOM_CHECK:
-                        //抽查校验
-                        mFragment = new RandomCheckFragment();
-                        break;
+//                    case GloableParams.MENU_STORAGE_PRODUCT_STORAGE_IN:
+//                        //完工品入库
+//                        mFragment = new FinishedGoodsStorageFragment();
+//                        break;
+//                    case GloableParams.MENU_STORAGE_RANDOM_CHECK:
+//                        //抽查校验
+//                        mFragment = new RandomCheckFragment();
+//                        break;
                     case GloableParams.MENU_STORAGE_BARCODE_IN:
                         //条码入库
                         mFragment = new BarcodeInCollectFragment();

app/src/main/java/com/uas/jc_wms/global/GloableParams.java

@@ -868,21 +868,26 @@ public class GloableParams {
     public static final String MENU_STORAGE_RECHARGE = "收料";
     public static final String MENU_STORAGE_INSPECTION = "送检";
     public static final String MENU_STORAGE_IQC_STORAGE_IN = "IQC入库";
-    public static final String MENU_STORAGE_MATERIAL_STORAGE_IN = "单据入库";
+//    public static final String MENU_STORAGE_MATERIAL_STORAGE_IN = "单据入库";
     //    public static final String MENU_STORAGE_PRODUCT_CHECK = "成品检验";
-    public static final String MENU_STORAGE_PRODUCT_STORAGE_IN = "完工品入库";
-    public static final String MENU_STORAGE_RANDOM_CHECK = "抽查校验";
+//    public static final String MENU_STORAGE_PRODUCT_STORAGE_IN = "完工品入库";
+//    public static final String MENU_STORAGE_RANDOM_CHECK = "抽查校验";
     public static final String MENU_STORAGE_BARCODE_IN = "条码入库";
     public static final String MENU_STORAGE_BARCODE_INFO_COLLECT = "条码信息采集";
 
     public static final String[] storageInMenuNames = {
             MENU_STORAGE_RECHARGE, MENU_STORAGE_INSPECTION, MENU_STORAGE_IQC_STORAGE_IN,
-            MENU_STORAGE_MATERIAL_STORAGE_IN, MENU_STORAGE_PRODUCT_STORAGE_IN,
-            MENU_STORAGE_RANDOM_CHECK, MENU_STORAGE_BARCODE_IN, MENU_STORAGE_BARCODE_INFO_COLLECT};
+//            MENU_STORAGE_MATERIAL_STORAGE_IN,
+//            MENU_STORAGE_PRODUCT_STORAGE_IN,
+//            MENU_STORAGE_RANDOM_CHECK,
+            MENU_STORAGE_BARCODE_IN,
+            MENU_STORAGE_BARCODE_INFO_COLLECT};
     public static final int[] storageInMenuImgs = {
             R.drawable.ic_storage_recharge, R.drawable.ic_storage_inspection, R.drawable.ic_storage_iqc,
-            R.drawable.ic_storage_material_in, R.drawable.ic_storage_finish_in,
-            R.drawable.ic_storage_random_check, R.drawable.ic_storage_barcode_in,
+//            R.drawable.ic_storage_material_in,
+//            R.drawable.ic_storage_finish_in,
+//            R.drawable.ic_storage_random_check,
+            R.drawable.ic_storage_barcode_in,
             R.drawable.ic_barcode_info_collect};
 
     //-->SMT校验

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--一级griditem布局-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="100dp"
-    android:layout_height="100dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:gravity="center"
     android:focusable="false"
     android:layout_centerInParent="true"

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

@@ -24,50 +24,131 @@
             android:layout_gravity="center"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/tv_liaocode"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:layout_marginRight="@dimen/dp_10"
-                android:gravity="start"
-                android:text="11234123ee21234er"/>
-
-            <TextView
-                android:id="@+id/tv_wuliaobianhao"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:layout_marginRight="@dimen/dp_10"
-                android:gravity="start"
-                android:text="11234123ee21234er"/>
-
-
-            <TextView
-                android:id="@+id/tv_liaotetall"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:layout_marginRight="@dimen/dp_10"
-                android:gravity="start"
-                android:text="11234123ee21234er"/>
-
-            <TextView
-                android:id="@+id/tv_liaospec"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:layout_marginRight="@dimen/dp_10"
-                android:gravity="start"
-                android:text="11234123ee21234er"/>
-            <TextView
-                android:id="@+id/tv_liaospec3"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:layout_marginRight="@dimen/dp_10"
-                android:gravity="start"
-                android:text="11234123ee21234er"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="start"
+                    android:text="条码号: "/>
+
+                <TextView
+                    android:id="@+id/tv_data1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:gravity="start"
+                    android:text=""/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="start"
+                    android:text="物料编号: "/>
+
+                <TextView
+                    android:id="@+id/tv_data2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:gravity="start"
+                    android:text=""/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="start"
+                    android:text="物料名称: "/>
+
+                <TextView
+                    android:id="@+id/tv_data3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:gravity="start"
+                    android:text=""/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="start"
+                    android:text="物料规格: "/>
+
+                <TextView
+                    android:id="@+id/tv_data4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:gravity="start"
+                    android:text=""/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="start"
+                    android:text="数量: "/>
+
+                <TextView
+                    android:id="@+id/tv_data5"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:gravity="start"
+                    android:text=""/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="start"
+                    android:text="项目: "/>
+
+                <TextView
+                    android:id="@+id/tv_data6"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:gravity="start"
+                    android:text=""/>
+
+            </LinearLayout>
 
         </LinearLayout>
 

build.gradle

@@ -55,8 +55,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 53,
-            versionName      : "v2.6.7"
+            versionCode      : 54,
+            versionName      : "v2.6.8"
     ]
 
     depsVersion = [