去除条码数量修改中正则，添加撤销入库入口

更改版本号

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

@@ -1201,6 +1201,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         Button pop_material_in_menu_5 = (Button) mMenuView.findViewById(R.id.pop_material_in_menu_5);
         Button pop_material_in_menu_2 = (Button) mMenuView.findViewById(R.id.pop_material_in_menu_2);
         Button pop_toadoptprompt = (Button) mMenuView.findViewById(R.id.pop_toadoptprompt);
+        Button pop_material_in_menu_back = (Button) mMenuView.findViewById(R.id.pop_material_in_menu_back);
 
         postBtn.setVisibility(View.GONE);
         todoListBtn.setVisibility(View.GONE);
@@ -1247,6 +1248,22 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 confirmStorageIn(false);
             }
         });
+        pop_material_in_menu_back.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeMenuPopupWindow();
+                ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+//                ((FunctionActivity) getActivity()).setScanIvVisible(false);
+                Bundle bundle = new Bundle();
+                bundle.putString("pi_id", mPiid);
+                bundle.putString("pi_inoutno", mPiInoutno);
+                bundle.putString("pd_whcode", pd_whcode);
+                bundle.putString("whichpage", "materialin");
+                mFragment = new MaterialOutRevocationStockFragment();
+                mFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(JLTStorageInBarcodeFragment.this, mFragment);
+            }
+        });
 
         postBtn.setOnClickListener(new View.OnClickListener() {
             @Override

app/src/main/java/com/uas/uas_mes_standard/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;
@@ -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/res/layout/pop_jlt_storage_in_box_menu.xml

@@ -86,4 +86,16 @@
         android:background="@color/transparent"
         android:text="采集数据汇总"
         android:textSize="@dimen/app_text_size_body_2" />
+
+    <Button
+        android:id="@+id/pop_material_in_menu_back"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/transparent"
+        android:text="撤销入库"
+        android:textSize="@dimen/app_text_size_body_2" />
+
+
 </LinearLayout>

build.gradle

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