入库扫描界面输入框大小调整，修改点击保存按钮后回到上一个界面bug

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

@@ -962,53 +962,17 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 progressDialog.dismiss();
                 try {
                     String result = o.toString();
-                    Log.e("result",result);
                     JSONObject resultObject = JSON.parseObject(result);
                     JSONObject dataObject = resultObject.getJSONObject("data");
-                        boolean isCheck = FastjsonUtil.getBoolean(dataObject, "isCheck");
-                        if (!isCheck) {
-                            new AlertDialog.Builder(mActivity)
-                                    .setTitle("提示")
-                                    .setMessage("PO：" + mBarcodeParseBean.getORDERCODE() + "不在当前入库单据范围内，是否继续保存？")
-                                    .setNegativeButton("取消", null)
-                                    .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            mPoCheckBox.setChecked(false);
-                                            saveBarcode(true, false);
-                                        }
-                                    }).create().show();
-                            return;
-                        }
-
                         CommonUtil.toastNoRepeat(mActivity, "归属入库单："
                                 + FastjsonUtil.getText(dataObject, "INOUTNO")
                                 + "成功");
 
-                        boolean isFinish = FastjsonUtil.getBoolean(dataObject, "ISFINISH");
-                        if (isFinish) {
-                            CommonUtil.toastNoRepeat(mActivity, "该入库单最后一行已完成采集！");
-                            mBarcodeEditText.setText("");
-                            mBarcodeEditText.requestFocus();
-//                            resetState();
-//                            getActivity().getSupportFragmentManager().popBackStackImmediate();
-//                            if (mOnFinishListener != null) {
-//                                mOnFinishListener.onFinish();
-//                            }
-                        } else {
-                            if (true) {
-                                getActivity().getSupportFragmentManager().popBackStack();
-                            } else {
-                                mBarcodeEditText.setText("");
-                                mBarcodeEditText.requestFocus();
-//                                resetState();
-                            }
-                        }
-
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
                 mBarcodeEditText.setText("");
+                mBarcodeEditText.requestFocus();
                 jlt_storage_in_barcode_et.setText("");
                 jlt_edit_lotno.setText("");
                 jlt_edit_dataecode.setText("");

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

@@ -381,7 +381,7 @@
 
                     <com.uas.uas_mes_standard.view.ClearableEditText
                         android:id="@+id/jlt_edit_QTY"
-                        style="@style/EditTextStyle"
+                        style="@style/jltEditTextStyle"
                         android:layout_width="0dp"
                         android:layout_weight="1"
                         android:lines="1"
@@ -439,7 +439,7 @@
 
                     <com.uas.uas_mes_standard.view.ClearableEditText
                         android:id="@+id/jlt_storage_in_barcode_lot_et"
-                        style="@style/EditTextStyle"
+                        style="@style/jltEditTextStyle"
                         android:layout_width="0dp"
                         android:layout_weight="1"
                         android:lines="1"
@@ -466,7 +466,7 @@
 
                     <com.uas.uas_mes_standard.view.ClearableEditText
                         android:id="@+id/jlt_edit_lotno"
-                        style="@style/EditTextStyle"
+                        style="@style/jltEditTextStyle"
                         android:layout_width="0dp"
                         android:layout_weight="1"
                         android:lines="1"
@@ -493,7 +493,7 @@
 
                     <com.uas.uas_mes_standard.view.ClearableEditText
                         android:id="@+id/jlt_edit_dataecode"
-                        style="@style/EditTextStyle"
+                        style="@style/jltEditTextStyle"
                         android:layout_width="0dp"
                         android:layout_weight="1"
                         android:lines="1"
@@ -530,7 +530,7 @@
 
                     <com.uas.uas_mes_standard.view.ClearableEditText
                         android:id="@+id/jlt_edit_DC"
-                        style="@style/EditTextStyle"
+                        style="@style/jltEditTextStyle"
                         android:layout_width="0dp"
                         android:layout_weight="1"
                         android:lines="1"

app/src/main/res/values/styles.xml

@@ -31,6 +31,21 @@
         <!--        <item name="android:singleLine">true</item>-->
         <item name="android:imeOptions">flagNoExtractUi</item>
     </style>
+    <style name="jltEditTextStyle">
+        <item name="android:background">@drawable/bg_edittext</item>
+        <item name="android:gravity">left|center</item>
+        <item name="android:paddingRight">12dp</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:textColorHint">@color/gray_light</item>
+        <item name="android:minHeight">40dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/text_normal</item>
+        <item name="android:maxLines">4</item>
+        <!--        <item name="android:singleLine">true</item>-->
+        <item name="android:imeOptions">flagNoExtractUi</item>
+    </style>
 
     <style name="EditTextLineEnableStyle" parent="EditTextStyle">
         <item name="android:background">@drawable/bg_line_enable_edittext</item>