入库添加湿敏判断逻辑

app/src/main/java/com/uas/uaspda/fragment/DefaultSettingFragment.java

@@ -16,7 +16,7 @@ public class DefaultSettingFragment extends BaseFragment implements View.OnClick
     private ClearableEditText defaultSettingWarehouseEt;
     private ClearableEditText defaultSettingLinecodeEt;
     private ClearableEditText mDefaultRejectsWarehouseEt;
-    private SwitchView mOrderSwitchView;
+    private SwitchView mOrderSwitchView, mMaterialSwitchView;
 
     @Override
     protected int getLayout() {
@@ -32,6 +32,8 @@ public class DefaultSettingFragment extends BaseFragment implements View.OnClick
         mDefaultRejectsWarehouseEt = (ClearableEditText) root.findViewById(R.id.default_setting_rejects_warehouse_et);
         mOrderSwitchView = root.findViewById(R.id.default_setting_order_sv);
         mOrderSwitchView.setChecked(false);
+        mMaterialSwitchView = root.findViewById(R.id.default_setting_material_sv);
+        mMaterialSwitchView.setChecked(false);
     }
 
     @Override
@@ -61,6 +63,8 @@ public class DefaultSettingFragment extends BaseFragment implements View.OnClick
 
         int orderSwitch = SharedPreUtil.getInt(mActivity, Constants.FLAG.CACHE_DEFAULT_ORDER_SWITCH + CommonUtil.getUserName(mActivity), 0);
         mOrderSwitchView.setChecked(orderSwitch == 1);
+        int materialSwitch = SharedPreUtil.getInt(mActivity, Constants.FLAG.CACHE_DEFAULT_MATERIAL_SWITCH + CommonUtil.getUserName(mActivity), 0);
+        mMaterialSwitchView.setChecked(materialSwitch == 1);
 
     }
 
@@ -76,6 +80,7 @@ public class DefaultSettingFragment extends BaseFragment implements View.OnClick
                 SharedPreUtil.saveString(mActivity, Constants.FLAG.SMT_LINECODE_CACHE + CommonUtil.getUserName(mActivity) + CommonUtil.getFunMaster(mActivity), defaultSettingLinecodeEt.getText().toString().trim());
                 SharedPreUtil.saveString(mActivity, Constants.FLAG.CACHE_DEFAULT_REJECTS_WAREHOUSE + CommonUtil.getUserName(mActivity), mDefaultRejectsWarehouseEt.getText().toString().trim());
                 SharedPreUtil.saveInt(mActivity, Constants.FLAG.CACHE_DEFAULT_ORDER_SWITCH + CommonUtil.getUserName(mActivity), mOrderSwitchView.isChecked() ? 1 : 0);
+                SharedPreUtil.saveInt(mActivity, Constants.FLAG.CACHE_DEFAULT_MATERIAL_SWITCH + CommonUtil.getUserName(mActivity), mMaterialSwitchView.isChecked() ? 1 : 0);
                 Toast.makeText(getActivity(), "缺省项设置成功", Toast.LENGTH_SHORT).show();
 
 //                new Handler().postDelayed(new Runnable() {

app/src/main/java/com/uas/uaspda/fragment/MaterialInCollectFragment.java

@@ -14,13 +14,17 @@ import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.format.DateFormat;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
+import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.TableRow;
 import android.widget.TextView;
@@ -324,7 +328,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                         || actionId == EditorInfo.IME_ACTION_DONE
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     if (isAllEdit()) {
-                        confirmEvent();
+                        confirmEvent(false);
                         return true;
                     } else {
                         if (mDateCodeCheck) {
@@ -347,7 +351,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                         || actionId == EditorInfo.IME_ACTION_DONE
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     if (isAllEdit()) {
-                        confirmEvent();
+                        confirmEvent(false);
                         return true;
                     } else {
                         if (mOldCheck) {
@@ -369,7 +373,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                         || actionId == EditorInfo.IME_ACTION_DONE
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     if (isAllEdit()) {
-                        confirmEvent();
+                        confirmEvent(false);
                         return true;
                     }
                 }
@@ -384,7 +388,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                         || actionId == EditorInfo.IME_ACTION_DONE
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     if (isAllEdit()) {
-                        confirmEvent();
+                        confirmEvent(false);
                         return true;
                     } else {
                         if (mLocationCheck) {
@@ -493,7 +497,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                                 }
 
                                 if (isAllEdit()) {
-                                    confirmEvent();
+                                    confirmEvent(false);
                                 } else {
                                     if (mNumCheck) {
                                         mNumEditText.requestFocus();
@@ -566,7 +570,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                 showMoreMenu();
                 break;
             case R.id.material_in_collect_confirm_btn:
-                confirmEvent();
+                confirmEvent(false);
                 break;
             case R.id.material_in_collect_type_tv:
                 String typeName = mTypeTextView.getText().toString().trim();
@@ -746,7 +750,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
     /**
      * 材料入库提交采集
      */
-    private void confirmEvent() {
+    private void confirmEvent(boolean msdcheck) {
         String barcode = mBarcodeEditText.getText().toString().trim();
         String lotno = mLotNoEditText.getText().toString().trim();
         String datecode = mDateCodeEditText.getText().toString().trim();
@@ -827,18 +831,26 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                         @Override
                         public void onResponse(String s) {
                             progressDialog.dismiss();
-                            mResultTextView.setVisibility(View.VISIBLE);
-                            mBarcodeEditText.setText(null);
-                            mBarcodeEditText.postDelayed(new Runnable() {
-                                @Override
-                                public void run() {
-                                    mBarcodeEditText.requestFocus();
-                                }
-                            }, 100);
                             try {
-                                JSONObject resultObject = new JSONObject(s);
-                                mResultTextView.setText(resultObject.optString("data"));
-                            } catch (JSONException e) {
+                                com.alibaba.fastjson.JSONObject resultObject = JSON.parseObject(s);
+                                com.alibaba.fastjson.JSONObject dataObject = resultObject.getJSONObject("data");
+                                if (dataObject != null) {
+                                    if (dataObject.containsKey("ISMSD")) {
+                                        String level = FastjsonUtil.getText(dataObject, "msd");
+                                        showDewPopupWindow(level);
+                                    } else {
+                                        mResultTextView.setVisibility(View.VISIBLE);
+                                        mBarcodeEditText.setText(null);
+                                        mBarcodeEditText.postDelayed(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                mBarcodeEditText.requestFocus();
+                                            }
+                                        }, 100);
+                                        mResultTextView.setText(FastjsonUtil.getText(dataObject, "str"));
+                                    }
+                                }
+                            } catch (Exception e) {
                                 e.printStackTrace();
                             }
                         }
@@ -868,6 +880,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                 protected Map<String, String> getParams() throws AuthFailureError {
                     Map<String, String> param = new HashMap<>();
                     param.put("data", paramsJson.toString());
+                    param.put("msdcheck", Boolean.toString(msdcheck));
                     return param;
                 }
             };
@@ -878,6 +891,71 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         }
     }
 
+    /**
+     * 创建PopupWindow
+     */
+    private PopupWindow popupWindow;
+    private Button dewOperConfirmBtn, btnDewCancel;
+
+    protected void showDewPopupWindow(String level) {
+        try {
+            LayoutInflater inflater = LayoutInflater.from(getActivity());
+            View contentView = inflater.inflate(R.layout.popupwindow_ioc_out_make_material_oper, null);
+
+            ListView dewOperLv = (ListView) contentView.findViewById(R.id.dew_oper_lv);
+            dewOperLv.setVisibility(View.GONE);
+            ((TextView) contentView.findViewById(R.id.tv_ms_level)).setText(level);
+            ((TextView) contentView.findViewById(R.id.textView2)).setVisibility(View.INVISIBLE);
+            ((TextView) contentView.findViewById(R.id.textView4)).setVisibility(View.GONE);
+            ((TextView) contentView.findViewById(R.id.tv_status)).setVisibility(View.GONE);
+            ((TextView) contentView.findViewById(R.id.tv_ms_resttime)).setVisibility(View.GONE);
+
+            dewOperConfirmBtn = (Button) contentView.findViewById(R.id.dew_oper_confirm_btn);
+            btnDewCancel = (Button) contentView.findViewById(R.id.btn_dew_cancel);
+
+            dewOperConfirmBtn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    closePopupWindow();
+                    confirmEvent(true);
+                }
+            });
+            btnDewCancel.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    closePopupWindow();
+                }
+            });
+
+            // PopupWindow实例化
+            popupWindow = new PopupWindow(contentView, LinearLayout.LayoutParams.WRAP_CONTENT,
+                    LinearLayout.LayoutParams.WRAP_CONTENT, true);
+            popupWindow.setAnimationStyle(R.style.MenuAnimationFade);
+            // 弹出窗口显示内容视图,默认以锚定视图的左下角为起点，这里为点击按钮
+            popupWindow.showAtLocation(mConfirmButton, Gravity.CENTER, 0, 0);
+            popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                @Override
+                public void onDismiss() {
+                    closePopupWindow();
+                }
+            });
+            //获取最底层窗口的参数，背景变灰色效果
+            CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
+
+        } catch (Exception e) {
+
+        }
+
+    }
+
+    private void closePopupWindow() {
+        if (popupWindow != null) {
+            popupWindow.dismiss();
+            popupWindow = null;
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+    }
+
     private void changeToTypeBarcode() {
         mBarcodeEditText.setHint(R.string.please_collect_barcode);
         mTypeTextView.setText("条码");

app/src/main/java/com/uas/uaspda/fragment/SCSMTCheckFragment.java

@@ -126,7 +126,7 @@ public class SCSMTCheckFragment extends BaseFragment implements View.OnClickList
     private MyArrayAdapter<String> mAutoStringAdapter;
     private TextView mRecalibrationTextView;
     private String mNoticeStr;
-    private boolean mOrderSwitch = false;
+    private boolean mOrderSwitch = false, mMaterialSwitch;
 
     @Override
     protected int getLayout() {
@@ -138,6 +138,7 @@ public class SCSMTCheckFragment extends BaseFragment implements View.OnClickList
         ((FunctionActivity) getActivity()).setSmtQueryIvVisible(true);
 
         mOrderSwitch = SharedPreUtil.getInt(mActivity, Constants.FLAG.CACHE_DEFAULT_ORDER_SWITCH + CommonUtil.getUserName(mActivity), 0) == 1;
+        mMaterialSwitch = SharedPreUtil.getInt(mActivity, Constants.FLAG.CACHE_DEFAULT_MATERIAL_SWITCH + CommonUtil.getUserName(mActivity), 0) == 1;
         //->校验方式
         tvCheckStyle = (TextView) root.findViewById(R.id.tvCurCheckContent);
         btnChange = (Button) root.findViewById(R.id.btn_changecheck_smtcheck);
@@ -487,7 +488,7 @@ public class SCSMTCheckFragment extends BaseFragment implements View.OnClickList
                 joinDataCheck(collect, location);
             }*/
 
-            if (mOrderSwitch) {
+            if (mMaterialSwitch) {
                 requestCheck(collect, location);
             } else {
                 smtCheck(collect, location);

app/src/main/java/com/uas/uaspda/util/Constants.java

@@ -183,6 +183,9 @@ public interface Constants {
         //顺序上料设置缓存
         String CACHE_DEFAULT_ORDER_SWITCH = "cache_default_order_switch";
 
+        //料卷号校验设置缓存
+        String CACHE_DEFAULT_MATERIAL_SWITCH = "cache_default_material_switch";
+
         //iqc入库传入材料入库的json参数
         String FLAG_IQC_IN_JSON = "flag_iqc_in_json";
 

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

@@ -1,97 +1,126 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dp">
+    android:layout_height="match_parent">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@string/string_default_warehouse"
-        android:textSize="@dimen/textsize_18"
-        android:textStyle="bold" />
-
-    <com.uas.uaspda.view.ClearableEditText
-        android:id="@+id/default_setting_warehouse_et"
-        style="@style/EditTextLineStyle"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginTop="10dp"
-        android:hint="@string/default_warehouse"
-        android:textSize="@dimen/textsize_16" />
-
-    <TextView
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@string/str_default_rejects_warehouse"
-        android:textSize="@dimen/textsize_18"
-        android:textStyle="bold" />
-
-    <com.uas.uaspda.view.ClearableEditText
-        android:id="@+id/default_setting_rejects_warehouse_et"
-        style="@style/EditTextLineStyle"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginTop="10dp"
-        android:hint="@string/rejects_default_warehouse"
-        android:textSize="@dimen/textsize_16" />
+        android:orientation="vertical"
+        android:padding="16dp">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@string/string_default_linecode"
-        android:textSize="@dimen/textsize_18"
-        android:textStyle="bold" />
-
-    <com.uas.uaspda.view.ClearableEditText
-        android:id="@+id/default_setting_linecode_et"
-        style="@style/EditTextLineStyle"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginTop="10dp"
-        android:hint="@string/default_linecode"
-        android:textSize="@dimen/textsize_16" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/string_default_warehouse"
+            android:textSize="@dimen/textsize_18"
+            android:textStyle="bold" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:background="@color/white"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingTop="12dp"
-        android:paddingBottom="12dp">
+        <com.uas.uaspda.view.ClearableEditText
+            android:id="@+id/default_setting_warehouse_et"
+            style="@style/EditTextLineStyle"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginTop="10dp"
+            android:hint="@string/default_warehouse"
+            android:textSize="@dimen/textsize_16" />
 
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="顺序上料"
+            android:layout_marginTop="10dp"
+            android:text="@string/str_default_rejects_warehouse"
             android:textSize="@dimen/textsize_18"
             android:textStyle="bold" />
 
-        <com.uas.uaspda.view.SwitchView
-            android:id="@+id/default_setting_order_sv"
-            android:layout_width="46dp"
-            android:layout_height="28dp" />
-    </LinearLayout>
+        <com.uas.uaspda.view.ClearableEditText
+            android:id="@+id/default_setting_rejects_warehouse_et"
+            style="@style/EditTextLineStyle"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginTop="10dp"
+            android:hint="@string/rejects_default_warehouse"
+            android:textSize="@dimen/textsize_16" />
 
-    <Button
-        android:id="@+id/default_setting_submit_btn"
-        style="@style/ButtonStyle"
-        android:layout_marginTop="20dp"
-        android:text="@string/btn_ok_smt" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/string_default_linecode"
+            android:textSize="@dimen/textsize_18"
+            android:textStyle="bold" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:text="@string/prompt_set_default_warehouse"
-        android:textSize="@dimen/textsize_18"
-        android:visibility="gone" />
+        <com.uas.uaspda.view.ClearableEditText
+            android:id="@+id/default_setting_linecode_et"
+            style="@style/EditTextLineStyle"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginTop="10dp"
+            android:hint="@string/default_linecode"
+            android:textSize="@dimen/textsize_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="顺序上料"
+                android:textSize="@dimen/textsize_18"
+                android:textStyle="bold" />
+
+            <com.uas.uaspda.view.SwitchView
+                android:id="@+id/default_setting_order_sv"
+                android:layout_width="46dp"
+                android:layout_height="28dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="料卷号校验"
+                android:textSize="@dimen/textsize_18"
+                android:textStyle="bold" />
+
+            <com.uas.uaspda.view.SwitchView
+                android:id="@+id/default_setting_material_sv"
+                android:layout_width="46dp"
+                android:layout_height="28dp" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/default_setting_submit_btn"
+            style="@style/ButtonStyle"
+            android:layout_marginTop="20dp"
+            android:text="@string/btn_ok_smt" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="@string/prompt_set_default_warehouse"
+            android:textSize="@dimen/textsize_18"
+            android:visibility="gone" />
+    </LinearLayout>
 
-</LinearLayout>
+</ScrollView>

build.gradle

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