出货检验

app/src/main/java/com/uas/pda_smart_sa/activity/FunctionActivity.java

@@ -12,6 +12,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.uas.pda_smart_sa.fragment.BaseFragment;
+import com.uas.pda_smart_sa.fragment.DeliveryInspectionFragment;
 import com.uas.pda_smart_sa.fragment.IOCOutManagement;
 import com.uas.pda_smart_sa.fragment.IndexInOutContentFragment;
 import com.uas.pda_smart_sa.fragment.IndexSettingFragment;
@@ -101,6 +102,10 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.GRIDNAME_SOLDER_MANAGER:
                     fragment = new SolderPasteManageFragment();
                     break;
+                //出货检验
+                case GloableParams.GRIDNAME_DELIVERY_INSPECTION:
+                    fragment = new DeliveryInspectionFragment();
+                    break;
                 //设置
                 case GloableParams.GRIDNAME_SETTING:
                     fragment = new IndexSettingFragment();

app/src/main/java/com/uas/pda_smart_sa/activity/IndexActivity.java

@@ -200,6 +200,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             isPower = true;
         } else if (GloableParams.GRIDNAME_SOLDER_MANAGER.equals(itemName)) {
             isPower = true;
+        } else if (GloableParams.GRIDNAME_DELIVERY_INSPECTION.equals(itemName)) {
+            isPower = true;
         } else if (powerList != null) {
             for (int i = 0; i < powerList.size(); i++) {
                 String power = powerList.get(i);

app/src/main/java/com/uas/pda_smart_sa/fragment/DeliveryInspectionFragment.java

@@ -0,0 +1,119 @@
+package com.uas.pda_smart_sa.fragment;
+
+import android.os.Handler;
+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.pda_smart_sa.R;
+import com.uas.pda_smart_sa.global.GloableParams;
+import com.uas.pda_smart_sa.listener.MyEditorActionListener;
+import com.uas.pda_smart_sa.util.CommonUtil;
+import com.uas.pda_smart_sa.util.HttpCallback;
+import com.uas.pda_smart_sa.util.HttpParams;
+import com.uas.pda_smart_sa.util.VolleyRequest;
+import com.uas.pda_smart_sa.view.ClearableEditText;
+
+/**
+ * Created by RaoMeng on 2020/9/28
+ * Desc: 出货检验
+ */
+public class DeliveryInspectionFragment extends BaseFragment {
+    private ClearableEditText mBarcodeEditText;
+    private Button mConfirmButton;
+    private TextView mResultTextView;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_delivery_inspection;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("出货检验");
+
+        mBarcodeEditText = root.findViewById(R.id.delivery_inspection_barcode_cet);
+        mConfirmButton = root.findViewById(R.id.delivery_inspection_confirm_btn);
+        mResultTextView = root.findViewById(R.id.delivery_inspection_result_tv);
+        mBarcodeEditText.requestFocus();
+    }
+
+    @Override
+    protected void initEvents() {
+        CommonUtil.setEditorActionListener(mBarcodeEditText, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                confirmEvent();
+            }
+        });
+
+        mConfirmButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                confirmEvent();
+            }
+        });
+    }
+
+    private void confirmEvent() {
+        String barcode = mBarcodeEditText.getText().toString().trim();
+        if (TextUtils.isEmpty(barcode)) {
+            CommonUtil.toastNoRepeat(mActivity, "请采集单号");
+            return;
+        }
+        progressDialog.show();
+        mResultTextView.setText("");
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_RESERVE_CONFIRMTHENAGREE)
+                .method(Request.Method.POST)
+                .addParam("code", barcode)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                mBarcodeEditText.setText("");
+                CommonUtil.toastNoRepeat(mActivity, "单号：" + barcode + "审核成功");
+                mResultTextView.setText("单号：" + barcode + "审核成功");
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        mBarcodeEditText.requestFocus();
+                    }
+                }, 150);
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+                mBarcodeEditText.setText("");
+                CommonUtil.makeNotice();
+                mResultTextView.setText(failStr);
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        mBarcodeEditText.requestFocus();
+                    }
+                }, 150);
+            }
+        });
+    }
+
+    @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_sa/global/GloableParams.java

@@ -254,6 +254,7 @@ public class GloableParams {
     public static String ADDRESS_COUNTING_GETCODEMSG;
     public static String ADDRESS_COUNTING_CONFIRMSTOCK;
     public static String ADDRESS_COUNTING_CLEARSTOCKDIFF;
+    public static String ADDRESS_RESERVE_CONFIRMTHENAGREE;
 
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
@@ -270,6 +271,11 @@ public class GloableParams {
     //获取应用版本信息
     private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/outMaterial/getPdaVersion.action";
 
+    /**
+     * 出货检验
+     */
+    private static final String ADDRESSTAIL_RESERVE_CONFIRMTHENAGREE = "/scm/reserve/confirmThenAgree.action";
+
     /**
      * 出库暂存
      */
@@ -737,6 +743,7 @@ public class GloableParams {
     //主界面
     public static final String GRIDNAME_CODEBAR_COLLECT = "入库";
     public static final String GRIDNAME_CODEBAR_VERIFY = "出库";
+    public static final String GRIDNAME_DELIVERY_INSPECTION = "出货检验";
     public static final String GRIDNAME_INOUT_STORAGE = "出入库";
     public static final String GRIDNAME_SHOPCONTENT = "车间管理";
     public static final String GRIDNAME_STORAGE_MANAGER = "仓库管理";
@@ -745,9 +752,9 @@ public class GloableParams {
     public static final String GRIDNAME_SOLDER_MANAGER = "锡膏管理";
     public static final String GRIDNAME_SETTING = "设置";
     public static String[] indexMainGridNames = {GRIDNAME_CODEBAR_COLLECT, GRIDNAME_CODEBAR_VERIFY,
-            GRIDNAME_STORAGE_MANAGER, GRIDNAME_SETTING};
+            GRIDNAME_STORAGE_MANAGER, GRIDNAME_DELIVERY_INSPECTION, GRIDNAME_SETTING};
     public static int[] indexMainGridImgs = {R.drawable.ic_storage_in, R.drawable.ic_storage_out,
-            R.drawable.mainmenu_storehousemanager, R.drawable.mainmenu_usersetting};
+            R.drawable.mainmenu_storehousemanager, R.drawable.ic_delivery_inspection, R.drawable.mainmenu_usersetting};
     //INDEX:出入库管理Index
     public static String[] inoutContentGridNames = {GRIDNAME_CODEBAR_COLLECT, GRIDNAME_CODEBAR_VERIFY};
     public static int[] inoutContentGridImgs = {R.drawable.ic_storage_in, R.drawable.ic_storage_out};
@@ -1127,5 +1134,6 @@ public class GloableParams {
         GloableParams.ADDRESS_COUNTING_GETCODEMSG = uriHead + GloableParams.ADDRESSTAIL_COUNTING_GETCODEMSG;
         GloableParams.ADDRESS_COUNTING_CONFIRMSTOCK = uriHead + GloableParams.ADDRESSTAIL_COUNTING_CONFIRMSTOCK;
         GloableParams.ADDRESS_COUNTING_CLEARSTOCKDIFF = uriHead + GloableParams.ADDRESSTAIL_COUNTING_CLEARSTOCKDIFF;
+        GloableParams.ADDRESS_RESERVE_CONFIRMTHENAGREE = uriHead + GloableParams.ADDRESSTAIL_RESERVE_CONFIRMTHENAGREE;
     }
 }

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

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/root_layout_style">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp">
+
+        <TextView
+            style="@style/tl_tv_style"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:minWidth="60dp"
+            android:text="出货单号"
+            android:textColor="@color/body_text_1"
+            android:textSize="16sp" />
+
+        <com.uas.pda_smart_sa.view.ClearableEditText
+            android:id="@+id/delivery_inspection_barcode_cet"
+            style="@style/EditTextStyle"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:hint="请采集单号"
+            android:imeOptions="actionSend"
+            android:textColor="@color/black" />
+    </LinearLayout>
+
+
+    <Button
+        android:id="@+id/delivery_inspection_confirm_btn"
+        style="@style/ButtonStyle"
+        android:layout_marginTop="20dp"
+        android:text="@string/confirm" />
+
+
+    <TextView
+        android:id="@+id/delivery_inspection_result_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:padding="16dp"
+        android:textColor="#333333"
+        android:textSize="16sp"
+        tools:text="采集成功，条码：786528238；数量：2；料号：209837；名称规格：瓶子" />
+</LinearLayout>

build.gradle

@@ -44,8 +44,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 13,
-            versionName      : "v1.3.0"
+            versionCode      : 14,
+            versionName      : "v1.4.0"
     ]
 
     depsVersion = [