Ver Fonte

库存条码绑定、条码信息绑定优化

ChengJH há 1 ano atrás
pai
commit
c7c298064f

+ 19 - 1
app/src/main/java/com/uas/uas_mes_zb_p/fragment/BarcodeInfoCollectFragment.java

@@ -133,7 +133,22 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
                 LocationischeckData();
             }
         });
+        mLocationEditText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mLocationEditText.setText("");
+            }
+        });
+        mLocationEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus){
+                    mLocationEditText.setText("");
+                }else {
 
+                }
+            }
+        });
         String ischecheds = SharedPreUtil.getString(mActivity, Constants.BARCODECHECKBOX, null);
         if (StringUtil.isEmpty(ischecheds)){
             checkbox_barcode.setChecked(true);
@@ -179,7 +194,10 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
                     mLotEditText.setText(null);
                     mDateEditText.setText(null);
                     material_in_collect_old_et.setText(null);
-                    mLocationEditText.setText(null);
+                    if (location_check.isChecked()){
+                        mLocationEditText.setText(null);
+                    }
+
 //                    mLocationEditText.setEnabled(false);
                 }
             }

+ 3 - 1
app/src/main/java/com/uas/uas_mes_zb_p/fragment/InventoryBindingFragment.java

@@ -1151,7 +1151,9 @@ public class InventoryBindingFragment extends BaseFragment implements View.OnCli
         mQuantityEditText.setText("");
         mMpqEditText.setText("");
         mDateEditText.setText("");
-        mLotEditText.setText("");
+        if (!check_box_positions.isChecked()){
+            mLotEditText.setText("");
+        }
         mPanEditText.setText("");
         mPoEditText.setText("");
         mBrandEditText.setText("");

+ 2 - 2
build.gradle

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