Преглед изворни кода

BOM校验标题改成条码料号校验,增加界面提示文字

ChengJH пре 1 година
родитељ
комит
3111e0fc5d

+ 13 - 5
app/src/main/java/com/uas/lcp_newelectronic/fragment/BomCheckFragment.java

@@ -4,6 +4,7 @@ import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 
 import com.android.volley.Request;
 import com.uas.lcp_newelectronic.R;
@@ -18,6 +19,7 @@ import com.uas.lcp_newelectronic.view.ClearableEditText;
 public class BomCheckFragment extends BaseFragment {
     private ClearableEditText mBomIdEditText, mBarcodeEditText;
     private Button mConfirmButton;
+    private TextView tv_tishi;
 
     @Override
     protected int getLayout() {
@@ -26,10 +28,11 @@ public class BomCheckFragment extends BaseFragment {
 
     @Override
     protected void initViews() {
-        setTitle("BOM校验");
+        setTitle("条码料号校验");
         mBomIdEditText = root.findViewById(R.id.bom_check_id_cet);
         mBarcodeEditText = root.findViewById(R.id.bom_check_barcode_cet);
         mConfirmButton = root.findViewById(R.id.bom_check_confirm_btn);
+        tv_tishi = root.findViewById(R.id.tv_tishi);
 
         mBomIdEditText.requestFocus();
     }
@@ -101,17 +104,22 @@ public class BomCheckFragment extends BaseFragment {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
-                CommonUtil.toastNoRepeat(mActivity, "BOM校验成功");
+                tv_tishi.setTextColor(getResources().getColor(R.color.green));
+                tv_tishi.setText("条码料号校验成功");
+                CommonUtil.toastNoRepeat(mActivity, "条码料号校验成功");
                 mBarcodeEditText.setText("");
-                mBarcodeEditText.requestFocus();
+                mBomIdEditText.setText("");
+                mBomIdEditText.requestFocus();
             }
 
             @Override
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 mBarcodeEditText.setText("");
-                mBarcodeEditText.requestFocus();
-
+                mBomIdEditText.setText("");
+                mBomIdEditText.requestFocus();
+                tv_tishi.setTextColor(getResources().getColor(R.color.red));
+                tv_tishi.setText(failStr);
                 CommonUtil.makeNotice();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
             }

+ 1 - 1
app/src/main/java/com/uas/lcp_newelectronic/fragment/IndexWareHouseContentFragment.java

@@ -138,7 +138,7 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
-                    //BOM校验
+                    //条码料号校验
                 case GloableParams.GRIDNAME_BOM_CHECK:
                     fragment = new BomCheckFragment();
                     getFragmentManager().beginTransaction().addToBackStack(null)

+ 2 - 2
app/src/main/java/com/uas/lcp_newelectronic/global/GloableParams.java

@@ -287,7 +287,7 @@ public class GloableParams {
     private static final String ADDRESSTAIL_INMATERIAL_SAVEBARACCEPTCODE = "/api/pda/inMaterial/saveBarAcceptCodeByParse.action";
 
     /**
-     * BOM校验
+     * 条码料号校验
      */
     private static final String ADDRESSTAIL_OUTMATERIAL_CHECKBOMBARCODE = "/api/pda/outMaterial/checkBombarcode.action";
 
@@ -800,7 +800,7 @@ public class GloableParams {
     public static final String GRIDNAME_WORK_INVENTORY = "盘点作业";
     public static final String MENU_STORAGE_BARCODE_INFO_COLLECT = "条码信息绑定";
     public static final String GRIDNAME_MODIFY_QUANTITY = "条码数量修改";
-    public static final String GRIDNAME_BOM_CHECK = "BOM校验";
+    public static final String GRIDNAME_BOM_CHECK = "条码料号校验";
     public static final String GRIDNAME_FINISHED_PRODUCT_STORAGE = "成品入库";
     public static final String GRIDNAME_FINISHED_PRODUCT_OUTBOUND = "成品出库";
     public static final String GRIDNAME_FINISHED_MOVE_THE_CONTAINER = "移箱";

+ 6 - 1
app/src/main/res/layout/fragment_bom_check.xml

@@ -32,7 +32,7 @@
                 android:layout_weight="1"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
-                android:hint="请输入BOM ID或者工单号"
+                android:hint="请采集条码"
                 android:imeOptions="actionSend"
                 android:textColor="@color/black" />
         </TableRow>
@@ -67,5 +67,10 @@
         android:id="@+id/bom_check_confirm_btn"
         style="@style/ButtonStyle"
         android:text="@string/confirm" />
+    <TextView
+        android:id="@+id/tv_tishi"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+    </TextView>
 
 </LinearLayout>

+ 2 - 2
build.gradle

@@ -50,8 +50,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 10,
-            versionName      : "v1.0"
+            versionCode      : 11,
+            versionName      : "v1.0.1"
     ]
 
     depsVersion = [