修改了单据入库

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

@@ -5,7 +5,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
-import android.os.Handler;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AlertDialog;
@@ -313,7 +312,6 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                     mLocationEditText.setEnabled(false);
                     mDcEditText.setEnabled(false);
                     mCalendarImageView.setClickable(false);
-
                     if (!mContinuousCheckBox.isChecked()) {
                         mLotNoEditText.setText(null);
                         mNumEditText.setText(null);
@@ -330,6 +328,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                     mLocationEditText.setEnabled(true);
                     mDcEditText.setEnabled(true);
                     mCalendarImageView.setClickable(true);
+
                 }
             }
         });
@@ -348,7 +347,6 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
             }
         });
 
-        mBarcodeEditText.setOnFocusChangeListener(this);
 
         mNumEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
@@ -367,6 +365,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                             @Override
                             public void run() {
                                 mNumEditText.requestFocus();
+
                             }
                         }, 100);
 
@@ -388,7 +387,6 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
             }
         });
 
-        mNumEditText.setOnFocusChangeListener(this);
 
         mLotNoEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
@@ -509,20 +507,21 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
      * 获取相应条码号或箱号的物料信息
      */
     private void getCodeData() {
-        mBarcodeEditText.setEnabled(false);
+
         String barcode = mBarcodeEditText.getText().toString().trim();
         if (TextUtils.isEmpty(barcode)) {
             if (mCollectType.equals("barcode"))
                 CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_collect_code));
             else if (mCollectType.equals("package"))
                 CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_collect_box));
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    mBarcodeEditText.setEnabled(true);
-                    mBarcodeEditText.requestFocus();
-                }
-            }, 100);
+//            new Handler().postDelayed(new Runnable() {
+//                @Override
+//                public void run() {
+//
+//                }
+//            }, 100);
+            mBarcodeEditText.setEnabled(true);
+            mBarcodeEditText.requestFocus();
             return;
         }
         mIgnoreFocusChange = true;
@@ -545,12 +544,19 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         }
         mResultTextView.setText(null);
         PdaApplication.mRequestQueue.cancelAll(TAG + "codedata");
+        mNumEditText.requestFocus();
         mStringRequest = new StringRequest(Request.Method.GET, url,
                 new Response.Listener<String>() {
                     @Override
                     public void onResponse(String s) {
-                        mNumEditText.requestFocus();
-                        mNumEditText.setSelection(mNumEditText.getText().toString().length());
+                        mBarcodeEditText.setEnabled(false);
+//                        new Handler().postDelayed(new Runnable() {
+//                            @Override
+//                            public void run() {
+//
+//                            }
+//                        }, 100);
+
                     }
                 },
                 new Response.ErrorListener() {
@@ -585,14 +591,14 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                 CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_collect_code));
             else if (mCollectType.equals("package"))
                 CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_collect_box));
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    mNumEditText.setEnabled(true);
-                    mNumEditText.requestFocus();
-                    mNumEditText.setSelection(mNumEditText.getText().toString().length());
-                }
-            }, 100);
+//            new Handler().postDelayed(new Runnable() {
+//                @Override
+//                public void run() {
+//
+//                }
+//            }, 100);
+            mNumEditText.requestFocus();
+            mNumEditText.setSelection(mNumEditText.getText().toString().length());
             return;
         }
         mIgnoreFocusChange = true;
@@ -612,12 +618,12 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         try {
             if ("barcode".equals(mCollectType)) {
                 url = GloableParams.ADDRESS_INMATERIAL_GETCODEDATA + "?type=barcode&pi_id=" + mPiid
-                        + "&whcode=" + URLEncoder.encode(mWhcode, "utf-8")
+                        + "&whcode=" + URLEncoder.encode(mNumEditText.getText().toString(), "utf-8")
                         + "&code=" + URLEncoder.encode(mBarcodeEditText.getText().toString().trim(), "utf-8")
                         +"&datas="+URLEncoder.encode(datasJson, "utf-8");
             } else if ("package".equals(mCollectType)) {
                 url = GloableParams.ADDRESS_INMATERIAL_GETCODEDATA + "?type=package&pi_id=" + mPiid
-                        + "&whcode=" + URLEncoder.encode(mWhcode, "utf-8")
+                        + "&whcode=" + URLEncoder.encode(mNumEditText.getText().toString(), "utf-8")
                         + "&code=" + URLEncoder.encode(mBarcodeEditText.getText().toString().trim(), "utf-8")
                         +"&datas="+URLEncoder.encode(datasJson, "utf-8");
             }
@@ -715,8 +721,6 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
             ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
             ((FunctionActivity) getActivity()).setScanIvVisible(true);
             mScanImageView.setOnClickListener(this);
-            mBarcodeEditText.setOnFocusChangeListener(this);
-            mNumEditText.setOnFocusChangeListener(this);
         } else {
             ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
             ((FunctionActivity) getActivity()).setScanIvVisible(false);
@@ -794,8 +798,6 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
             @Override
             public void onClick(View v) {
                 closeMenuPopupWindow();
-                mBarcodeEditText.setOnFocusChangeListener(null);
-                mNumEditText.setOnFocusChangeListener(null);
                 ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
 //                ((FunctionActivity) getActivity()).setScanIvVisible(false);
                 Bundle bundle = new Bundle();
@@ -813,8 +815,6 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
             @Override
             public void onClick(View v) {
                 closeMenuPopupWindow();
-                mBarcodeEditText.setOnFocusChangeListener(null);
-                mNumEditText.setOnFocusChangeListener(null);
                 ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
                 ((FunctionActivity) getActivity()).setScanIvVisible(false);
                 mFragment = new MaterialInCollectItemSetFragment();
@@ -982,12 +982,13 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                             progressDialog.dismiss();
                             mResultTextView.setVisibility(View.VISIBLE);
                             mBarcodeEditText.setText(null);
-                            mBarcodeEditText.postDelayed(new Runnable() {
-                                @Override
-                                public void run() {
-                                    mBarcodeEditText.requestFocus();
-                                }
-                            }, 100);
+//                            mBarcodeEditText.postDelayed(new Runnable() {
+//                                @Override
+//                                public void run() {
+//
+//                                }
+//                            }, 100);
+                            mBarcodeEditText.requestFocus();
                             try {
                                 JSONObject resultObject = new JSONObject(s);
                                 mResultTextView.setText(resultObject.optString("data"));

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

@@ -827,8 +827,8 @@ public class GloableParams {
     //    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_BARCODE_IN = "条码采集";
-    public static final String LIBRARY_COLLECTION="入库采集";
+    public static final String MENU_STORAGE_BARCODE_IN = "入库采集";
+    public static final String LIBRARY_COLLECTION="入库采集1";
 
     public static final String[] storageInMenuNames = {
             MENU_STORAGE_RECHARGE,

pda_libs/pulltoreflashlibrary/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     android:versionCode="2110"
     android:versionName="2.1.1" >
 
-    <uses-sdk android:minSdkVersion="12" />
+<!--    <uses-sdk android:minSdkVersion="12" />-->
 
     <application />