取消条码号不能包含特殊字符的限制, 条码信息核查增加供应商批号

app/src/main/java/com/uas/pda_smart_com/activity/IndexActivity.java

@@ -125,7 +125,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 new int[]{R.id.griditem_img, R.id.griditem_name});
         menuGridView.setAdapter(adapter);
 
-
         View view = View.inflate(this, R.layout.pop_exit_application, null);
         mCancelTextView = (TextView) view.findViewById(R.id.pop_exit_cancel_tv);
         mMinimizeTextView = (TextView) view.findViewById(R.id.pop_exit_minimize_tv);
@@ -233,7 +232,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 }
             }
         }
-
+//        isPower = true;   //临时通行
         if (isPower) {
             Intent intent = new Intent(IndexActivity.this, FunctionActivity.class);
             intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);

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

@@ -2553,9 +2553,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/pda_smart_com/fragment/ModifyBarcodeQuantityFragment.java

@@ -166,9 +166,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");
 
@@ -450,13 +452,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;
@@ -516,7 +518,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/pda_smart_com/fragment/WHCheckBarcodeFragment.java

@@ -36,7 +36,7 @@ public class WHCheckBarcodeFragment extends BaseFragment implements View.OnClick
     TableLayout tlMsg;
     TextView tvBarcode, tvBarProcode,tv_type_value,tvPrDetail, tvPrSpec, tvVeShortname, tvBarWhcode,
             tvBarRemain, tvBarLocation, tvStatus,tv_batch_number;
-    private TextView btnSearch;
+    private TextView btnSearch,tv_supplier_batch;
     private ImageView mScanImageView;
     private int mFocusId;
 
@@ -61,6 +61,7 @@ public class WHCheckBarcodeFragment extends BaseFragment implements View.OnClick
         tvBarLocation = (TextView) root.findViewById(R.id.tv_bar_location);
         tvStatus = root.findViewById(R.id.tv_bar_status);
         btnSearch = (TextView) root.findViewById(R.id.btn_collect);
+        tv_supplier_batch = (TextView) root.findViewById(R.id.tv_supplier_batch);
         ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(R.string.title_barcode_whmm);
         mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
         tv_batch_number = (TextView) mActivity.findViewById(R.id.tv_batch_number);
@@ -194,6 +195,7 @@ public class WHCheckBarcodeFragment extends BaseFragment implements View.OnClick
             String strStatus = changeNulltoBlank(dataJson, "BAR_STATUS");
             String strType = changeNulltoBlank(dataJson,"PR_ORISPECCODE");
             String BAR_BATCHCODE = changeNulltoBlank(dataJson,"BAR_BATCHCODE");  //批次号
+            String BAR_VENDBARCODE = changeNulltoBlank(dataJson,"BAR_VENDBARCODE");  //批次号
 
             //显示数据
             tvBarcode.setText(strBarcode);
@@ -206,6 +208,7 @@ public class WHCheckBarcodeFragment extends BaseFragment implements View.OnClick
             tvBarRemain.setText(strRemain);
             tvBarLocation.setText(strLocation);
             tv_batch_number.setText(BAR_BATCHCODE);     //批次号
+            tv_supplier_batch.setText(BAR_VENDBARCODE);    //供应商批次号
             if(strStatus.equals("1")){
                 tvStatus.setText("在库");
             }else if(strStatus.equals("2")){

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

@@ -143,5 +143,16 @@
                 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_supplier_batch"
+                style="@style/Table_li_right"
+                android:textColor="@color/text_search"/>
+        </TableRow>
     </TableLayout>
 </LinearLayout>

build.gradle

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