物料变更增加条件搜索

app/src/main/java/com/uas/uas_mes_zb_p/fragment/BarcodeInfoCollectFragment.java

@@ -728,7 +728,7 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
                 progressDialog.dismiss();
                 mResultTextView.setVisibility(View.VISIBLE);
                 mResultTextView.setText(null);
-                mBarcodeEditText.setText(null);
+                mBarcodeEditText.setText(null);//是否可用为空
                 mResultTextView.setTextColor(getResources().getColor(R.color.green));
                 mBarcodeEditText.postDelayed(new Runnable() {
                     @Override

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

@@ -1,5 +1,6 @@
 package com.uas.uas_mes_zb_p.fragment;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -761,6 +762,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         }
     }
 
+    @SuppressLint("NonConstantResourceId")
     @Override
     public void onClick(View v) {
         switch (v.getId()) {

app/src/main/java/com/uas/uas_mes_zb_p/fragment/TakeApartThePalletFragment.java

@@ -641,7 +641,7 @@ public class TakeApartThePalletFragment extends BaseFragment{
                 .method(Request.Method.GET)
                 .tag(TAG + "datalist")
                 .flag(0)
-                .addParam("pr_spec1", edit_et.getText().toString().trim())
+                .addParam("pr_spec1", edit_et.getText().toString().trim()+"mm")
                 .addParam("pr_spec2", edit_gg.getText().toString().trim())
                 .addParam("pr_spec3", edit_mj.getText().toString().trim())
                 .addParam("pr_code", pr_code_et.getText().toString().trim())

build.gradle

@@ -50,8 +50,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 12,
-            versionName      : "v1.2.1"
+            versionCode      : 13,
+            versionName      : "v1.2.2"
     ]
 
     depsVersion = [