【仓库管理】添加【BOM校验】功能

app/src/main/java/com/uas/pda_smart_com/fragment/BomCheckFragment.java

@@ -0,0 +1,132 @@
+package com.uas.pda_smart_com.fragment;
+
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.volley.Request;
+import com.uas.pda_smart_com.R;
+import com.uas.pda_smart_com.global.GloableParams;
+import com.uas.pda_smart_com.listener.MyEditorActionListener;
+import com.uas.pda_smart_com.util.CommonUtil;
+import com.uas.pda_smart_com.util.HttpCallback;
+import com.uas.pda_smart_com.util.HttpParams;
+import com.uas.pda_smart_com.util.VolleyRequest;
+import com.uas.pda_smart_com.view.ClearableEditText;
+
+public class BomCheckFragment extends BaseFragment {
+    private ClearableEditText mBomIdEditText, mBarcodeEditText;
+    private Button mConfirmButton;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_bom_check;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("BOM校验");
+        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);
+
+        mBomIdEditText.requestFocus();
+    }
+
+    @Override
+    protected void initEvents() {
+        CommonUtil.setEditorActionListener(mBomIdEditText, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                String bomId = mBomIdEditText.getText().toString().trim();
+                String barcode = mBarcodeEditText.getText().toString().trim();
+
+                if (TextUtils.isEmpty(bomId)) {
+                    return;
+                }
+                if (TextUtils.isEmpty(barcode)) {
+                    mBarcodeEditText.requestFocus();
+                    return;
+                }
+                bomCheck(bomId, barcode);
+            }
+        });
+
+        CommonUtil.setEditorActionListener(mBarcodeEditText, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                String bomId = mBomIdEditText.getText().toString().trim();
+                String barcode = mBarcodeEditText.getText().toString().trim();
+
+                if (TextUtils.isEmpty(barcode)) {
+                    return;
+                }
+                if (TextUtils.isEmpty(bomId)) {
+                    mBomIdEditText.requestFocus();
+                    return;
+                }
+                bomCheck(bomId, barcode);
+            }
+        });
+
+        mConfirmButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String bomId = mBomIdEditText.getText().toString().trim();
+                String barcode = mBarcodeEditText.getText().toString().trim();
+
+                if (TextUtils.isEmpty(bomId)) {
+                    CommonUtil.toastNoRepeat(mActivity, "请采集BOM  ID");
+                    return;
+                }
+                if (TextUtils.isEmpty(barcode)) {
+                    CommonUtil.toastNoRepeat(mActivity, "请采集条码号");
+                    return;
+                }
+
+                bomCheck(bomId, barcode);
+            }
+        });
+    }
+
+    private void bomCheck(String bomId, String barcode) {
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_OUTMATERIAL_CHECKBOMBARCODE)
+                .method(Request.Method.POST)
+                .addParam("bomid", bomId)
+                .addParam("barcode", barcode)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, "BOM校验成功");
+                mBarcodeEditText.setText("");
+                mBarcodeEditText.requestFocus();
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.makeNotice();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
+    @Override
+    protected void initDatas() {
+
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

app/src/main/java/com/uas/pda_smart_com/fragment/IndexWareHouseContentFragment.java

@@ -130,6 +130,11 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
+                case GloableParams.GRIDNAME_BOM_CHECK:
+                    fragment = new BomCheckFragment();
+                    getFragmentManager().beginTransaction().addToBackStack(null)
+                            .replace(R.id.container_function_fragment, fragment).commit();
+                    break;
             }
         }
     }

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

@@ -223,6 +223,7 @@ public class GloableParams {
     public static String ADDRESS_BARSTOCK_GETBARCODEINFO;
     public static String ADDRESS_BARSTOCK_DELETEBARCODEIO;
     public static String ADDRESS_BARSTOCK_GETPRODINOUTQTYSUM;
+    public static String ADDRESS_OUTMATERIAL_CHECKBOMBARCODE;
 
 
     //连接服务器请求地址
@@ -247,6 +248,11 @@ public class GloableParams {
     private static final String ADDRESSTAIL_INMATERIAL_GETBARACCEPTCODE = "/api/pda/inMaterial/getBarAcceptCode.action";
     private static final String ADDRESSTAIL_INMATERIAL_SAVEBARACCEPTCODE = "/api/pda/inMaterial/saveBarAcceptCode.action";
 
+    /**
+     * BOM校验
+     */
+    private static final String ADDRESSTAIL_OUTMATERIAL_CHECKBOMBARCODE = "/api/pda/outMaterial/checkBombarcode.action";
+
     /**
      * 盘点工作
      */
@@ -670,12 +676,13 @@ public class GloableParams {
     public static final String GRIDNAME_STOCK_BARCODE = "补贴库存条码";
     public static final String GRIDNAME_WORK_INVENTORY = "盘点作业";
     public static final String GRIDNAME_MODIFY_QUANTITY = "条码数量修改";
+    public static final String GRIDNAME_BOM_CHECK = "BOM校验";
     public static final String[] storageGridNames = {GRIDNAME_GOOD_SEARCH, GRIDNAME_BATCH_OPRATION,
-            GRIDNAME_STORAGE_TRANSFER, GRIDNAME_MODIFY_QUANTITY, GRIDNAME_WORK_INVENTORY};
+            GRIDNAME_STORAGE_TRANSFER, GRIDNAME_MODIFY_QUANTITY, GRIDNAME_WORK_INVENTORY, GRIDNAME_BOM_CHECK};
     public static final int[] storageGridImgs = {R.drawable.storage_good_search,
             R.drawable.storage_bach_operation, R.drawable.storage_transfer,
             R.drawable.storage_work_inventory,
-            R.drawable.ic_modify_quantity};
+            R.drawable.ic_modify_quantity, R.drawable.storage_msd_manager};
     //DETAIL:搜索备料单号，下拉列表
     public static final String SPINNER_PREPARE_SEARCH = "搜索备料单号";
     public static final String SPINNER_MAKECODE_SEARCH = "搜索制造单号";
@@ -985,5 +992,6 @@ public class GloableParams {
         GloableParams.ADDRESS_BARSTOCK_GETBARCODEINFO = uriHead + GloableParams.ADDRESSTAIL_BARSTOCK_GETBARCODEINFO;
         GloableParams.ADDRESS_BARSTOCK_DELETEBARCODEIO = uriHead + GloableParams.ADDRESSTAIL_BARSTOCK_DELETEBARCODEIO;
         GloableParams.ADDRESS_BARSTOCK_GETPRODINOUTQTYSUM = uriHead + GloableParams.ADDRESSTAIL_BARSTOCK_GETPRODINOUTQTYSUM;
+        GloableParams.ADDRESS_OUTMATERIAL_CHECKBOMBARCODE = uriHead + GloableParams.ADDRESSTAIL_OUTMATERIAL_CHECKBOMBARCODE;
     }
 }

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

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="@dimen/root_layout_padding">
+
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="1">
+
+
+        <TableRow
+            android:id="@+id/material_in_collect_num_tr"
+            android:layout_marginTop="5dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="BOM  ID"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <com.uas.pda_smart_com.view.ClearableEditText
+                android:id="@+id/bom_check_id_cet"
+                style="@style/EditTextStyle"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请采集BOM  ID"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black" />
+        </TableRow>
+
+
+        <TableRow
+            android:id="@+id/material_in_collect_lotno_tr"
+            android:layout_marginTop="5dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="条码号"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <com.uas.pda_smart_com.view.ClearableEditText
+                android:id="@+id/bom_check_barcode_cet"
+                style="@style/EditTextStyle"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请采集条码"
+                android:textColor="@color/black" />
+        </TableRow>
+    </TableLayout>
+
+    <Button
+        android:id="@+id/bom_check_confirm_btn"
+        style="@style/ButtonStyle"
+        android:text="@string/confirm" />
+
+</LinearLayout>

build.gradle

@@ -45,8 +45,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 6,
-            versionName      : "v1.6"
+            versionCode      : 7,
+            versionName      : "v1.7"
     ]
 
     depsVersion = [