增加储位绑定功能

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

@@ -5,6 +5,7 @@ import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -16,6 +17,7 @@ import com.android.volley.toolbox.StringRequest;
 import com.uas.xzc_electronic.R;
 import com.uas.xzc_electronic.activity.FunctionActivity;
 import com.uas.xzc_electronic.global.GloableParams;
+import com.uas.xzc_electronic.listener.MyEditorActionListener;
 import com.uas.xzc_electronic.util.CameraUtil;
 import com.uas.xzc_electronic.util.CommonUtil;
 import com.uas.xzc_electronic.util.FastjsonUtil;
@@ -28,7 +30,7 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 
 /**
  * @author RaoMeng
- * @describe 条码入库
+ * @describe 条码入库改为储位绑定
  * @date 2018/10/25 19:57
  */
 public class BarcodeInCollectFragment extends BaseFragment {
@@ -41,6 +43,7 @@ public class BarcodeInCollectFragment extends BaseFragment {
     private ImageView mScanImageView;
     private int mFocusId;
     private static final int SCAN_BARCODE_CODE = 101;
+    private CheckBox cb_reserve_space;
 
     @Override
     protected int getLayout() {
@@ -49,7 +52,7 @@ public class BarcodeInCollectFragment extends BaseFragment {
 
     @Override
     protected void initViews() {
-        FunctionActivity.setTitle("条码入库");
+        FunctionActivity.setTitle("储位绑定");
         ((FunctionActivity) getActivity()).setScanIvVisible(true);
 
         mBarcodeEditText = root.findViewById(R.id.barcode_in_collect_barcode_et);
@@ -64,12 +67,31 @@ public class BarcodeInCollectFragment extends BaseFragment {
         mBatchcodeTextView = root.findViewById(R.id.barcode_in_collect_result_batchcode_tv);
         mLocationTextView = root.findViewById(R.id.barcode_in_collect_result_location_tv);
         mPrdetailTextView = root.findViewById(R.id.barcode_in_collect_result_prdetail_tv);
+        cb_reserve_space = root.findViewById(R.id.cb_reserve_space);
 
         CommonUtil.editTextGetFocus(mBarcodeEditText);
     }
 
     @Override
     protected void initEvents() {
+        CommonUtil.setEditorActionListener(mBarcodeEditText, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                if (!TextUtils.isEmpty(text)) {
+                    mLocationEditText.requestFocus();
+                }
+            }
+        });
+
+        CommonUtil.setEditorActionListener(mLocationEditText, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                if (!TextUtils.isEmpty(text)&& TextUtils.isEmpty(mBarcodeEditText.getText().toString().trim())) {
+                    mBarcodeEditText.requestFocus();
+                }
+            }
+        });
+
         mScanImageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -123,7 +145,9 @@ public class BarcodeInCollectFragment extends BaseFragment {
                                 progressDialog.dismiss();
                                 try {
                                     mBarcodeEditText.setText("");
-                                    mLocationEditText.setText("");
+                                    if (!cb_reserve_space.isChecked()) {
+                                        mLocationEditText.setText("");
+                                    }
                                     mBarcodeEditText.requestFocus();
                                     String result = o.toString();
                                     if (FastjsonUtil.validate(result)) {
@@ -197,7 +221,7 @@ public class BarcodeInCollectFragment extends BaseFragment {
     public void onHiddenChanged(boolean hidden) {
         super.onHiddenChanged(hidden);
         if (!hidden) {
-            FunctionActivity.setTitle("条码入库");
+            FunctionActivity.setTitle("储位绑定");
             ((FunctionActivity) getActivity()).setScanIvVisible(true);
         }
     }
@@ -207,8 +231,10 @@ public class BarcodeInCollectFragment extends BaseFragment {
         if (requestCode == SCAN_BARCODE_CODE && data != null) {
             if (data.getExtras() != null) {
                 String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+//                String regex = "[\\s]";
+//                result = result.replaceAll(regex, "");
                 if (mFocusId == R.id.barcode_in_collect_barcode_et) {
-                    mBarcodeEditText.setText(result);
+                    mBarcodeEditText.setText(result.trim());
                     mBarcodeEditText.setSelection(result.length());
                 } else if (mFocusId == R.id.barcode_in_collect_location_et) {
                     mLocationEditText.setText(result);

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

@@ -99,6 +99,10 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
 //                        //条码信息采集
 //                        mFragment = new BarcodeInfoCollectFragment();
 //                        break;
+                    case GloableParams.MENU_STORAGE_BARCODE_IN_CODE:
+                        //储位绑定
+                        mFragment = new BarcodeInCollectFragment();
+                        break;
                     default:
                         break;
                 }

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

@@ -939,6 +939,7 @@ public class GloableParams {
     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_IN_CODE = "储位绑定";
 
     public static final String[] storageInMenuNames = {
             MENU_STORAGE_RECHARGE,
@@ -950,6 +951,7 @@ public class GloableParams {
             MENU_STORAGE_BARCODE_IN,
 //            MENU_STORAGE_BARCODE_INFO_COLLECT,
 //            LIBRARY_COLLECTION
+            MENU_STORAGE_BARCODE_IN_CODE
     };
     public static final int[] storageInMenuImgs = {
             R.drawable.ic_storage_recharge,
@@ -961,6 +963,7 @@ public class GloableParams {
             R.drawable.ic_storage_barcode_in,
 //            R.drawable.ic_barcode_info_collect,
 //            R.drawable.ic_storage_iqc
+            R.drawable.ic_storage_barcode_in
     };
 
     //-->SMT校验

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

@@ -73,6 +73,16 @@
                 android:textColor="@color/black" />
         </TableRow>
 
+        <CheckBox
+            android:layout_marginTop="5dp"
+            android:gravity="left|center_vertical"
+            android:layout_gravity="center"
+            android:id="@+id/cb_reserve_space"
+            android:text="保留仓位"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+        </CheckBox>
+
 
         <TableRow
             android:id="@+id/material_in_collect_location_tr"

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="wrap_content"
-    android:layout_height="100dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:gravity="center"
     android:focusable="false"
     android:layout_centerInParent="true"

build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 23,
-            versionName      : "v1.1.2"
+            versionCode      : 24,
+            versionName      : "v1.1.3"
     ]
 
     depsVersion = [